[gimp] app: don't unconditionally call tool_manager_modifier_state_active()



commit 2120742cb9a5d6048b0c2f3789f0f04410d78849
Author: Michael Natterer <mitch gimp org>
Date:   Fri Apr 15 11:28:13 2016 +0100

    app: don't unconditionally call tool_manager_modifier_state_active()
    
    Only call it if the display is the active tool's focus display.

 app/display/gimpdisplayshell-tool-events.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-tool-events.c b/app/display/gimpdisplayshell-tool-events.c
index e163bde..16ad932 100644
--- a/app/display/gimpdisplayshell-tool-events.c
+++ b/app/display/gimpdisplayshell-tool-events.c
@@ -1259,7 +1259,14 @@ gimp_display_shell_canvas_grab_notify (GtkWidget        *canvas,
   if (! was_grabbed)
     {
       if (! gimp_image_is_empty (image))
-        tool_manager_modifier_state_active (gimp, 0, display);
+        {
+          GimpTool *active_tool = tool_manager_get_active (gimp);
+
+          if (active_tool && active_tool->focus_display == display)
+            {
+              tool_manager_modifier_state_active (gimp, 0, display);
+            }
+        }
     }
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]