chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add FlexPanel demo

Browse Source
This commit is contained in:
NaBian committed 2020-09-05 22:11:01 +08:00
1 parent 11d62a8d28
commit fc84f806dd
21 files changed
+1222 -657
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

README-cn.md
+7 -2
View File
@@ -76,6 +76,7 @@
<a href="https://github.com/sanshiliuxiao" target="_blank"><img style="border-radius:50%!important" width="64px" alt="sanshiliuxiao" src="https://avatars3.githubusercontent.com/u/25658690?s=64&v=4"></a>
<a href="https://github.com/QJJMSK" target="_blank"><img style="border-radius:50%!important" width="64px" alt="QJJMSK" src="https://avatars2.githubusercontent.com/u/28100716?s=64&v=4"></a>
<a href="https://github.com/dspcjy" target="_blank"><img style="border-radius:50%!important" width="64px" alt="dspcjy" src="https://avatars3.githubusercontent.com/u/17764711?s=64&v=4"></a>
<a href="https://github.com/yaronzz" target="_blank"><img style="border-radius:50%!important" width="64px" alt="yaronzz" src="https://avatars0.githubusercontent.com/u/15530958?s=64&v=4"></a>
## Special thanks to
@@ -124,6 +125,10 @@ Step 4: Enjoy coding
## Latest examples
### FlexPanel
![FlexPanel](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/FlexPanel.gif)
### CheckComboBox
![CheckComboBox](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/CheckComboBox.png)
@@ -140,12 +145,12 @@ Step 4: Enjoy coding
![Screenshot](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Screenshot.png)
## History publication
### GooeyEffect
![GooeyEffect](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/GooeyEffect.gif)
## History publication
### GlowWindow
![GlowWindow](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/GlowWindow.png)
README.md
+7 -2
View File
@@ -76,6 +76,7 @@
<a href="https://github.com/sanshiliuxiao" target="_blank"><img style="border-radius:50%!important" width="64px" alt="sanshiliuxiao" src="https://avatars3.githubusercontent.com/u/25658690?s=64&v=4"></a>
<a href="https://github.com/QJJMSK" target="_blank"><img style="border-radius:50%!important" width="64px" alt="QJJMSK" src="https://avatars2.githubusercontent.com/u/28100716?s=64&v=4"></a>
<a href="https://github.com/dspcjy" target="_blank"><img style="border-radius:50%!important" width="64px" alt="dspcjy" src="https://avatars3.githubusercontent.com/u/17764711?s=64&v=4"></a>
<a href="https://github.com/yaronzz" target="_blank"><img style="border-radius:50%!important" width="64px" alt="yaronzz" src="https://avatars0.githubusercontent.com/u/15530958?s=64&v=4"></a>
## Special thanks to
@@ -124,6 +125,10 @@ Step 4: Enjoy coding
## Latest examples
### FlexPanel
![FlexPanel](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/FlexPanel.gif)
### CheckComboBox
![CheckComboBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/CheckComboBox.png)
@@ -140,12 +145,12 @@ Step 4: Enjoy coding
![Screenshot](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Screenshot.png)
## History publication
### GooeyEffect
![GooeyEffect](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GooeyEffect.gif)
## History publication
### GlowWindow
![GlowWindow](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GlowWindow.png)
src/HandyControl.sln
+5 -5
View File
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28729.10
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net_GE45", "Net_GE45\HandyControl_Net_GE45\HandyControl_Net_GE45.csproj", "{DC966E3D-BCFF-4652-98CF-070E5494749A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Net_GE45", "Net_GE45\HandyControl_Net_GE45\HandyControl_Net_GE45.csproj", "{DC966E3D-BCFF-4652-98CF-070E5494749A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Net_GE45", "Net_GE45\HandyControlDemo_Net_GE45\HandyControlDemo_Net_GE45.csproj", "{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Net_GE45", "Net_GE45\HandyControlDemo_Net_GE45\HandyControlDemo_Net_GE45.csproj", "{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net_GE45", "Net_GE45", "{2F551C62-77F7-4FA5-8AD7-FCF53E92AE08}"
EndProject
@@ -17,11 +17,11 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControlDemo_Shared", "
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net_40", "Net_40", "{35E3F9C0-8924-4536-BE09-F3761FDBF066}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net_40", "Net_40\HandyControl_Net_40\HandyControl_Net_40.csproj", "{32204503-2EF0-4681-AE13-AA1FEB6C658A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Net_40", "Net_40\HandyControl_Net_40\HandyControl_Net_40.csproj", "{32204503-2EF0-4681-AE13-AA1FEB6C658A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Net_40", "Net_40\HandyControlDemo_Net_40\HandyControlDemo_Net_40.csproj", "{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Net_40", "Net_40\HandyControlDemo_Net_40\HandyControlDemo_Net_40.csproj", "{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
+3
View File
@@ -279,6 +279,9 @@
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Label_16x.png">
<Link>Resources\Img\LeftMainContent\Label_16x.png</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\layout-FlexLayout-16.png">
<Link>Resources\Img\LeftMainContent\layout-FlexLayout-16.png</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\LinearCarousel_16x.png">
<Link>Resources\Img\LeftMainContent\LinearCarousel_16x.png</Link>
</Resource>
src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+3
View File
@@ -279,6 +279,9 @@
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Label_16x.png">
<Link>Resources\Img\LeftMainContent\Label_16x.png</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\layout-FlexLayout-16.png">
<Link>Resources\Img\LeftMainContent\layout-FlexLayout-16.png</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\LinearCarousel_16x.png">
<Link>Resources\Img\LeftMainContent\LinearCarousel_16x.png</Link>
</Resource>
src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
+4
View File
@@ -496,6 +496,10 @@
<Link>UserControl\Controls\DrawerDemoCtl.xaml.cs</Link>
<DependentUpon>DrawerDemoCtl.xaml</DependentUpon>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\UserControl\Controls\FlexPanelDemoCtl.xaml.cs">
<Link>UserControl\Controls\FlexPanelDemoCtl.xaml.cs</Link>
<DependentUpon>FlexPanelDemoCtl.xaml</DependentUpon>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\UserControl\Controls\FlipClockDemoCtl.xaml.cs">
<Link>UserControl\Controls\FlipClockDemoCtl.xaml.cs</Link>
<DependentUpon>FlipClockDemoCtl.xaml</DependentUpon>
src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
+1
View File
@@ -78,6 +78,7 @@
[ "Divider", "DividerDemoCtl", "DottedSplitter_16x", "" ],
[ "CirclePanel", "CirclePanelDemoCtl", "ColorWheel_16x", "" ],
[ "Grid", "GridDemoCtl", "GridPane_16x", "" ],
[ "FlexPanel", "FlexPanelDemoCtl", "layout-FlexLayout-16", "1" ],
[ "RelativePanel", "RelativePanelDemoCtl", "TransformRelative_16x", "" ],
[ "WaterfallPanel", "WaterfallPanelDemoCtl", "Panel_16x", "" ],
[ "HoneycombPanel", "HoneycombPanelDemoCtl", "PolygonHexagon_16x", "" ],
src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
+7
View File
@@ -58,6 +58,9 @@
<Compile Include="$(MSBuildThisFileDirectory)UserControl\Basic\TextDialogWithTimer.xaml.cs">
<DependentUpon>TextDialogWithTimer.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\FlexPanelDemoCtl.xaml.cs">
<DependentUpon>FlexPanelDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\ImageSelectorDemoCtl.xaml.cs">
<DependentUpon>ImageSelectorDemoCtl.xaml</DependentUpon>
</Compile>
@@ -528,6 +531,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\FlexPanelDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\ImageSelectorDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
Generated
+1087 -645
View File
File diff suppressed because it is too large. Load diff
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
+3
View File
@@ -762,4 +762,7 @@
<data name="CheckComboBox" xml:space="preserve">
<value>CheckComboBox</value>
</data>
<data name="FlexPanel" xml:space="preserve">
<value>FlexPanel</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
+3
View File
@@ -762,4 +762,7 @@
<data name="CheckComboBox" xml:space="preserve">
<value>CheckComboBox</value>
</data>
<data name="FlexPanel" xml:space="preserve">
<value>FlexPanel</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
+5 -2
View File
@@ -130,10 +130,10 @@
<value>C'est une belle journée aujourd'hui</value>
</data>
<data name="GrowlSuccess" xml:space="preserve">
<value>Fichier enregistré</value>
<value>Fichier enregistré!</value>
</data>
<data name="GrowlWarning" xml:space="preserve">
<value>Espace disque bientôt epuisé</value>
<value>Espace disque bientôt epuisé!</value>
</data>
<data name="GrowlError" xml:space="preserve">
<value>Erreur de connexion. Veuillez vérifier votre réseau !</value>
@@ -762,4 +762,7 @@
<data name="CheckComboBox" xml:space="preserve">
<value>CheckComboBox</value>
</data>
<data name="FlexPanel" xml:space="preserve">
<value>FlexPanel</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
+3
View File
@@ -762,4 +762,7 @@
<data name="CheckComboBox" xml:space="preserve">
<value>CheckComboBox</value>
</data>
<data name="FlexPanel" xml:space="preserve">
<value>FlexPanel</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx
+3
View File
@@ -762,4 +762,7 @@
<data name="CheckComboBox" xml:space="preserve">
<value>CheckComboBox</value>
</data>
<data name="FlexPanel" xml:space="preserve">
<value>FlexPanel</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
+3
View File
@@ -762,4 +762,7 @@
<data name="CheckComboBox" xml:space="preserve">
<value>多选组合框</value>
</data>
<data name="FlexPanel" xml:space="preserve">
<value>弹性盒子</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx
+3
View File
@@ -762,4 +762,7 @@
<data name="CheckComboBox" xml:space="preserve">
<value>CheckComboBox</value>
</data>
<data name="FlexPanel" xml:space="preserve">
<value>FlexPanel</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx
+3
View File
@@ -762,4 +762,7 @@
<data name="CheckComboBox" xml:space="preserve">
<value>CheckComboBox</value>
</data>
<data name="FlexPanel" xml:space="preserve">
<value>FlexPanel</value>
</data>
</root>
src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
+12 -1
View File
@@ -99,7 +99,8 @@ namespace HandyControlDemo.Properties.Langs
OnPropertyChanged(nameof(Exit));
OnPropertyChanged(nameof(Expander));
OnPropertyChanged(nameof(Fatal));
OnPropertyChanged(nameof(FlipClock));
OnPropertyChanged(nameof(FlexPanel));
OnPropertyChanged(nameof(FlipClock));
OnPropertyChanged(nameof(FloatingBlock));
OnPropertyChanged(nameof(FlowDocument));
OnPropertyChanged(nameof(FlowDocumentPageViewer));
@@ -564,6 +565,11 @@ namespace HandyControlDemo.Properties.Langs
/// </summary>
public string Fatal => Lang.Fatal;
/// <summary>
/// 查找类似 弹性盒子 的本地化字符串。
/// </summary>
public string FlexPanel => Lang.FlexPanel;
/// <summary>
/// 查找类似 翻页时钟 的本地化字符串。
/// </summary>
@@ -1648,6 +1654,11 @@ namespace HandyControlDemo.Properties.Langs
/// </summary>
public static string Fatal = nameof(Fatal);
/// <summary>
/// 查找类似 弹性盒子 的本地化字符串。
/// </summary>
public static string FlexPanel = nameof(FlexPanel);
/// <summary>
/// 查找类似 翻页时钟 的本地化字符串。
/// </summary>
src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/layout-FlexLayout-16.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 121 B

src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlexPanelDemoCtl.xaml
+50
View File
@@ -0,0 +1,50 @@
<UserControl x:Class="HandyControlDemo.UserControl.FlexPanelDemoCtl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Background="{DynamicResource RegionBrush}"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:hc="https://handyorg.github.io/handycontrol">
<UserControl.Resources>
<Style x:Key="Border4FlexPanelDemoStyle" TargetType="Border">
<Setter Property="Width" Value="100"/>
<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
<Setter Property="Margin" Value="10"/>
<Setter Property="CornerRadius" Value="10"/>
</Style>
</UserControl.Resources>
<hc:TransitioningContentControl>
<ScrollViewer>
<hc:FlexPanel Margin="32" AlignItems="FlexStart" AlignContent="SpaceBetween" JustifyContent="SpaceAround" FlexWrap="WrapReverse" FlexDirection="RowReverse">
<Border hc:FlexPanel.Order="99" Height="50" Style="{StaticResource Border4FlexPanelDemoStyle}">
<TextBlock Text="0" Style="{StaticResource TextBlockTitle}"/>
</Border>
<Border hc:FlexPanel.FlexBasis="200" Height="100" Style="{StaticResource Border4FlexPanelDemoStyle}">
<TextBlock Text="1" Style="{StaticResource TextBlockTitle}"/>
</Border>
<Border hc:FlexPanel.AlignSelf="FlexEnd" Height="50" Style="{StaticResource Border4FlexPanelDemoStyle}">
<TextBlock Text="2" Style="{StaticResource TextBlockTitle}"/>
</Border>
<Border Height="100" Style="{StaticResource Border4FlexPanelDemoStyle}">
<TextBlock Text="3" Style="{StaticResource TextBlockTitle}"/>
</Border>
<Border Height="50" Style="{StaticResource Border4FlexPanelDemoStyle}">
<TextBlock Text="4" Style="{StaticResource TextBlockTitle}"/>
</Border>
<Border Height="100" Style="{StaticResource Border4FlexPanelDemoStyle}">
<TextBlock Text="5" Style="{StaticResource TextBlockTitle}"/>
</Border>
<Border Height="50" Style="{StaticResource Border4FlexPanelDemoStyle}">
<TextBlock Text="6" Style="{StaticResource TextBlockTitle}"/>
</Border>
<Border Height="100" Style="{StaticResource Border4FlexPanelDemoStyle}">
<TextBlock Text="7" Style="{StaticResource TextBlockTitle}"/>
</Border>
<Border Height="50" Style="{StaticResource Border4FlexPanelDemoStyle}">
<TextBlock Text="8" Style="{StaticResource TextBlockTitle}"/>
</Border>
<Border Height="100" Style="{StaticResource Border4FlexPanelDemoStyle}">
<TextBlock Text="9" Style="{StaticResource TextBlockTitle}"/>
</Border>
</hc:FlexPanel>
</ScrollViewer>
</hc:TransitioningContentControl>
</UserControl>
src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlexPanelDemoCtl.xaml.cs
+10
View File
@@ -0,0 +1,10 @@
namespace HandyControlDemo.UserControl
{
public partial class FlexPanelDemoCtl : IFull
{
public FlexPanelDemoCtl()
{
InitializeComponent();
}
}
}