Skip to content

Commit fc84f80

Browse files
NaBianNaBian
committed
add FlexPanel demo
1 parent 11d62a8 commit fc84f80

File tree

21 files changed

+1224
-659
lines changed

21 files changed

+1224
-659
lines changed

‎README-cn.md‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
<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>
7777
<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>
7878
<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>
79+
<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>
7980

8081
## Special thanks to
8182

@@ -124,6 +125,10 @@ Step 4: Enjoy coding
124125

125126
## Latest examples
126127

128+
### FlexPanel
129+
130+
![FlexPanel](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/FlexPanel.gif)
131+
127132
### CheckComboBox
128133

129134
![CheckComboBox](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/CheckComboBox.png)
@@ -140,12 +145,12 @@ Step 4: Enjoy coding
140145

141146
![Screenshot](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Screenshot.png)
142147

148+
## History publication
149+
143150
### GooeyEffect
144151

145152
![GooeyEffect](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/GooeyEffect.gif)
146153

147-
## History publication
148-
149154
### GlowWindow
150155

151156
![GlowWindow](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/GlowWindow.png)

‎README.md‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
<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>
7777
<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>
7878
<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>
79+
<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>
7980

8081
## Special thanks to
8182

@@ -124,6 +125,10 @@ Step 4: Enjoy coding
124125

125126
## Latest examples
126127

128+
### FlexPanel
129+
130+
![FlexPanel](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/FlexPanel.gif)
131+
127132
### CheckComboBox
128133

129134
![CheckComboBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/CheckComboBox.png)
@@ -140,12 +145,12 @@ Step 4: Enjoy coding
140145

141146
![Screenshot](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Screenshot.png)
142147

148+
## History publication
149+
143150
### GooeyEffect
144151

145152
![GooeyEffect](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GooeyEffect.gif)
146153

147-
## History publication
148-
149154
### GlowWindow
150155

151156
![GlowWindow](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GlowWindow.png)

‎src/HandyControl.sln‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.28729.10
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net_GE45", "Net_GE45\HandyControl_Net_GE45\HandyControl_Net_GE45.csproj", "{DC966E3D-BCFF-4652-98CF-070E5494749A}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Net_GE45", "Net_GE45\HandyControl_Net_GE45\HandyControl_Net_GE45.csproj", "{DC966E3D-BCFF-4652-98CF-070E5494749A}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Net_GE45", "Net_GE45\HandyControlDemo_Net_GE45\HandyControlDemo_Net_GE45.csproj", "{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Net_GE45", "Net_GE45\HandyControlDemo_Net_GE45\HandyControlDemo_Net_GE45.csproj", "{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}"
99
EndProject
1010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net_GE45", "Net_GE45", "{2F551C62-77F7-4FA5-8AD7-FCF53E92AE08}"
1111
EndProject
@@ -17,11 +17,11 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControlDemo_Shared", "
1717
EndProject
1818
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net_40", "Net_40", "{35E3F9C0-8924-4536-BE09-F3761FDBF066}"
1919
EndProject
20-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net_40", "Net_40\HandyControl_Net_40\HandyControl_Net_40.csproj", "{32204503-2EF0-4681-AE13-AA1FEB6C658A}"
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Net_40", "Net_40\HandyControl_Net_40\HandyControl_Net_40.csproj", "{32204503-2EF0-4681-AE13-AA1FEB6C658A}"
2121
EndProject
22-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Net_40", "Net_40\HandyControlDemo_Net_40\HandyControlDemo_Net_40.csproj", "{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Net_40", "Net_40\HandyControlDemo_Net_40\HandyControlDemo_Net_40.csproj", "{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}"
2323
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}"
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}"
2525
EndProject
2626
Global
2727
GlobalSection(SharedMSBuildProjectFiles) = preSolution

‎src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,9 @@
279279
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Label_16x.png">
280280
<Link>Resources\Img\LeftMainContent\Label_16x.png</Link>
281281
</Resource>
282+
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\layout-FlexLayout-16.png">
283+
<Link>Resources\Img\LeftMainContent\layout-FlexLayout-16.png</Link>
284+
</Resource>
282285
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\LinearCarousel_16x.png">
283286
<Link>Resources\Img\LeftMainContent\LinearCarousel_16x.png</Link>
284287
</Resource>

‎src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,9 @@
279279
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Label_16x.png">
280280
<Link>Resources\Img\LeftMainContent\Label_16x.png</Link>
281281
</Resource>
282+
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\layout-FlexLayout-16.png">
283+
<Link>Resources\Img\LeftMainContent\layout-FlexLayout-16.png</Link>
284+
</Resource>
282285
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\LinearCarousel_16x.png">
283286
<Link>Resources\Img\LeftMainContent\LinearCarousel_16x.png</Link>
284287
</Resource>

‎src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,10 @@
496496
<Link>UserControl\Controls\DrawerDemoCtl.xaml.cs</Link>
497497
<DependentUpon>DrawerDemoCtl.xaml</DependentUpon>
498498
</Resource>
499+
<Resource Include="..\..\Shared\HandyControlDemo_Shared\UserControl\Controls\FlexPanelDemoCtl.xaml.cs">
500+
<Link>UserControl\Controls\FlexPanelDemoCtl.xaml.cs</Link>
501+
<DependentUpon>FlexPanelDemoCtl.xaml</DependentUpon>
502+
</Resource>
499503
<Resource Include="..\..\Shared\HandyControlDemo_Shared\UserControl\Controls\FlipClockDemoCtl.xaml.cs">
500504
<Link>UserControl\Controls\FlipClockDemoCtl.xaml.cs</Link>
501505
<DependentUpon>FlipClockDemoCtl.xaml</DependentUpon>

‎src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
[ "Divider", "DividerDemoCtl", "DottedSplitter_16x", "" ],
7979
[ "CirclePanel", "CirclePanelDemoCtl", "ColorWheel_16x", "" ],
8080
[ "Grid", "GridDemoCtl", "GridPane_16x", "" ],
81+
[ "FlexPanel", "FlexPanelDemoCtl", "layout-FlexLayout-16", "1" ],
8182
[ "RelativePanel", "RelativePanelDemoCtl", "TransformRelative_16x", "" ],
8283
[ "WaterfallPanel", "WaterfallPanelDemoCtl", "Panel_16x", "" ],
8384
[ "HoneycombPanel", "HoneycombPanelDemoCtl", "PolygonHexagon_16x", "" ],

‎src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
<Compile Include="$(MSBuildThisFileDirectory)UserControl\Basic\TextDialogWithTimer.xaml.cs">
5959
<DependentUpon>TextDialogWithTimer.xaml</DependentUpon>
6060
</Compile>
61+
<Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\FlexPanelDemoCtl.xaml.cs">
62+
<DependentUpon>FlexPanelDemoCtl.xaml</DependentUpon>
63+
</Compile>
6164
<Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\ImageSelectorDemoCtl.xaml.cs">
6265
<DependentUpon>ImageSelectorDemoCtl.xaml</DependentUpon>
6366
</Compile>
@@ -528,6 +531,10 @@
528531
<SubType>Designer</SubType>
529532
<Generator>MSBuild:Compile</Generator>
530533
</Page>
534+
<Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\FlexPanelDemoCtl.xaml">
535+
<SubType>Designer</SubType>
536+
<Generator>MSBuild:Compile</Generator>
537+
</Page>
531538
<Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\ImageSelectorDemoCtl.xaml">
532539
<SubType>Designer</SubType>
533540
<Generator>MSBuild:Compile</Generator>

0 commit comments

Comments
 (0)