Skip to content

Commit 11d62a8

Browse files
authored
Merge pull request #471 from HandyOrg/add-Flex
Add flex
2 parents c6262c0 + d07e1a3 commit 11d62a8

8 files changed

Lines changed: 789 additions & 0 deletions

File tree

src/Shared/HandyControl_Shared/Controls/Panel/FlexPanel.cs

Lines changed: 717 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
namespace HandyControl.Data
2+
{
3+
public enum FlexContentAlignment
4+
{
5+
Stretch,
6+
FlexStart,
7+
FlexEnd,
8+
Center,
9+
SpaceBetween,
10+
SpaceAround
11+
}
12+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
namespace HandyControl.Data
2+
{
3+
public enum FlexContentJustify
4+
{
5+
FlexStart,
6+
FlexEnd,
7+
Center,
8+
SpaceBetween,
9+
SpaceAround
10+
}
11+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
namespace HandyControl.Data
2+
{
3+
public enum FlexDirection
4+
{
5+
Row,
6+
RowReverse,
7+
Column,
8+
ColumnReverse
9+
}
10+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
namespace HandyControl.Data
2+
{
3+
public enum FlexItemAlignment
4+
{
5+
Auto,
6+
FlexStart,
7+
FlexEnd,
8+
Center,
9+
Baseline,
10+
Stretch
11+
}
12+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
namespace HandyControl.Data
2+
{
3+
public enum FlexItemsAlignment
4+
{
5+
Stretch,
6+
FlexStart,
7+
FlexEnd,
8+
Center,
9+
Baseline
10+
}
11+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
namespace HandyControl.Data
2+
{
3+
public enum FlexWrap
4+
{
5+
NoWrap,
6+
Wrap,
7+
WrapReverse
8+
}
9+
}

src/Shared/HandyControl_Shared/HandyControl_Shared.projitems

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
<Compile Include="$(MSBuildThisFileDirectory)Controls\Other\Notification.cs" />
4646
<Compile Include="$(MSBuildThisFileDirectory)Controls\Other\Poptip.cs" />
4747
<Compile Include="$(MSBuildThisFileDirectory)Controls\Other\Watermark.cs" />
48+
<Compile Include="$(MSBuildThisFileDirectory)Controls\Panel\FlexPanel.cs" />
4849
<Compile Include="$(MSBuildThisFileDirectory)Controls\PropertyGrid\Editors\ImagePropertyEditor.cs" />
4950
<Compile Include="$(MSBuildThisFileDirectory)Controls\PropertyGrid\Editors\VerticalAlignmentPropertyEditor.cs" />
5051
<Compile Include="$(MSBuildThisFileDirectory)Controls\PropertyGrid\Editors\HorizontalAlignmentPropertyEditor.cs" />
@@ -74,6 +75,12 @@
7475
<Compile Include="$(MSBuildThisFileDirectory)Controls\Text\SimpleText.cs" />
7576
<Compile Include="$(MSBuildThisFileDirectory)Controls\Window\GlowWindow.cs" />
7677
<Compile Include="$(MSBuildThisFileDirectory)Collections\DateTimeRangeComparer.cs" />
78+
<Compile Include="$(MSBuildThisFileDirectory)Data\Flex\FlexContentJustify.cs" />
79+
<Compile Include="$(MSBuildThisFileDirectory)Data\Flex\FlexContentAlignment.cs" />
80+
<Compile Include="$(MSBuildThisFileDirectory)Data\Flex\FlexItemAlignment.cs" />
81+
<Compile Include="$(MSBuildThisFileDirectory)Data\Flex\FlexItemsAlignment.cs" />
82+
<Compile Include="$(MSBuildThisFileDirectory)Data\Flex\FlexDirection.cs" />
83+
<Compile Include="$(MSBuildThisFileDirectory)Data\Flex\FlexWrap.cs" />
7784
<Compile Include="$(MSBuildThisFileDirectory)Data\Range\DateTimeRange.cs" />
7885
<Compile Include="$(MSBuildThisFileDirectory)Data\DisposableObject.cs" />
7986
<Compile Include="$(MSBuildThisFileDirectory)Data\Enum\EnumDataProvider.cs" />

0 commit comments

Comments
 (0)