Browse Source

Toolset name ui

flabbet 11 months ago
parent
commit
75cbd488db

+ 3 - 1
src/PixiEditor/Data/Localization/Languages/en.json

@@ -745,5 +745,7 @@
   "DIVIDE": "Divide",
   "SIN": "Sin",
   "COS": "Cos",
-  "TAN": "Tan"
+  "TAN": "Tan",
+  "PIXEL_ART_TOOLSET": "Pixel Art",
+  "VECTOR_TOOLSET": "Vector"
 }

+ 22 - 14
src/PixiEditor/Views/Main/Tools/ToolsPicker.axaml

@@ -7,27 +7,35 @@
              xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
              xmlns:system="clr-namespace:System;assembly=System.Runtime"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             ClipToBounds="False"
              x:Class="PixiEditor.Views.Main.Tools.ToolsPicker" Name="picker">
     <Border CornerRadius="{DynamicResource ControlCornerRadius}"
             BorderBrush="{DynamicResource ThemeBorderMidBrush}"
             BorderThickness="{DynamicResource ThemeBorderThickness}"
             Cursor="Arrow"
+            Width="48"
             Background="{DynamicResource ThemeBackgroundBrush1}">
         <StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <Button Classes="pixi-icon" Content="{DynamicResource icon-chevron-left}" 
-                        Command="{Binding SwitchToolSetCommand, ElementName=picker}">
-                    <Button.CommandParameter>
-                        <system:Boolean>False</system:Boolean>
-                    </Button.CommandParameter>
-                </Button>
-                <Button Classes="pixi-icon" Content="{DynamicResource icon-chevron-right}"
-                        Command="{Binding SwitchToolSetCommand, ElementName=picker}">
-                    <Button.CommandParameter>
-                        <system:Boolean>True</system:Boolean>
-                    </Button.CommandParameter>
-                </Button>
-            </StackPanel>
+            <Border Background="{DynamicResource ThemeBackgroundBrush2}">
+                <StackPanel Orientation="Horizontal">
+                    <Button Classes="pixi-icon" Content="{DynamicResource icon-chevron-left}"
+                            Command="{Binding SwitchToolSetCommand, ElementName=picker}">
+                        <Button.CommandParameter>
+                            <system:Boolean>False</system:Boolean>
+                        </Button.CommandParameter>
+                    </Button>
+                    <Button Classes="pixi-icon" Content="{DynamicResource icon-chevron-right}"
+                            Command="{Binding SwitchToolSetCommand, ElementName=picker}">
+                        <Button.CommandParameter>
+                            <system:Boolean>True</system:Boolean>
+                        </Button.CommandParameter>
+                    </Button>
+                    <Border Padding="5" Margin="5 0" ClipToBounds="False" Background="{DynamicResource ThemeBackgroundBrush2}"
+                            CornerRadius="{DynamicResource ControlCornerRadius}">
+                       <TextBlock ui:Translator.Key="{Binding ElementName=picker, Path=ToolSet.Name}" VerticalAlignment="Center"/> 
+                    </Border>
+                </StackPanel>
+            </Border>
             <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
                 <ItemsControl ItemsSource="{Binding ElementName=picker, Path=ToolSet.Tools}" Padding="0 2">
                     <ItemsControl.ItemTemplate>