Improve layer manager slightly

src/PixiEditor/Styles/ComboBoxDarkStyle.xaml

@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2">
+                    xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2"
+                    xmlns:controls="clr-namespace:PixiEditor.Views.UserControls">
 
     <SolidColorBrush x:Key="ComboBox.Static.Background" Color="#252525" />
     <SolidColorBrush x:Key="ComboBox.Static.Border" Color="#2F2F37" />
@@ -253,6 +254,11 @@
         <Setter Property="Template" Value="{DynamicResource DarkComboBox}" />
     </Style>
 
+    <Style TargetType="controls:BlendModeComboBox">
+        <Setter Property="Foreground" Value="White" />
+        <Setter Property="Template" Value="{DynamicResource DarkComboBox}" />
+    </Style>
+    
     <Style TargetType="ComboBoxItem">
         <Setter Property="Background" Value="#111111" />
         <Setter Property="Foreground" Value="White" />

src/PixiEditor/Views/UserControls/Layers/LayersManager.xaml

@@ -18,7 +18,7 @@
              d:DesignHeight="450" d:DesignWidth="250" x:Name="layersManager">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="75"/>
+            <RowDefinition Height="65"/>
             <RowDefinition Height="15"/>
             <RowDefinition Height="1*"/>
         </Grid.RowDefinitions>
@@ -27,31 +27,61 @@
                 <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
                     <Button Command="{commands:Command PixiEditor.Layer.NewLayer}" 
                         Height="24" Width="24" Cursor="Hand" ToolTip="New Layer"
-                                                HorizontalAlignment="Stretch" Margin="5"
-                                                Style="{StaticResource ToolButtonStyle}">
+                        HorizontalAlignment="Stretch" Margin="5,5,0,5"
+                        Style="{StaticResource ToolButtonStyle}">
                         <Button.Background>
                             <ImageBrush ImageSource="/Images/Layer-add.png"/>
                         </Button.Background>
                     </Button>
                     <Button Command="{commands:Command PixiEditor.Layer.NewFolder}" 
                         Height="24" Width="24" ToolTip="New Folder" Cursor="Hand"
-                                                HorizontalAlignment="Stretch" Margin="5"
+                                                HorizontalAlignment="Stretch"  Margin="5,5,0,5"
                                                 Style="{StaticResource ToolButtonStyle}">
                         <Button.Background>
                             <ImageBrush ImageSource="/Images/Folder-add.png"/>
                         </Button.Background>
                     </Button>
                     <Button Command="{commands:Command PixiEditor.Layer.DeleteSelected}" Height="24" Width="24" ToolTip="Delete selected" Cursor="Hand"
-                                                HorizontalAlignment="Stretch" Margin="5"
-                                                Style="{StaticResource ToolButtonStyle}">
+                            HorizontalAlignment="Stretch" Margin="5,5,0,5"
+                            Style="{StaticResource ToolButtonStyle}">
                         <Button.Background>
                             <ImageBrush ImageSource="/Images/Trash.png"/>
                         </Button.Background>
                     </Button>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" Margin="0,0,10,0" HorizontalAlignment="Right" Focusable="True">
-                    <Slider
-                    Width="50"
+
+                </StackPanel>
+            </DockPanel>
+            <DockPanel>
+                <userControls:BlendModeComboBox
+                    DockPanel.Dock="Left"
+                    Margin="5,0"
+                    Width="80"
+                    SelectedBlendMode="{Binding ActiveDocument.SelectedStructureMember.BlendModeBindable, Mode=TwoWay, ElementName=layersManager}" />
+                <userControls:NumberInput
+                    Min="0" Max="100"
+                    x:Name="numberInput"
+                    d:Value="100"
+                    DockPanel.Dock="Right"
+                    IsEnabled="{Binding Path=ActiveDocument, ElementName=layersManager, Converter={converters:NotNullToVisibilityConverter}}" 
+                    Width="35" Height="20"
+                    Margin="0,0,5,0"
+                    VerticalAlignment="Center"
+                    LostFocus="NumberInput_LostFocus">
+                    <userControls:NumberInput.Value>
+                        <Binding
+                            Mode="TwoWay"
+                            ElementName="layersManager"
+                            Path="ActiveDocument.SelectedStructureMember.OpacityBindable"
+                            Converter="{converters:MultiplyConverter}">
+                            <Binding.ConverterParameter>
+                                <sys:Double>100</sys:Double>
+                            </Binding.ConverterParameter>
+                        </Binding>
+                    </userControls:NumberInput.Value>
+                </userControls:NumberInput>
+                <Slider
                     Minimum="0"
                     Maximum="1"
                     SmallChange="0.01"
@@ -60,43 +90,16 @@
                     x:Name="opacitySlider"
                     VerticalAlignment="Center"
                     HorizontalAlignment="Stretch">
-                        <i:Interaction.Behaviors>
-                            <beh:SliderUpdateBehavior
+                    <i:Interaction.Behaviors>
+                        <beh:SliderUpdateBehavior
                                 Binding="{Binding ElementName=layersManager, Path=ActiveDocument.SelectedStructureMember.OpacityBindable, Mode=OneWay}"
                                 DragStarted="{commands:Command PixiEditor.Layer.OpacitySliderDragStarted}"
                                 DragValueChanged="{commands:Command PixiEditor.Layer.OpacitySliderDragged, UseProvided=True}"
                                 DragEnded="{commands:Command PixiEditor.Layer.OpacitySliderDragEnded}"
                                 ValueFromSlider="{Binding ElementName=opacitySlider, Path=Value, Mode=TwoWay}" />
-                        </i:Interaction.Behaviors>
-                    </Slider>
-                    <userControls:NumberInput
-                    Min="0" Max="100"
-                    x:Name="numberInput"
-                    IsEnabled="{Binding Path=ActiveDocument, ElementName=layersManager, Converter={converters:NotNullToVisibilityConverter}}" 
-                    Width="40" Height="20"
-                    VerticalAlignment="Center"
-                    LostFocus="NumberInput_LostFocus">
-                        <userControls:NumberInput.Value>
-                            <Binding
-                            Mode="TwoWay"
-                            ElementName="layersManager"
-                            Path="ActiveDocument.SelectedStructureMember.OpacityBindable"
-                            Converter="{converters:MultiplyConverter}">
-                                <Binding.ConverterParameter>
-                                    <sys:Double>100</sys:Double>
-                                </Binding.ConverterParameter>
-                            </Binding>
-                        </userControls:NumberInput.Value>
-                    </userControls:NumberInput>
-                    <Label Content="%" Foreground="White" VerticalAlignment="Center"/>
-                </StackPanel>
+                    </i:Interaction.Behaviors>
+                </Slider>
             </DockPanel>
-            <StackPanel Orientation="Horizontal">
-                <userControls:BlendModeComboBox
-                            Margin="5,0"
-                            Width="80"
-                            SelectedBlendMode="{Binding ActiveDocument.SelectedStructureMember.BlendModeBindable, Mode=TwoWay, ElementName=layersManager}" />
-            </StackPanel>
         </StackPanel>
         <Separator Grid.Row="1" Margin="0,-12, 0, 0" BorderBrush="{StaticResource DarkerAccentColor}" BorderThickness="2" />
         <DockPanel LastChildFill="True" Grid.Row="2" Margin="0, -12, 0, 0">