Make FilterModifierKeys an extension method so we don't duplicate code.

City-busz · Mar 11, 2015 · d932f37 · d932f37
1 parent 005ad15
commit d932f37
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 32 deletions.
diff --git a/Pinta.Core/Extensions/GdkExtensions.cs b/Pinta.Core/Extensions/GdkExtensions.cs
@@ -108,6 +108,21 @@ public static bool IsControlPressed (this EventButton ev)
             return ev.State.IsControlPressed ();
 		}
 
+        /// <summary>
+        /// Filters out all modifier keys except Ctrl/Shift/Alt. This prevents Caps Lock, Num Lock, etc
+        /// from appearing as active modifier keys.
+        /// </summary>
+        public static ModifierType FilterModifierKeys (this ModifierType current_state)
+        {
+            var state = Gdk.ModifierType.None;
+
+            state |= (current_state & Gdk.ModifierType.ControlMask);
+            state |= (current_state & Gdk.ModifierType.ShiftMask);
+            state |= (current_state & Gdk.ModifierType.Mod1Mask);
+
+            return state;
+        }
+
 		public static Cairo.PointD GetPoint (this EventButton ev)
 		{
 			return new Cairo.PointD (ev.X, ev.Y);

diff --git a/Pinta.Gui.Widgets/Widgets/Canvas/PintaCanvas.cs b/Pinta.Gui.Widgets/Widgets/Canvas/PintaCanvas.cs
@@ -155,7 +155,7 @@ protected override bool OnExposeEvent (EventExpose e)
 		protected override bool OnScrollEvent (EventScroll evnt)
 		{
 			// Allow the user to zoom in/out with Ctrl-Mousewheel
-			if (FilterModifierKeys(evnt.State) == ModifierType.ControlMask) {
+            if (evnt.State.FilterModifierKeys () == ModifierType.ControlMask) {
 				switch (evnt.Direction) {
 					case ScrollDirection.Down:
 					case ScrollDirection.Right:
@@ -193,21 +193,6 @@ public void DoKeyReleaseEvent (object o, KeyReleaseEventArgs e)
 		{
 			PintaCore.Tools.CurrentTool.DoKeyRelease (this, e);
 		}
-
-		/// <summary>
-		/// Filters out all modifier keys except Ctrl/Shift/Alt. This prevents Caps Lock, Num Lock, etc
-		/// from appearing as active modifier keys.
-		/// </summary>
-		private ModifierType FilterModifierKeys (Gdk.ModifierType current_state)
-		{
-			ModifierType state = ModifierType.None;
-
-			state |= (current_state & ModifierType.ControlMask);
-			state |= (current_state & ModifierType.ShiftMask);
-			state |= (current_state & ModifierType.Mod1Mask);
-
-			return state;
-		}
 		#endregion
 	}
 }
diff --git a/Pinta/MainWindow.cs b/Pinta/MainWindow.cs
@@ -122,25 +122,10 @@ private void MainWindow_KeyPressEvent (object o, KeyPressEventArgs e)
 
             // If the canvas/tool didn't consume it, see if its a toolbox shortcut
             if (e.RetVal == null || !(bool)e.RetVal)
-                if (FilterModifierKeys (e.Event.State) == Gdk.ModifierType.None)
+                if (e.Event.State.FilterModifierKeys () == Gdk.ModifierType.None)
                     PintaCore.Tools.SetCurrentTool (e.Event.Key);
 		}
 
-        /// <summary>
-        /// Filters out all modifier keys except Ctrl/Shift/Alt. This prevents Caps Lock, Num Lock, etc
-        /// from appearing as active modifier keys.
-        /// </summary>
-        private Gdk.ModifierType FilterModifierKeys (Gdk.ModifierType current_state)
-        {
-            var state = Gdk.ModifierType.None;
-
-            state |= (current_state & Gdk.ModifierType.ControlMask);
-            state |= (current_state & Gdk.ModifierType.ShiftMask);
-            state |= (current_state & Gdk.ModifierType.Mod1Mask);
-
-            return state;
-        }
-
 		[GLib.ConnectBefore]
 		private void MainWindow_KeyReleaseEvent (object o, KeyReleaseEventArgs e)
 		{