Browse Source

Images wip

flabbet 3 years ago
parent
commit
4d25103457

BIN
PixiEditor/Images/Load.png


BIN
PixiEditor/Images/Plus-square.png


BIN
PixiEditor/Images/Save.png


+ 6 - 0
PixiEditor/PixiEditor.csproj

@@ -238,6 +238,12 @@
 		<Resource Include="Images\Tools\SelectImage.png" />
 		<Resource Include="Images\Tools\SelectImage.png" />
 		<Resource Include="Images\Tools\ZoomImage.png" />
 		<Resource Include="Images\Tools\ZoomImage.png" />
 		<Resource Include="Images\Trash.png" />
 		<Resource Include="Images\Trash.png" />
+		<None Remove="Images\Load.png" />
+		<Resource Include="Images\Load.png" />
+		<None Remove="Images\Plus-square.png" />
+		<Resource Include="Images\Plus-square.png" />
+		<None Remove="Images\Save.png" />
+		<Resource Include="Images\Save.png" />
 	</ItemGroup>
 	</ItemGroup>
 	<ItemGroup>
 	<ItemGroup>
 		<None Include="..\LICENSE">
 		<None Include="..\LICENSE">

+ 7 - 3
PixiEditor/Views/UserControls/PaletteColorAdder.xaml

@@ -6,13 +6,17 @@
              xmlns:local="clr-namespace:PixiEditor.Views.UserControls" 
              xmlns:local="clr-namespace:PixiEditor.Views.UserControls" 
              xmlns:colorpicker="clr-namespace:ColorPicker;assembly=ColorPicker"
              xmlns:colorpicker="clr-namespace:ColorPicker;assembly=ColorPicker"
              mc:Ignorable="d" Name="paletteColorAdder"
              mc:Ignorable="d" Name="paletteColorAdder"
-             d:DesignHeight="30" d:DesignWidth="100">
-    <StackPanel Orientation="Horizontal">
+             d:DesignHeight="36" d:DesignWidth="100">
+    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
         <colorpicker:PortableColorPicker
         <colorpicker:PortableColorPicker
             ColorChanged="PortableColorPicker_ColorChanged"
             ColorChanged="PortableColorPicker_ColorChanged"
             SelectedColor="{Binding SelectedColor, ElementName=paletteColorAdder, Mode=TwoWay}"
             SelectedColor="{Binding SelectedColor, ElementName=paletteColorAdder, Mode=TwoWay}"
             Style="{StaticResource DefaultColorPickerStyle}" Margin="0 0 10 0"
             Style="{StaticResource DefaultColorPickerStyle}" Margin="0 0 10 0"
             ShowAlpha="False"/>
             ShowAlpha="False"/>
-        <Button Name="AddButton" Content="Add" Style="{StaticResource DarkRoundButton}" Click="Button_Click"/>
+        <Button Name="AddButton" Style="{StaticResource ToolButtonStyle}" Cursor="Hand" Width="24" Height="24" Click="Button_Click">
+            <Button.Background>
+                <ImageBrush ImageSource="/Images/Plus-square.png"/>
+            </Button.Background>
+        </Button>
     </StackPanel>
     </StackPanel>
 </UserControl>
 </UserControl>