Merge pull request #147 from tdgroot/palette_switch_shortcut_key

Add shortcut key for switching palette color
PintaProject · Sep 16, 2020 · 6cca013 · 6cca013
2 parents 57e3769 + ae5625b
commit 6cca013
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/Pinta.Core/Managers/PaletteManager.cs b/Pinta.Core/Managers/PaletteManager.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 
 using System;
+using Gtk;
 using Cairo;
 
 namespace Pinta.Core
@@ -71,6 +72,15 @@ public PaletteManager ()
 			SecondaryColor = new Color (1, 1, 1);
 		}
 
+		public void DoKeyRelease (object o, KeyReleaseEventArgs e)
+		{
+			if (e.Event.Key.ToString().ToUpper() == "X") {
+				Color temp = PintaCore.Palette.PrimaryColor;
+				PintaCore.Palette.PrimaryColor = PintaCore.Palette.SecondaryColor;
+				PintaCore.Palette.SecondaryColor = temp;
+			}
+		}
+
 		#region Protected Methods
 		protected void OnPrimaryColorChanged ()
 		{

diff --git a/Pinta.Gui.Widgets/Widgets/Canvas/PintaCanvas.cs b/Pinta.Gui.Widgets/Widgets/Canvas/PintaCanvas.cs
@@ -214,6 +214,7 @@ public void DoKeyPressEvent (object o, KeyPressEventArgs e)
 		public void DoKeyReleaseEvent (object o, KeyReleaseEventArgs e)
 		{
 			PintaCore.Tools.CurrentTool.DoKeyRelease (this, e);
+			PintaCore.Palette.DoKeyRelease (this, e);
 		}
 		#endregion
 	}

diff --git a/Pinta.Gui.Widgets/Widgets/ColorPaletteWidget.cs b/Pinta.Gui.Widgets/Widgets/ColorPaletteWidget.cs
@@ -310,7 +310,12 @@ private void HandleQueryTooltip (object o, Gtk.QueryTooltipArgs args)
 			string text = null;
 
 			if (swap_rect.ContainsPoint (x, y)) {
-				text = Catalog.GetString ("Click to switch between primary and secondary color.");
+				text = string.Format (
+					"{0} {1}: {2}", 
+					Catalog.GetString ("Click to switch between primary and secondary color."), 
+					Catalog.GetString ("Shortcut key"), 
+					"X"
+				);
 			} else if (reset_rect.ContainsPoint (x, y)) {
 				text = Catalog.GetString ("Click to reset primary and secondary color.");
 			} else if (primary_rect.ContainsPoint (x, y)) {