reordered checks for the modifiers pressed on <Tab> so NumLock and friends

2005-09-25  Michael Natterer  <mitch@gimp.org>

	* app/display/gimpdisplayshell-callbacks.c
	(gimp_display_shell_canvas_tool_events): reordered checks for
	the modifiers pressed on <Tab> so NumLock and friends don't
	interfere. Fixes bug #317118.

ChangeLog

-2005-09-25  Sven Neumann  <sven@gimp.org>
+2005-09-25  Michael Natterer  <mitch@gimp.org>
+
+	* app/display/gimpdisplayshell-callbacks.c
+	(gimp_display_shell_canvas_tool_events): reordered checks for
+	the modifiers pressed on <Tab> so NumLock and friends don't
+	interfere. Fixes bug #317118.
+
+cd2005-09-25  Sven Neumann  <sven@gimp.org>
 
 	* libgimpwidgets/gimpwidgetsenums.h: added more values to the
 	GimpZoomType enum.

app/display/gimpdisplayshell-callbacks.c

@@ -1193,18 +1193,9 @@ gimp_display_shell_canvas_tool_events (GtkWidget        *canvas,
 
           case GDK_Tab:
           case GDK_ISO_Left_Tab:
-            if (! state)
+            if (state & GDK_CONTROL_MASK)
               {
-                GimpDialogFactory *dialog_factory;
-
-                dialog_factory = gimp_dialog_factory_from_name ("toolbox");
-
-                /*  Hide or show all dialogs  */
-                gimp_dialog_factories_toggle (dialog_factory, FALSE);
-              }
-            else if (! gimp_image_is_empty (gimage))
-              {
-                if (state & GDK_CONTROL_MASK)
+                if (! gimp_image_is_empty (gimage))
                   {
                     if (kevent->keyval == GDK_Tab)
                       gimp_display_shell_layer_select_init (shell,
@@ -1214,6 +1205,15 @@ gimp_display_shell_canvas_tool_events (GtkWidget        *canvas,
                                                             -1, kevent->time);
                   }
               }
+            else
+              {
+                GimpDialogFactory *dialog_factory;
+
+                dialog_factory = gimp_dialog_factory_from_name ("toolbox");
+
+                /*  Hide or show all dialogs  */
+                gimp_dialog_factories_toggle (dialog_factory, FALSE);
+              }
 
             return_val = TRUE;
             break;