Merge pull request #518 from PixiEditor/various-improvements

Some improvements

src/PixiEditor/ViewModels/SubViewModels/Tools/ToolSettings/Toolbars/BasicToolbar.cs

@@ -17,6 +17,10 @@ internal class BasicToolbar : Toolbar
         var setting = new SizeSetting(nameof(ToolSize), "Tool size:");
         setting.ValueChanged += (_, _) => RaisePropertyChanged(nameof(ToolSize));
         Settings.Add(setting);
+    }
 
+    public override void OnLoadedSettings()
+    {
+        RaisePropertyChanged(nameof(ToolSize));
     }
 }

src/PixiEditor/ViewModels/SubViewModels/Tools/ToolSettings/Toolbars/Toolbar.cs

@@ -78,5 +78,11 @@ internal abstract class Toolbar : NotifyableObject
                 Settings.First(x => x.Name == SharedSettings[i].Name).Value = SharedSettings[i].Value;
             }
         }
+
+        OnLoadedSettings();
+    }
+
+    public virtual void OnLoadedSettings()
+    {
     }
 }

src/PixiEditor/Views/MainWindow.xaml

@@ -756,35 +756,37 @@
                         <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
 
-                    <ItemsControl
-                        ItemsSource="{Binding ToolsSubViewModel.ToolSet}">
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <Button
-                                    BorderBrush="White"
-                                    BorderThickness="{Binding IsActive, Converter={StaticResource BoolToIntConverter}}"
-                                    Style="{StaticResource ToolButtonStyle}"
-                                    Command="{cmds:Command PixiEditor.Tools.SelectTool, UseProvided=True}"
-                                    CommandParameter="{Binding}"
-                                    ToolTip="{Binding Tooltip}">
-                                    <Button.Background>
-                                        <ImageBrush
-                                            RenderOptions.BitmapScalingMode="Fant"
-                                            ImageSource="{Binding ImagePath}"
-                                            Stretch="Uniform" />
-                                    </Button.Background>
-                                    <Button.Resources>
-                                        <Style
-                                            TargetType="Border">
-                                            <Setter
-                                                Property="CornerRadius"
-                                                Value="2.5" />
-                                        </Style>
-                                    </Button.Resources>
-                                </Button>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
+                    <ScrollViewer VerticalScrollBarVisibility="Auto">
+                        <ItemsControl
+                            ItemsSource="{Binding ToolsSubViewModel.ToolSet}">
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <Button
+                                        BorderBrush="White"
+                                        BorderThickness="{Binding IsActive, Converter={StaticResource BoolToIntConverter}}"
+                                        Style="{StaticResource ToolButtonStyle}"
+                                        Command="{cmds:Command PixiEditor.Tools.SelectTool, UseProvided=True}"
+                                        CommandParameter="{Binding}"
+                                        ToolTip="{Binding Tooltip}">
+                                        <Button.Background>
+                                            <ImageBrush
+                                                RenderOptions.BitmapScalingMode="Fant"
+                                                ImageSource="{Binding ImagePath}"
+                                                Stretch="Uniform" />
+                                        </Button.Background>
+                                        <Button.Resources>
+                                            <Style
+                                                TargetType="Border">
+                                                <Setter
+                                                    Property="CornerRadius"
+                                                    Value="2.5" />
+                                            </Style>
+                                        </Button.Resources>
+                                    </Button>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                    </ScrollViewer>
                     <Border Background="{Binding ColorsSubViewModel.PrimaryColor, Mode=TwoWay, Converter={converters:BackendColorToMediaColorConverter}}"
                             BorderBrush="Gray" BorderThickness="1" CornerRadius="0,0,5,5"
                             Grid.Row="1" Height="30"/>