Skip to content

Commit 580756c

Browse files
BornToBeRootBornToBeRoot
committed
Fix edit button issue if item text is longer than the grid width
1 parent 2aaf7af commit 580756c

15 files changed

+100
-57
lines changed

‎Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</Grid.ColumnDefinitions>
1818
<Rectangle Grid.Column="0" x:Name="Chevron" Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}" VerticalAlignment="Center">
1919
<Rectangle.OpacityMask>
20-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinDown}" />
20+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinUp}" />
2121
</Rectangle.OpacityMask>
2222
</Rectangle>
2323
<mahAppsControls:ContentControlEx Grid.Column="1"
@@ -40,7 +40,7 @@
4040
<Trigger Property="IsChecked" Value="True">
4141
<Setter TargetName="Chevron" Property="OpacityMask">
4242
<Setter.Value>
43-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinUp}" />
43+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinDown}" />
4444
</Setter.Value>
4545
</Setter>
4646
</Trigger>
@@ -82,7 +82,7 @@
8282
</Grid.RowDefinitions>
8383
<Rectangle Grid.Row="0" x:Name="Chevron" Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,15,10,10" VerticalAlignment="Center" HorizontalAlignment="Center">
8484
<Rectangle.OpacityMask>
85-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinRight}" />
85+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinLeft}" />
8686
</Rectangle.OpacityMask>
8787
</Rectangle>
8888
<TextBlock Grid.Row="1" Text="{TemplateBinding Content}" TextOptions.TextFormattingMode="Display" Foreground="{TemplateBinding Foreground}" Style="{StaticResource DefaultTextBlock}" FontSize="18" Margin="0" VerticalAlignment="Center" HorizontalAlignment="Center">

‎Source/NETworkManager/Resources/Styles/TextBlockStyles.xaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
<Setter Property="VerticalAlignment" Value="Center" />
1818
</Style>
1919

20+
<Style x:Key="ProfileGroupTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DefaultTextBlock}">
21+
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray3}" />
22+
<Setter Property="VerticalAlignment" Value="Center" />
23+
</Style>
24+
2025
<Style x:Key="AccentTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DefaultTextBlock}">
2126
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
2227
</Style>

‎Source/NETworkManager/Views/DNSLookupHostView.xaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
</ToggleButton.Style>
133133
<Rectangle Width="16" Height="16">
134134
<Rectangle.OpacityMask>
135-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinLeft}" />
135+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinRight}" />
136136
</Rectangle.OpacityMask>
137137
<Rectangle.Style>
138138
<Style TargetType="{x:Type Rectangle}">
@@ -226,11 +226,14 @@
226226
<Expander.Header>
227227
<Grid>
228228
<Grid.ColumnDefinitions>
229-
<ColumnDefinition Width="*" />
230229
<ColumnDefinition Width="Auto" />
230+
<ColumnDefinition Width="10" />
231+
<ColumnDefinition Width="Auto" />
232+
<ColumnDefinition Width="*" />
231233
</Grid.ColumnDefinitions>
232-
<TextBlock Grid.Column="0" Text="{Binding (CollectionViewGroup.Name)}" Style="{DynamicResource DefaultTextBlock}"/>
233-
<Button Grid.Column="1" ToolTip="{x:Static localization:Strings.EditGroupDots}" Command="{Binding DataContext.EditGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBox}}}" CommandParameter="{Binding (CollectionViewGroup.Name)}" Visibility="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid}}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource CleanButton}">
234+
<Rectangle Grid.Column="0" Grid.ColumnSpan="4" Fill="Transparent" />
235+
<TextBlock Grid.Column="0" Text="{Binding (CollectionViewGroup.Name)}" Style="{DynamicResource ProfileGroupTextBlock}" />
236+
<Button Grid.Column="2" ToolTip="{x:Static localization:Strings.EditGroupDots}" Command="{Binding DataContext.EditGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBox}}}" CommandParameter="{Binding (CollectionViewGroup.Name)}" Visibility="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid}}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource CleanButton}">
234237
<Rectangle Width="16" Height="16">
235238
<Rectangle.OpacityMask>
236239
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Edit}" />

