From d8803f29b6079e2efaf277673a9b1950feda3d35 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sun, 8 Jul 2007 13:38:58 +0000 Subject: [PATCH] Block gimp_rectangle_tool_options_notify when changing fixed-aspect 2007-07-08 Martin Nordholts * app/tools/gimprectangletool.c (gimp_rectangle_tool_active_modifier_key): Block gimp_rectangle_tool_options_notify when changing fixed-aspect through the shift key. Fixes bug #417168. svn path=/trunk/; revision=22896 --- ChangeLog | 7 +++++++ app/tools/gimprectangletool.c | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7b471b5abb..4e1ad3fd59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-07-08 Martin Nordholts + + * app/tools/gimprectangletool.c + (gimp_rectangle_tool_active_modifier_key): Block + gimp_rectangle_tool_options_notify when changing fixed-aspect + through the shift key. Fixes bug #417168. + 2007-07-08 Sven Neumann * plug-ins/jpeg/jpeg.c diff --git a/app/tools/gimprectangletool.c b/app/tools/gimprectangletool.c index 1eee3fb368..dadbf49710 100644 --- a/app/tools/gimprectangletool.c +++ b/app/tools/gimprectangletool.c @@ -1133,9 +1133,20 @@ gimp_rectangle_tool_active_modifier_key (GimpTool *tool, if (key == GDK_SHIFT_MASK) { + /* Here we want to handle manualy when to update the rectangle, so we + * don't want gimp_rectangle_tool_options_notify to do anything. + */ + g_signal_handlers_block_by_func (options, + gimp_rectangle_tool_options_notify, + rectangle); + g_object_set (options, "fixed-aspect", ! options_private->fixed_aspect, NULL); + + g_signal_handlers_unblock_by_func (options, + gimp_rectangle_tool_options_notify, + rectangle); } if (key == GDK_CONTROL_MASK)