Skip to content

Commit 30dc581

Browse files
BornToBeRootBornToBeRoot
committed
Tabs / Expander redesign
1 parent 449842f commit 30dc581

19 files changed

+24
-50
lines changed

‎Source/NETworkManager/MainWindow.xaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,13 @@
188188
</Style>
189189
</Grid.Style>
190190
<Border Grid.Row="0" BorderBrush="{DynamicResource MahApps.Brushes.Gray8}" BorderThickness="0,0,0,1" Background="Transparent">
191-
192191
<Grid>
193192
<Grid.ColumnDefinitions>
194193
<ColumnDefinition Width="*" />
195194
<ColumnDefinition Width="Auto" />
196195
</Grid.ColumnDefinitions>
197196
<Grid.RowDefinitions>
198-
<RowDefinition Height="31" />
197+
<RowDefinition Height="48" />
199198
</Grid.RowDefinitions>
200199
<Button Grid.Column="0" Command="{Binding OpenApplicationListCommand}" ToolTip="{x:Static localization:Strings.Search}">
201200
<Button.Style>
@@ -225,9 +224,9 @@
225224
</Style.Triggers>
226225
</Style>
227226
</Button.Style>
228-
<Rectangle Width="16" Height="16">
227+
<Rectangle Grid.Column="0" Width="24" Height="24" Margin="0,0,-2,0">
229228
<Rectangle.OpacityMask>
230-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ChevronDoubleRight}" />
229+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:VaadinIcons Kind=Sitemap}" />
231230
</Rectangle.OpacityMask>
232231
<Rectangle.Style>
233232
<Style TargetType="{x:Type Rectangle}">
@@ -564,7 +563,7 @@
564563
<ColumnDefinition Width="48" />
565564
<ColumnDefinition Width="*" />
566565
</Grid.ColumnDefinitions>
567-
<Rectangle Grid.Column="0" Width="24" Height="24">
566+
<Rectangle Grid.Column="0" Width="24" Height="24" Margin="0,0,-2,0">
568567
<Rectangle.OpacityMask>
569568
<VisualBrush Stretch="Uniform" Visual="{iconPacks:MaterialLight Kind=Cog}" />
570569
</Rectangle.OpacityMask>
@@ -641,7 +640,7 @@
641640
</Grid.Style>
642641
<Grid>
643642
<Grid.RowDefinitions>
644-
<RowDefinition Height="32" />
643+
<RowDefinition Height="49" />
645644
<RowDefinition Height="*" />
646645
</Grid.RowDefinitions>
647646
<Border Grid.Row="0" BorderBrush="{DynamicResource MahApps.Brushes.Gray8}" BorderThickness="0,0,0,1">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<Setter.Value>
6161
<DataTemplate DataType="networkManagerControls:DragablzTabItem">
6262
<Border BorderBrush="{DynamicResource MahApps.Brushes.Gray8}" BorderThickness="0,0,1,0">
63-
<Grid Height="32">
63+
<Grid Height="49">
6464
<Grid.InputBindings>
6565
<MouseBinding Command="dragablz:TabablzControl.CloseItemCommand" Gesture="MiddleClick" />
6666
</Grid.InputBindings>

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

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -64,33 +64,7 @@
6464
</Style>
6565

6666
<Style x:Key="ProfileExpanderOpen" BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Down}" TargetType="{x:Type ToggleButton}">
67-
<Setter Property="Template" Value="{x:Null}">
68-
<!--
69-
<Setter.Value>
70-
<ControlTemplate TargetType="{x:Type ToggleButton}">
71-
72-
<Border Padding="{TemplateBinding Padding}"
73-
Background="{TemplateBinding Background}"
74-
BorderBrush="{StaticResource MahApps.Brushes.Gray8}"
75-
BorderThickness="0,0,0,1">
76-
<Grid Background="Transparent" SnapsToDevicePixels="False" Height="27">
77-
<Rectangle Grid.Column="0" x:Name="Chevron" Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="0,0,10,0" VerticalAlignment="Center" HorizontalAlignment="Center">
78-
<Rectangle.OpacityMask>
79-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinLeft}" />
80-
</Rectangle.OpacityMask>
81-
</Rectangle>
82-
</Grid>
83-
</Border>
84-
85-
<ControlTemplate.Triggers>
86-
<Trigger Property="IsMouseOver" Value="True">
87-
<Setter TargetName="Chevron" Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray5}"/>
88-
</Trigger>
89-
</ControlTemplate.Triggers>
90-
</ControlTemplate>
91-
</Setter.Value>
92-
-->
93-
</Setter>
67+
<Setter Property="Template" Value="{x:Null}" />
9468
</Style>
9569