‎Source/NETworkManager/Views/IPScannerHostView.xaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
</ToggleButton.Style>
133133
<Rectangle Width="16" Height="16">
134134
<Rectangle.OpacityMask>
135-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinLeft}" />
135+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinRight}" />
136136
</Rectangle.OpacityMask>
137137
<Rectangle.Style>
138138
<Style TargetType="{x:Type Rectangle}">
@@ -226,11 +226,14 @@
226226
<Expander.Header>
227227
<Grid>
228228
<Grid.ColumnDefinitions>
229-
<ColumnDefinition Width="*" />
230229
<ColumnDefinition Width="Auto" />
230+
<ColumnDefinition Width="10" />
231+
<ColumnDefinition Width="Auto" />
232+
<ColumnDefinition Width="*" />
231233
</Grid.ColumnDefinitions>
232-
<TextBlock Grid.Column="0" Text="{Binding (CollectionViewGroup.Name)}" Style="{DynamicResource DefaultTextBlock}"/>
233-
<Button Grid.Column="1" ToolTip="{x:Static localization:Strings.EditGroupDots}" Command="{Binding DataContext.EditGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBox}}}" CommandParameter="{Binding (CollectionViewGroup.Name)}" Visibility="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid}}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource CleanButton}">
234+
<Rectangle Grid.Column="0" Grid.ColumnSpan="4" Fill="Transparent" />
235+
<TextBlock Grid.Column="0" Text="{Binding (CollectionViewGroup.Name)}" Style="{DynamicResource ProfileGroupTextBlock}" />
236+
<Button Grid.Column="2" ToolTip="{x:Static localization:Strings.EditGroupDots}" Command="{Binding DataContext.EditGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBox}}}" CommandParameter="{Binding (CollectionViewGroup.Name)}" Visibility="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid}}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource CleanButton}">
234237
<Rectangle Width="16" Height="16">
235238
<Rectangle.OpacityMask>
236239
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Edit}" />

‎Source/NETworkManager/Views/NetworkInterfaceView.xaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@
860860
</ToggleButton.Style>
861861
<Rectangle Width="16" Height="16">
862862
<Rectangle.OpacityMask>
863-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinLeft}" />
863+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinRight}" />
864864
</Rectangle.OpacityMask>
865865
<Rectangle.Style>
866866
<Style TargetType="{x:Type Rectangle}">
@@ -949,11 +949,14 @@
949949
<Expander.Header>
950950
<Grid>
951951
<Grid.ColumnDefinitions>
952-
<ColumnDefinition Width="*" />
953952
<ColumnDefinition Width="Auto" />
953+
<ColumnDefinition Width="10" />
954+
<ColumnDefinition Width="Auto" />
955+
<ColumnDefinition Width="*" />
954956
</Grid.ColumnDefinitions>
955-
<TextBlock Grid.Column="0" Text="{Binding Name}" Style="{DynamicResource DefaultTextBlock}"/>
956-
<Button Grid.Column="1" ToolTip="{x:Static localization:Strings.EditGroupDots}" Command="{Binding DataContext.EditGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBox}}}" CommandParameter="{Binding Name}" Visibility="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid}}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource CleanButton}">
957+
<Rectangle Grid.Column="0" Grid.ColumnSpan="4" Fill="Transparent" />
958+
<TextBlock Grid.Column="0" Text="{Binding (CollectionViewGroup.Name)}" Style="{DynamicResource ProfileGroupTextBlock}" />
959+
<Button Grid.Column="2" ToolTip="{x:Static localization:Strings.EditGroupDots}" Command="{Binding DataContext.EditGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBox}}}" CommandParameter="{Binding (CollectionViewGroup.Name)}" Visibility="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid}}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource CleanButton}">
957960
<Rectangle Width="16" Height="16">
958961
<Rectangle.OpacityMask>
959962
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Edit}" />

