Tidy up some style issues

Author: saddam213

OnnxStack.UI/App.xaml

@@ -170,6 +170,20 @@
 
         <Style TargetType="{x:Type GridSplitter}">
             <Setter Property="Background" Value="{StaticResource ControlDefaultBorderBrush}" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type GridSplitter}">
+                        <Grid>
+                            <Button  Padding="0" Margin="0" >
+                                <TextBlock Text="⁞" Foreground="{StaticResource ControlDefaultForeground}" />
+                            </Button>
+                            <Rectangle Fill="#00FFFFFF" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+
+
         </Style>
 
 
@@ -332,7 +346,7 @@
 
         <!--Button-->
         <LinearGradientBrush x:Key="ButtonBackground" EndPoint="0,1" StartPoint="0,0">
-            <GradientStop Color="#FF343434" Offset="0.0"/>
+            <GradientStop Color="#FF212222" Offset="0.0"/>
             <GradientStop Color="#FF2A2A2A" Offset="1.0"/>
         </LinearGradientBrush>
         <SolidColorBrush x:Key="ButtonForeground" Color="#FFC8C8C8"/>
@@ -638,7 +652,7 @@
                 </Grid.ColumnDefinitions>
                 <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" Margin="1" Placement="Bottom" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
                     <theme:SystemDropShadowChrome x:Name="shadow" Color="Transparent" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                        <Border x:Name="dropDownBorder" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1">
+                        <Border x:Name="dropDownBorder" Background="{StaticResource ComboBoxBackground}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1" >
                             <ScrollViewer x:Name="DropDownScrollViewer">
                                 <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                                     <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
@@ -1219,7 +1233,7 @@
             <Setter Property="Background" Value="{StaticResource TabItemBackground}"/>
             <Setter Property="BorderBrush" Value="{StaticResource TabItemBorder}"/>
             <Setter Property="Margin" Value="0"/>
-            <Setter Property="Padding" Value="6,2,6,2"/>
+            <Setter Property="Padding" Value="10,0,10,4"/>
             <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
             <Setter Property="VerticalContentAlignment" Value="Stretch"/>
             <Setter Property="Template">
@@ -1389,7 +1403,7 @@
                                 <Setter Property="Panel.ZIndex" Value="1"/>
                                 <Setter Property="Margin" Value="-2,-2,-2,0"/>
                                 <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
-                                <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                                <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,0,0,4"/>
                                 <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
                             </MultiDataTrigger>
                         </ControlTemplate.Triggers>

OnnxStack.UI/Dialogs/CropImageDialog.xaml

@@ -43,8 +43,8 @@
             <UniformGrid Columns="4" Margin="0,25,0,0">
                 <TextBlock/>
                 <TextBlock/>
+                <Button IsDefault="True" Command="{Binding DoneCommand}" MinWidth="100" Height="30">Done</Button>
                 <Button IsCancel="True" Command="{Binding CancelCommand}" MinWidth="100" Height="30">_Cancel</Button>
-                <Button IsDefault="True" Command="{Binding DoneCommand}" MinWidth="100" Height="30">_Done</Button>
             </UniformGrid>
         </StackPanel>
         <Border BorderThickness="2" BorderBrush="{StaticResource ContainerBorder}" >

OnnxStack.UI/Dialogs/MessageDialog.xaml

@@ -32,7 +32,7 @@
                 </Button.Style>
             </Button>
             <UniformGrid Columns="2">
-                <Button Content="Yes" Command="{Binding YesCommand}" Width="100"/>
+                <Button Content="Yes" Command="{Binding YesCommand}" Width="100" IsDefault="True"/>
                 <Button Content="No" Command="{Binding NoCommand}"/>
                 <UniformGrid.Style>
                     <Style TargetType="{x:Type UniformGrid}">

OnnxStack.UI/Dialogs/TextInputDialog.xaml

@@ -32,8 +32,8 @@
         </StackPanel>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,20,0,0">
             <UniformGrid Columns="2" Height="30">
+                <Button Content="Ok" Command="{Binding SaveCommand}" IsDefault="True"/>
                 <Button Content="Cancel" Command="{Binding CancelCommand}" Width="100"/>
-                <Button Content="Ok" Command="{Binding SaveCommand}"/>
             </UniformGrid>
         </StackPanel>
     </DockPanel>

OnnxStack.UI/MainWindow.xaml

