Skip to content

Commit a76cd00

Browse files
author
Manuel Ullmann
committed
Allow horizontal buttons to wrap and minimize used space.
Signed-off-by: Manuel Ullmann <manuel.ullmann@rediecon.com>
1 parent 54136da commit a76cd00

File tree

1 file changed

+33
-17
lines changed

1 file changed

+33
-17
lines changed

‎Source/NETworkManager/Views/FirewallView.xaml‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,11 @@
5757
<Grid.ColumnDefinitions>
5858
<ColumnDefinition Width="*" />
5959
<ColumnDefinition Width="20" />
60-
<ColumnDefinition Width="Auto" />
60+
<ColumnDefinition Width="*" />
6161
</Grid.ColumnDefinitions>
62-
<StackPanel Grid.Column="2" Grid.Row="0" Orientation="Horizontal">
63-
<Button Margin="0,0,10,0"
62+
<WrapPanel Grid.Column="2" Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right">
63+
<Button Margin="5"
64+
MinWidth="20"
6465
Command="{Binding AddRuleCommand}"
6566
Style="{StaticResource ImageWithTextButton}"
6667
ToolTip="{Binding ToolTipAdd}">
@@ -77,12 +78,15 @@
7778
</Rectangle>
7879
<TextBlock Grid.Column="1"
7980
Text="{x:Static localization:Strings.Add}"
80-
Style="{StaticResource ButtonWithImageTextBlock}" />
81+
Style="{StaticResource ButtonWithImageTextBlock}"
82+
TextWrapping="Wrap"
83+
TextTrimming="CharacterEllipsis" />
8184
</Grid>
8285
</Button.Content>
8386
</Button>
84-
<Button Margin="0,0,10,0"
87+
<Button Margin="5"
8588
Style="{StaticResource ImageWithTextButton}"
89+
MinWidth="20"
8690
Command="{Binding DeleteRulesCommand}"
8791
IsEnabled="{Binding Path=FirewallRules.Count, Converter={StaticResource IntZeroToFalseConverter}}"
8892
ToolTip="{Binding ToolTipDelete}">
@@ -99,12 +103,15 @@
99103
</Rectangle>
100104
<TextBlock Grid.Column="1"
101105
Text="{x:Static localization:Strings.Delete}"
102-
Style="{StaticResource ButtonWithImageTextBlock}" />
106+
Style="{StaticResource ButtonWithImageTextBlock}"
107+
TextWrapping="Wrap"
108+
TextTrimming="CharacterEllipsis" />
103109
</Grid>
104110
</Button.Content>
105111
</Button>
106-
<Button Margin="0,0,10,0"
112+
<Button Margin="5"
107113
Style="{StaticResource ImageWithTextButton}"
114+
MinWidth="20"
108115
Command="{Binding DeleteAllRulesCommand}"
109116
IsEnabled="{Binding Path=FirewallRules.Count, Converter={StaticResource IntZeroToFalseConverter}}"
110117
ToolTip="{Binding ToolTipClear}">
@@ -121,12 +128,15 @@
121128
</Rectangle>
122129
<TextBlock Grid.Column="1"
123130
Text="{x:Static localization:Strings.DeleteAll}"
124-
Style="{StaticResource ButtonWithImageTextBlock}" />
131+
Style="{StaticResource ButtonWithImageTextBlock}"
132+
TextWrapping="Wrap"
133+
TextTrimming="CharacterEllipsis" />
125134
</Grid>
126135
</Button.Content>
127136
</Button>
128-
<Button Margin="0,0,0,0"
137+
<Button Margin="5"
129138
Style="{StaticResource ImageWithTextButton}"
139+
MinWidth="20"
130140
Command="{Binding ApplyConfigurationCommand}"
131141
IsEnabled="{Binding Path=FirewallRules.Count, Converter={StaticResource IntZeroToFalseConverter}}"
132142
ToolTip="{Binding ToolTipApply}">
@@ -143,14 +153,17 @@
143153
</Rectangle>
144154
<TextBlock Grid.Column="1"
145155
Text="{x:Static localization:Strings.Apply}"
146-
Style="{StaticResource ButtonWithImageTextBlock}" />
156+
Style="{StaticResource ButtonWithImageTextBlock}"
157+
TextWrapping="Wrap"
158+
TextTrimming="CharacterEllipsis" />
147159
</Grid>
148160
</Button.Content>
149161
</Button>
150-
</StackPanel>
151-
<StackPanel Grid.Column="0" Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left">
152-
<Button Margin="0,0,10,0"
162+
</WrapPanel>
163+
<WrapPanel Grid.Column="0" Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left">
164+
<Button Margin="5"
153165
Style="{StaticResource ImageWithTextButton}"
166+
MinWidth="20"
154167
Command="{Binding OpenWindowsFirewallCommand}"
155168
ToolTip="{Binding ToolTipOpenWindowsFirewall}">
156169
<Button.Content>
@@ -168,13 +181,15 @@
168181
<TextBlock Grid.Column="1"
169182
Text="{x:Static localization:Strings.WindowsFirewallSettings}"
170183
Style="{StaticResource ButtonWithImageTextBlock}"
171-
TextWrapping="Wrap" />
184+
TextWrapping="Wrap"
185+
TextTrimming="CharacterEllipsis" />
172186
</Grid>
173187
</Button.Content>
174188
</Button>
175189
<!-- Since the command is static, we need to raise the Click event here -->
176-
<Button Margin="0,0,0,0"
190+
<Button Margin="5"
177191
Style="{StaticResource ImageWithTextButton}"
192+
MinWidth="20"
178193
Command="{x:Static viewModels:FirewallViewModel.DeleteWindowsRulesCommand}"
179194
ToolTip="{Binding ToolTipClearWindows}"
180195
Click="AnyButton_OnClick">
@@ -193,11 +208,12 @@
193208
<TextBlock Grid.Column="1"
194209
Text="{x:Static localization:Strings.ClearRulesInWindows}"
195210
Style="{StaticResource ButtonWithImageTextBlock}"
196-
TextWrapping="Wrap" />
211+
TextWrapping="Wrap"
212+
TextTrimming="CharacterEllipsis" />
197213
</Grid>
198214
</Button.Content>
199215
</Button>
200-
</StackPanel>
216+
</WrapPanel>
201217
</Grid>
202218
</Grid>
203219
</TabItem>

0 commit comments

Comments
 (0)