9670
<Style x:Key="ProfileExpanderClosed" BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Right}" TargetType="{x:Type ToggleButton}">
@@ -106,7 +80,7 @@
10680
<RowDefinition Height="Auto" />
10781
<RowDefinition Height="*" />
10882
</Grid.RowDefinitions>
109-
<Rectangle Grid.Row="0" x:Name="Chevron" Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,6,10,10" VerticalAlignment="Center" HorizontalAlignment="Center">
83+
<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">
11084
<Rectangle.OpacityMask>
11185
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinRight}" />
11286
</Rectangle.OpacityMask>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray3}" />
55
<Setter Property="Background" Value="Transparent" />
66
<Setter Property="BorderThickness" Value="0" />
7-
<Setter Property="Height" Value="34" />
7+
<Setter Property="Height" Value="51" />
88
<Setter Property="Margin" Value="0" />
99
<Setter Property="Padding" Value="10,0" />
1010
<Setter Property="MinWidth" Value="150" />

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
<Setter Property="GlowBrush" Value="{DynamicResource MahApps.Brushes.Gray8}" />
77
<Setter Property="NonActiveGlowBrush" Value="Transparent" />
88
<Setter Property="TitleForeground" Value="{DynamicResource MahApps.Brushes.Gray3}" />
9+
<Setter Property="ShowTitleBar" Value="True" />
910
</Style>
1011
</ResourceDictionary>

‎Source/NETworkManager/Views/DNSLookupHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<Grid>
107107
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
108108
<Grid.RowDefinitions>
109-
<RowDefinition Height="Auto" />
109+
<RowDefinition Height="30" />
110110
<RowDefinition Height="10" />
111111
<RowDefinition Height="*" />
112112
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/IPScannerHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<Grid>
107107
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
108108
<Grid.RowDefinitions>
109-
<RowDefinition Height="Auto" />
109+
<RowDefinition Height="30" />
110110
<RowDefinition Height="10" />
111111
<RowDefinition Height="*" />
112112
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/NetworkInterfaceView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@
884884
<Grid>
885885
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
886886
<Grid.RowDefinitions>
887-
<RowDefinition Height="Auto" />
887+
<RowDefinition Height="30" />
888888
<RowDefinition Height="10" />
889889
<RowDefinition Height="*" />
890890
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/PingMonitorHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
<Grid>
154154
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
155155
<Grid.RowDefinitions>
156-
<RowDefinition Height="Auto" />
156+
<RowDefinition Height="30" />
157157
<RowDefinition Height="10" />
158158
<RowDefinition Height="*" />
159159
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/PortScannerHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<Grid>
107107
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
108108
<Grid.RowDefinitions>
109-
<RowDefinition Height="Auto" />
109+
<RowDefinition Height="30" />
110110
<RowDefinition Height="10" />
111111
<RowDefinition Height="*" />
112112
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/PowerShellHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
<Grid>
186186
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
187187
<Grid.RowDefinitions>
188-
<RowDefinition Height="Auto" />
188+
<RowDefinition Height="30" />
189189
<RowDefinition Height="10" />
190190
<RowDefinition Height="*" />
191191
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/ProfilesView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</Grid.RowDefinitions>
2929
<Grid Grid.Row="0">
3030
<Grid.ColumnDefinitions>
31-
<ColumnDefinition Width="Auto" />
31+
<ColumnDefinition Width="30" />
3232
<ColumnDefinition Width="10" />
3333
<ColumnDefinition Width="*" />
3434
</Grid.ColumnDefinitions>

‎Source/NETworkManager/Views/PuTTYHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
<Grid>
197197
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
198198
<Grid.RowDefinitions>
199-
<RowDefinition Height="Auto" />
199+
<RowDefinition Height="30" />
200200
<RowDefinition Height="10" />
201201
<RowDefinition Height="*" />
202202
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/RemoteDesktopHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
<Grid>
215215
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
216216
<Grid.RowDefinitions>
217-
<RowDefinition Height="Auto" />
217+
<RowDefinition Height="30" />
218218
<RowDefinition Height="10" />
219219
<RowDefinition Height="*" />
220220
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/TigerVNCHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
<Grid>
186186
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
187187
<Grid.RowDefinitions>
188-
<RowDefinition Height="Auto" />
188+
<RowDefinition Height="30" />
189189
<RowDefinition Height="10" />
190190
<RowDefinition Height="*" />
191191
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/TracerouteHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<Grid>
107107
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
108108
<Grid.RowDefinitions>
109-
<RowDefinition Height="Auto" />
109+
<RowDefinition Height="30" />
110110
<RowDefinition Height="10" />
111111
<RowDefinition Height="*" />
112112
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/WakeOnLANView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
<Grid>
148148
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
149149
<Grid.RowDefinitions>
150-
<RowDefinition Height="Auto" />
150+
<RowDefinition Height="30" />
151151
<RowDefinition Height="10" />
152152
<RowDefinition Height="*" />
153153
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/WebConsoleHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
<Grid>
186186
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
187187
<Grid.RowDefinitions>
188-
<RowDefinition Height="Auto" />
188+
<RowDefinition Height="30" />
189189
<RowDefinition Height="10" />
190190
<RowDefinition Height="*" />
191191
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/WhoisHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<Grid>
107107
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
108108
<Grid.RowDefinitions>
109-
<RowDefinition Height="Auto" />
109+
<RowDefinition Height="30" />
110110
<RowDefinition Height="10" />
111111
<RowDefinition Height="*" />
112112
</Grid.RowDefinitions>

0 commit comments

Comments
 (0)