Merge pull request #1128 from BornToBeRoot/feature/tabs-expander-redesign

Feature/tabs expander redesign

Author: mergify[bot]

Source/NETworkManager/MainWindow.xaml

@@ -188,7 +188,6 @@
                         </Style>
                     </Grid.Style>
                     <Border Grid.Row="0" BorderBrush="{DynamicResource MahApps.Brushes.Gray8}" BorderThickness="0,0,0,1" Background="Transparent">
-
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
@@ -225,9 +224,9 @@
                                         </Style.Triggers>
                                     </Style>
                                 </Button.Style>
-                                <Rectangle Width="16" Height="16">
+                                <Rectangle Grid.Column="0" Width="16" Height="16" Margin="0,0,-2,0">
                                     <Rectangle.OpacityMask>
-                                        <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ChevronDoubleRight}" />
+                                        <VisualBrush Stretch="Uniform" Visual="{iconPacks:VaadinIcons Kind=AngleDoubleRight}" />
                                     </Rectangle.OpacityMask>
                                     <Rectangle.Style>
                                         <Style TargetType="{x:Type Rectangle}">
@@ -564,7 +563,7 @@
                                     <ColumnDefinition Width="48" />
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
-                                <Rectangle Grid.Column="0" Width="24" Height="24">
+                                <Rectangle Grid.Column="0" Width="24" Height="24" Margin="0,0,-2,0">
                                     <Rectangle.OpacityMask>
                                         <VisualBrush Stretch="Uniform" Visual="{iconPacks:MaterialLight Kind=Cog}" />
                                     </Rectangle.OpacityMask>
@@ -641,7 +640,7 @@
             </Grid.Style>
             <Grid>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="32" />
+                    <RowDefinition Height="49" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
                 <Border Grid.Row="0" BorderBrush="{DynamicResource MahApps.Brushes.Gray8}" BorderThickness="0,0,0,1">

Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml

@@ -64,33 +64,7 @@
     </Style>
 
     <Style x:Key="ProfileExpanderOpen" BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Down}" TargetType="{x:Type ToggleButton}">
-        <Setter Property="Template" Value="{x:Null}">
-            <!--
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    
-                    <Border Padding="{TemplateBinding Padding}"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{StaticResource MahApps.Brushes.Gray8}"
-                            BorderThickness="0,0,0,1">
-                        <Grid Background="Transparent" SnapsToDevicePixels="False" Height="27">
-                            <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">
-                                <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinLeft}" />
-                                </Rectangle.OpacityMask>
-                            </Rectangle>
-                        </Grid>
-                    </Border>
-                    
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Chevron" Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray5}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-            -->
-            </Setter>
+        <Setter Property="Template" Value="{x:Null}" />
     </Style>
 
     <Style x:Key="ProfileExpanderClosed" BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Right}" TargetType="{x:Type ToggleButton}">
@@ -106,7 +80,7 @@
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
-                            <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">
+                            <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">
                                 <Rectangle.OpacityMask>
                                     <VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinRight}" />
                                 </Rectangle.OpacityMask>

Source/NETworkManager/Resources/Styles/WindowStyles.xaml

@@ -6,5 +6,6 @@
         <Setter Property="GlowBrush" Value="{DynamicResource MahApps.Brushes.Gray8}" />
         <Setter Property="NonActiveGlowBrush" Value="Transparent" />
         <Setter Property="TitleForeground" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="ShowTitleBar" Value="True" />        
     </Style>
 </ResourceDictionary>