Add symbolic icons for the color palette buttons

Pinta.Gui.Widgets/Widgets/StatusBarColorPaletteWidget.cs

@@ -46,16 +46,13 @@ public class StatusBarColorPaletteWidget : Gtk.DrawingArea
 		const int WIDGET_HEIGHT = 42;
 		const int PALETTE_MARGIN = 10;
 
-		private readonly Gdk.Pixbuf swap_icon;
-		private readonly Gdk.Pixbuf reset_icon;
+		private Gdk.Pixbuf swap_icon = new (Gdk.Colorspace.Rgb, false, 8, 0, 0); // overridden in OnShown()
+		private Gdk.Pixbuf reset_icon = new (Gdk.Colorspace.Rgb, false, 8, 0, 0);
 
 		public StatusBarColorPaletteWidget ()
 		{
 			AddEvents ((int) Gdk.EventMask.ButtonPressMask);
 
-			swap_icon = PintaCore.Resources.GetIcon ("ColorPalette.SwapIcon.png");
-			reset_icon = PintaCore.Resources.GetIcon ("ColorPalette.ResetIcon.png");
-
 			HasTooltip = true;
 			QueryTooltip += HandleQueryTooltip;
 
@@ -67,6 +64,16 @@ public StatusBarColorPaletteWidget ()
 			HeightRequest = WIDGET_HEIGHT;
 		}
 
+		protected override void OnShown ()
+		{
+			base.OnShown ();
+
+			// Load the symbolic icons when shown. In the constructor the StyleContext isn't ready,
+			// so symbolic icons might not be colored correctly.
+			swap_icon = PintaCore.Resources.GetIcon (Pinta.Resources.Icons.ColorPaletteSwap, StyleContext);
+			reset_icon = PintaCore.Resources.GetIcon (Pinta.Resources.Icons.ColorPaletteReset, StyleContext);
+		}
+
 		protected override bool OnButtonPressEvent (Gdk.EventButton ev)
 		{
 			var point = ev.GetPoint ();

Pinta.Resources/Icons.cs

@@ -93,6 +93,9 @@ public static class Icons
 		public const string ColorModeColor = "tool-gradient-colormode-color-symbolic";
 		public const string ColorModeTransparency = "tool-gradient-colormode-transparency-symbolic";
 
+		public const string ColorPaletteReset = "ui-colorpalette-reset-symbolic";
+		public const string ColorPaletteSwap = "ui-colorpalette-swap-symbolic";
+
 		public const string CursorPosition = "ui-cursor-location-symbolic";
 
 		public const string EditSelectionErase = "edit-selection-erase";

Pinta.Resources/Pinta.Resources.csproj

@@ -79,12 +79,6 @@
     <EmbeddedResource Include="Resources\LayersWidget.Hidden.png">
       <LogicalName>LayersWidget.Hidden.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\ColorPalette.SwapIcon.png">
-      <LogicalName>ColorPalette.SwapIcon.png</LogicalName>
-    </EmbeddedResource>
-	<EmbeddedResource Include="Resources\ColorPalette.ResetIcon.png">
-      <LogicalName>ColorPalette.ResetIcon.png</LogicalName>
-    </EmbeddedResource>
     <EmbeddedResource Include="Resources\Menu.Adjustments.AutoLevel.png">
       <LogicalName>Menu.Adjustments.AutoLevel.png</LogicalName>
     </EmbeddedResource>