From 968441ad83f2e0c73da0f1b8c132747e7c298eea Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Tue, 5 Jan 2021 23:45:12 +0800 Subject: [PATCH] add UniformSpacingPanel Demo --- .../HandyControlDemo_Net_40.csproj | 3 + .../HandyControlDemo_Net_GE45.csproj | 3 + .../HandyControlDemo_Code.csproj | 10 + .../Data/DemoInfo.json | 7 +- .../HandyControlDemo_Shared.projitems | 7 + .../Properties/Langs/Lang.Designer.cs | 11 + .../Properties/Langs/Lang.ca-ES.resx | 3 + .../Properties/Langs/Lang.en.resx | 3 + .../Properties/Langs/Lang.fa.resx | 3 + .../Properties/Langs/Lang.fr.resx | 3 + .../Properties/Langs/Lang.ko-KR.resx | 3 + .../Properties/Langs/Lang.pt-BR.resx | 3 + .../Properties/Langs/Lang.resx | 3 + .../Properties/Langs/Lang.ru.resx | 3 + .../Properties/Langs/Lang.tr.resx | 3 + .../Properties/Langs/LangProvider.cs | 6 + .../IncreaseHorizontalSpacing_16x.png | Bin 0 -> 201 bytes .../Controls/UniformSpacingPanelDemoCtl.xaml | 39 + .../UniformSpacingPanelDemoCtl.xaml.cs | 10 + .../Controls/Panel/UniformSpacingPanel.cs | 14 +- .../HandyControl_Shared/Themes/Theme.xaml | 13290 +++++++++++++++- 21 files changed, 13418 insertions(+), 9 deletions(-) create mode 100644 src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/IncreaseHorizontalSpacing_16x.png create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Controls/UniformSpacingPanelDemoCtl.xaml create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Controls/UniformSpacingPanelDemoCtl.xaml.cs diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj index 40af6e69..636d9e3e 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -439,6 +439,9 @@ Resources\Img\LeftMainContent\ImageStack_16x.png + + Resources\Img\LeftMainContent\IncreaseHorizontalSpacing_16x.png + Resources\Img\LeftMainContent\Dynamic_16x.png diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj index cff8786c..0f7d2cb0 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -440,6 +440,9 @@ Resources\Img\LeftMainContent\ImageStack_16x.png + + Resources\Img\LeftMainContent\IncreaseHorizontalSpacing_16x.png + Resources\Img\LeftMainContent\Dynamic_16x.png diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj index 1079a694..289d5b9c 100644 --- a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj +++ b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj @@ -113,6 +113,9 @@ UserControl\Controls\DrawerDemoCtl.xaml + + UserControl\Controls\FlexPanelDemoCtl.xaml + UserControl\Controls\FlipClockDemoCtl.xaml @@ -245,6 +248,9 @@ UserControl\Controls\TransitioningContentControlDemoCtl.xaml + + UserControl\Controls\UniformSpacingPanelDemoCtl.xaml + UserControl\Controls\WaterfallPanelDemoCtl.xaml @@ -678,6 +684,10 @@ UserControl\Controls\TransitioningContentControlDemoCtl.xaml.cs TransitioningContentControlDemoCtl.xaml + + UserControl\Controls\UniformSpacingPanelDemoCtl.xaml.cs + UniformSpacingPanelDemoCtl.xaml + UserControl\Controls\WaterfallPanelDemoCtl.xaml.cs WaterfallPanelDemoCtl.xaml diff --git a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json index 198470ff..35f2f44e 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json +++ b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json @@ -1,4 +1,4 @@ -[ +[ { "title": "Styles", "selectedIndex": -1, @@ -79,6 +79,7 @@ [ "CirclePanel", "CirclePanelDemoCtl", "ColorWheel_16x", "" ], [ "Grid", "GridDemoCtl", "GridPane_16x", "" ], [ "FlexPanel", "FlexPanelDemoCtl", "layout-FlexLayout-16", "1" ], + [ "UniformSpacingPanel", "UniformSpacingPanelDemoCtl", "IncreaseHorizontalSpacing_16x", "1" ], [ "RelativePanel", "RelativePanelDemoCtl", "TransformRelative_16x", "" ], [ "WaterfallPanel", "WaterfallPanelDemoCtl", "Panel_16x", "" ], [ "HoneycombPanel", "HoneycombPanelDemoCtl", "PolygonHexagon_16x", "" ], @@ -105,7 +106,7 @@ [ "Sprite", "SpriteDemoCtl", "HandyControl", "" ], [ "Notification", "NotificationDemoCtl", "Procedure_16x", "" ], [ "Dialog", "DialogDemoCtl", "Dialog_16x", "" ], - [ "Screenshot", "ScreenshotDemoCtl", "WindowScreenshot_16x", "1" ], + [ "Screenshot", "ScreenshotDemoCtl", "WindowScreenshot_16x", "" ], [ "Window", "WindowDemoCtl", "WindowsForm_16x", "" ] ] }, @@ -118,4 +119,4 @@ [ "Effects", "EffectsDemoCtl", "Effects_16x", "" ] ] } -] \ No newline at end of file +] diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems index e6a14cc0..453a5424 100644 --- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems +++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems @@ -254,6 +254,9 @@ TransitioningContentControlDemoCtl.xaml + + UniformSpacingPanelDemoCtl.xaml + WaterfallPanelDemoCtl.xaml @@ -796,6 +799,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs index 5fe1db8d..3b4f736f 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs @@ -2365,6 +2365,17 @@ namespace HandyControlDemo.Properties.Langs } } + /// + /// 查找类似 等间距布局 的本地化字符串。 + /// + public static string UniformSpacingPanel + { + get + { + return ResourceManager.GetString("UniformSpacingPanel", resourceCulture); + } + } + /// /// 查找类似 上传文件 的本地化字符串。 /// diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx index b2d5dbf5..2be7cd79 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx @@ -768,4 +768,7 @@ open touch drag move window + + UniformSpacingPanel + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx index 2669203c..4f3db65f 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx @@ -768,4 +768,7 @@ open touch drag move window + + UniformSpacingPanel + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx index 980f7bb1..4a00911a 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx @@ -768,4 +768,7 @@ open touch drag move window + + UniformSpacingPanel + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx index 202b03a1..f1f0207d 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx @@ -768,4 +768,7 @@ open touch drag move window + + UniformSpacingPanel + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx index 4e54bdc6..f0a1389a 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx @@ -768,4 +768,7 @@ open touch drag move window + + UniformSpacingPanel + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx index 75a14cb9..d401cfd8 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx @@ -768,4 +768,7 @@ open touch drag move window + + UniformSpacingPanel + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx index 3af562a7..0fbd6032 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx @@ -768,4 +768,7 @@ 点击打开触摸拖动窗口 + + 等间距布局 + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx index 2669203c..4f3db65f 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx @@ -768,4 +768,7 @@ open touch drag move window + + UniformSpacingPanel + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx index 95e9c5ad..ea6b04b6 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx @@ -768,4 +768,7 @@ open touch drag move window + + UniformSpacingPanel + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs index 7c692be2..503cfb5a 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs @@ -246,6 +246,7 @@ namespace HandyControlDemo.Properties.Langs OnPropertyChanged(nameof(TreeView)); OnPropertyChanged(nameof(Try2CloseApp)); OnPropertyChanged(nameof(Type)); + OnPropertyChanged(nameof(UniformSpacingPanel)); OnPropertyChanged(nameof(UploadFile)); OnPropertyChanged(nameof(UploadStr)); OnPropertyChanged(nameof(Visibility)); @@ -1301,6 +1302,11 @@ namespace HandyControlDemo.Properties.Langs /// public string Type => Lang.Type; + /// + /// 查找类似 等间距布局 的本地化字符串。 + /// + public string UniformSpacingPanel => Lang.UniformSpacingPanel; + /// /// 查找类似 上传文件 的本地化字符串。 /// diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/IncreaseHorizontalSpacing_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/IncreaseHorizontalSpacing_16x.png new file mode 100644 index 0000000000000000000000000000000000000000..0835d9819cbd1724e9e8d2a3761adf8b9fbe1e0e GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5he4R}c>anMpkTG9 zi(^Pd+|l6MoDBv%CENa$H|Si6f61aZHT2f~6P#^bZBk7V797`i7u4#8eZ80365V09 zl;zG3!EFWS>P;LHKYwGWmzNi~f9U^qfqIV>*KV;L>I^-5M#nN;bLossKL=)An-6l` vE=vm4e}^4l{x@mCwO4*0D%kYv*3BxHpI_9v#G!mO&>0M#u6{1-oD!M + + + + + +