Skip to content

Commit 9c53799

Browse files
NaBianNaBian
committed
Update NonClientAreaContent.xaml
1 parent 3821852 commit 9c53799

File tree

1 file changed

+36
-42
lines changed

1 file changed

+36
-42
lines changed

‎src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.xaml‎

Lines changed: 36 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -114,51 +114,45 @@
114114
<TextBlock FontWeight="Bold" Text="{Binding VersionInfo}" VerticalAlignment="Center" Foreground="{DynamicResource PrimaryTextBrush}"/>
115115
</Border>
116116
</StackPanel>
117-
<Button Grid.Column="1" Click="ButtonConfig_OnClick" Name="ButtonConfig" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}" hc:IconElement.Geometry="{StaticResource ConfigGeometry}"/>
117+
<Button Grid.Column="1" Click="ButtonConfig_OnClick" Name="ButtonConfig" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource ConfigGeometry}"/>
118118
<Popup AllowsTransparency="True" Grid.Column="1" PlacementTarget="{Binding ElementName=ButtonConfig}" HorizontalOffset="-28" Name="PopupConfig" VerticalOffset="6" StaysOpen="False">
119119
<Border Background="{DynamicResource SecondaryRegionBrush}" CornerRadius="4" Margin="16" Effect="{StaticResource EffectShadow2}">
120120
<StackPanel Orientation="Horizontal">
121-
<StackPanel Orientation="Horizontal" Margin="10">
122-
<StackPanel Button.Click="ButtonLangs_OnClick">
123-
<Button Tag="zh-cn" Style="{StaticResource ButtonCustom}">
124-
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/cn.png"/>
125-
</Button>
126-
<Button Tag="en" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
127-
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/en.png"/>
128-
</Button>
129-
<Button Tag="fa" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
130-
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/fa.png"/>
131-
</Button>
132-
<Button Tag="fr" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
133-
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/fr.png"/>
134-
</Button>
135-
<Button Tag="ca-ES" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
136-
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/ca-Es.png"/>
137-
</Button>
138-
</StackPanel>
139-
<StackPanel Button.Click="ButtonLangs_OnClick" Margin="10,0,0,0">
140-
<Button Tag="ko-KR" Style="{StaticResource ButtonCustom}">
141-
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/ko-KR.png"/>
142-
</Button>
143-
<Button Tag="ru" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
144-
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/ru.png"/>
145-
</Button>
146-
<Button Tag="tr" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
147-
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/tr.png"/>
148-
</Button>
149-
<Button Tag="pt-BR" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
150-
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/pt-BR.png"/>
151-
</Button>
152-
<Button Tag="pl" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
153-
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/pl.png" />
154-
</Button>
155-
</StackPanel>
156-
<StackPanel Button.Click="ButtonLangs_OnClick" Margin="10,0,0,0">
157-
<Button Tag="es" Style="{StaticResource ButtonCustom}">
158-
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/es.png"/>
159-
</Button>
160-
</StackPanel>
161-
</StackPanel>
121+
<hc:UniformSpacingPanel Button.Click="ButtonLangs_OnClick" Orientation="Vertical" Margin="10" Spacing="10" ChildWrapping="Wrap" MaxHeight="134">
122+
<Button Tag="zh-cn" Style="{StaticResource ButtonCustom}">
123+
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/cn.png"/>
124+
</Button>
125+
<Button Tag="en" Style="{StaticResource ButtonCustom}">
126+
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/en.png"/>
127+
</Button>
128+
<Button Tag="fa" Style="{StaticResource ButtonCustom}">
129+
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/fa.png"/>
130+
</Button>
131+
<Button Tag="fr" Style="{StaticResource ButtonCustom}">
132+
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/fr.png"/>
133+
</Button>
134+
<Button Tag="ca-ES" Style="{StaticResource ButtonCustom}">
135+
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/ca-Es.png"/>
136+
</Button>
137+
<Button Tag="ko-KR" Style="{StaticResource ButtonCustom}">
138+
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/ko-KR.png"/>
139+
</Button>
140+
<Button Tag="ru" Style="{StaticResource ButtonCustom}">
141+
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/ru.png"/>
142+
</Button>
143+
<Button Tag="tr" Style="{StaticResource ButtonCustom}">
144+
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/tr.png"/>
145+
</Button>
146+
<Button Tag="pt-BR" Style="{StaticResource ButtonCustom}">
147+
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/pt-BR.png"/>
148+
</Button>
149+
<Button Tag="pl" Style="{StaticResource ButtonCustom}">
150+
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/pl.png" />
151+
</Button>
152+
<Button Tag="es" Style="{StaticResource ButtonCustom}">
153+
<Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/es.png"/>
154+
</Button>
155+
</hc:UniformSpacingPanel>
162156
<hc:Divider LineStrokeDashArray="2,2" Orientation="Vertical" Margin="0,20" LineStrokeThickness="2"/>
163157
<StackPanel Button.Click="ButtonSkins_OnClick" Margin="10,10,10,10">
164158
<Button Tag="{x:Static hc:SkinType.Default}" Style="{StaticResource ButtonCustom}">

0 commit comments

Comments
 (0)