‎Source/NETworkManager/Views/PingMonitorHostView.xaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
</ToggleButton.Style>
183183
<Rectangle Width="16" Height="16">
184184
<Rectangle.OpacityMask>
185-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinLeft}" />
185+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinRight}" />
186186
</Rectangle.OpacityMask>
187187
<Rectangle.Style>
188188
<Style TargetType="{x:Type Rectangle}">
@@ -276,11 +276,14 @@
276276
<Expander.Header>
277277
<Grid>
278278
<Grid.ColumnDefinitions>
279-
<ColumnDefinition Width="*" />
280279
<ColumnDefinition Width="Auto" />
280+
<ColumnDefinition Width="10" />
281+
<ColumnDefinition Width="Auto" />
282+
<ColumnDefinition Width="*" />
281283
</Grid.ColumnDefinitions>
282-
<TextBlock Grid.Column="0" Text="{Binding (CollectionViewGroup.Name)}" Style="{DynamicResource DefaultTextBlock}"/>
283-
<Button Grid.Column="1" ToolTip="{x:Static localization:Strings.EditGroupDots}" Command="{Binding DataContext.EditGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBox}}}" CommandParameter="{Binding (CollectionViewGroup.Name)}" Visibility="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid}}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource CleanButton}">
284+
<Rectangle Grid.Column="0" Grid.ColumnSpan="4" Fill="Transparent" />
285+
<TextBlock Grid.Column="0" Text="{Binding (CollectionViewGroup.Name)}" Style="{DynamicResource ProfileGroupTextBlock}" />
286+
<Button Grid.Column="2" ToolTip="{x:Static localization:Strings.EditGroupDots}" Command="{Binding DataContext.EditGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBox}}}" CommandParameter="{Binding (CollectionViewGroup.Name)}" Visibility="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid}}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource CleanButton}">
284287
<Rectangle Width="16" Height="16">
285288
<Rectangle.OpacityMask>
286289
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Edit}" />

‎Source/NETworkManager/Views/PortScannerHostView.xaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
</ToggleButton.Style>
133133
<Rectangle Width="16" Height="16">
134134
<Rectangle.OpacityMask>
135-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinLeft}" />
135+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinRight}" />
136136
</Rectangle.OpacityMask>
137137
<Rectangle.Style>
138138
<Style TargetType="{x:Type Rectangle}">
@@ -226,11 +226,14 @@
226226
<Expander.Header>
227227
<Grid>
228228
<Grid.ColumnDefinitions>
229-
<ColumnDefinition Width="*" />
230229
<ColumnDefinition Width="Auto" />
230+
<ColumnDefinition Width="10" />
231+
<ColumnDefinition Width="Auto" />
232+
<ColumnDefinition Width="*" />
231233
</Grid.ColumnDefinitions>
232-
<TextBlock Grid.Column="0" Text="{Binding (CollectionViewGroup.Name)}" Style="{DynamicResource DefaultTextBlock}"/>
233-
<Button Grid.Column="1" ToolTip="{x:Static localization:Strings.EditGroupDots}" Command="{Binding DataContext.EditGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBox}}}" CommandParameter="{Binding (CollectionViewGroup.Name)}" Visibility="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid}}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource CleanButton}">
234+
<Rectangle Grid.Column="0" Grid.ColumnSpan="4" Fill="Transparent" />
235+
<TextBlock Grid.Column="0" Text="{Binding (CollectionViewGroup.Name)}" Style="{DynamicResource ProfileGroupTextBlock}" />
236+
<Button Grid.Column="2" ToolTip="{x:Static localization:Strings.EditGroupDots}" Command="{Binding DataContext.EditGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBox}}}" CommandParameter="{Binding (CollectionViewGroup.Name)}" Visibility="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid}}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource CleanButton}">
234237
<Rectangle Width="16" Height="16">
235238
<Rectangle.OpacityMask>
236239
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Edit}" />

0 commit comments

Comments
 (0)