@@ -36,7 +36,7 @@
                         <TextBlock Text="Text To Image" Margin="5,0,0,0"/>
                     </StackPanel>
                 </TabItem.Header>
-                <views:TextToImageView Margin="0,10,0,0"/>
+                <views:TextToImageView Margin="0,6,0,0"/>
             </TabItem>
 
             <!--Image To Image-->
@@ -51,7 +51,7 @@
                         <TextBlock Text="Image To Image" Margin="5,0,0,0"/>
                     </StackPanel>
                 </TabItem.Header>
-                <views:ImageToImage Margin="0,10,0,0"/>
+                <views:ImageToImage Margin="0,6,0,0"/>
             </TabItem>
 
             <!--Image Inpaint-->
@@ -66,7 +66,7 @@
                         <TextBlock Text="Image Inpaint" Margin="5,0,0,0"/>
                     </StackPanel>
                 </TabItem.Header>
-                <views:ImageInpaint Margin="0,10,0,0"/>
+                <views:ImageInpaint Margin="0,6,0,0"/>
             </TabItem>
 
             <!--Log Window-->
@@ -79,7 +79,7 @@
                         <TextBlock Text="Logs" Margin="5,0,0,0"/>
                     </StackPanel>
                 </TabItem.Header>
-                <views:Logger LogOutput="{Binding OutputLog, Mode=TwoWay}" Margin="0,10,0,0"/>
+                <views:Logger LogOutput="{Binding OutputLog, Mode=TwoWay}" Margin="0,6,0,0"/>
             </TabItem>
 
             <!--Settings-->
@@ -92,7 +92,7 @@
                         <TextBlock Text="Settings" Margin="5,0,0,0"/>
                     </StackPanel>
                 </TabItem.Header>
-                <views:Settings ModelOptions="{Binding Models, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, NotifyOnSourceUpdated=True, NotifyOnTargetUpdated=True}" Margin="0,10,0,0"/>
+                <views:Settings ModelOptions="{Binding Models, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, NotifyOnSourceUpdated=True, NotifyOnTargetUpdated=True}" Margin="0,6,0,0"/>
             </TabItem>
         </TabControl>
     </Grid>

OnnxStack.UI/UserControls/ModelPickerControl.xaml

@@ -54,8 +54,9 @@
                 ItemsSource="{Binding Models}" 
                 SelectedItem="{Binding SelectedModel}" 
                 IsEnabled="{Binding SelectedModel.IsLoading, FallbackValue=True, TargetNullValue=True, Converter={StaticResource InverseBoolConverter}}" >
+             
                 <ComboBox.ItemContainerStyle>
-                    <Style TargetType="{x:Type ComboBoxItem}">
+                    <Style TargetType="{x:Type ComboBoxItem}" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
                         <Setter Property="Visibility" Value="Collapsed" />
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding IsEnabled}" Value="True">

OnnxStack.UI/Views/Settings.xaml

@@ -10,7 +10,7 @@
              d:DesignHeight="450"  Name="UI">
     <DockPanel DataContext="{Binding ElementName=UI}" >
 
-        <DockPanel DockPanel.Dock="Left" Margin="0,3,0,0">
+        <DockPanel DockPanel.Dock="Left" Margin="3,3,0,0">
 
             <!--Model ListBox-->
             <DockPanel DockPanel.Dock="Left" Width="300" >
@@ -106,7 +106,7 @@
 
         </DockPanel>
 
-        <DockPanel Margin="10" MaxWidth="850"  >
+        <DockPanel Margin="10,10,10,0" MaxWidth="850"  >
 
             <StackPanel DockPanel.Dock="Top">
 
@@ -237,7 +237,7 @@
             <DockPanel Visibility="{Binding SelectedModelSet.IsTemplate, Converter={StaticResource InverseBooleanToHiddenConverter}}">
 
                 <TabControl>
-                    <TabItem Header="Configuration" >
+                    <TabItem Header="Configuration" Width="150" Padding="0,0,0,5">
 
                         <!--Inference Options-->
                         <StackPanel IsEnabled="{Binding SelectedModelSet.IsTemplate, Converter={StaticResource InverseBoolConverter}}" Margin="5">
@@ -285,7 +285,7 @@
 
                     </TabItem>
 
-                    <TabItem Header="Advanced">
+                    <TabItem Header="Advanced" Width="150" Padding="0,0,0,5">
 
                         <DockPanel Margin="5">
                             <!--Model Config-->