From 72a80236bc170c6eb8b6d0462badc7244bd85dd3 Mon Sep 17 00:00:00 2001 From: dooglus Date: Fri, 9 Nov 2007 22:04:59 +0000 Subject: [PATCH] Address 1829182: it's true that the popup caret menu has been disabled for these tools. There's no comment in the code saying why. I've added an environment variable which re-enables the popup menu when set. export SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS=1 to try it, and report your findings back to the bug report as to whether this should be the default or not. git-svn-id: http://svn.voria.com/code@1127 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/src/gtkmm/state_bline.cpp | 3 ++- synfig-studio/trunk/src/gtkmm/state_draw.cpp | 3 ++- synfig-studio/trunk/src/gtkmm/state_polygon.cpp | 3 ++- synfig-studio/trunk/src/gtkmm/state_sketch.cpp | 3 ++- synfig-studio/trunk/src/gtkmm/state_stroke.cpp | 8 ++++++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/synfig-studio/trunk/src/gtkmm/state_bline.cpp b/synfig-studio/trunk/src/gtkmm/state_bline.cpp index 15cb1e3..4f21886 100644 --- a/synfig-studio/trunk/src/gtkmm/state_bline.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_bline.cpp @@ -881,7 +881,8 @@ StateBLine_Context::event_mouse_click_handler(const Smach::event& x) } case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu - return Smach::RESULT_ACCEPT; + if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS")) + return Smach::RESULT_ACCEPT; default: return Smach::RESULT_OK; diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp index 5ffdd37..1b68e0f 100644 --- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp @@ -588,7 +588,8 @@ StateDraw_Context::event_mouse_down_handler(const Smach::event& x) } case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu - return Smach::RESULT_ACCEPT; + if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS")) + return Smach::RESULT_ACCEPT; default: return Smach::RESULT_OK; diff --git a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp b/synfig-studio/trunk/src/gtkmm/state_polygon.cpp index f2eb6d4..4adbebe 100644 --- a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_polygon.cpp @@ -423,7 +423,8 @@ StatePolygon_Context::event_mouse_click_handler(const Smach::event& x) return Smach::RESULT_ACCEPT; case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu - return Smach::RESULT_ACCEPT; + if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS")) + return Smach::RESULT_ACCEPT; default: return Smach::RESULT_OK; diff --git a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp index cb4fd6e..45ca674 100644 --- a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp @@ -487,7 +487,8 @@ StateSketch_Context::event_mouse_down_handler(const Smach::event& x) } case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu - return Smach::RESULT_ACCEPT; + if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS")) + return Smach::RESULT_ACCEPT; default: return Smach::RESULT_OK; diff --git a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp index baf7ebd..309099c 100644 --- a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp @@ -174,7 +174,9 @@ StateStroke_Context::event_mouse_up_handler(const Smach::event& x) } case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu - return Smach::RESULT_ACCEPT; + printf("%s:%d BUTTON_RIGHT\n", __FILE__, __LINE__); + if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS")) + return Smach::RESULT_ACCEPT; default: return Smach::RESULT_OK; @@ -196,7 +198,9 @@ StateStroke_Context::event_mouse_draw_handler(const Smach::event& x) } case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu - return Smach::RESULT_ACCEPT; + printf("%s:%d BUTTON_RIGHT\n", __FILE__, __LINE__); + if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS")) + return Smach::RESULT_ACCEPT; default: return Smach::RESULT_OK; -- 2.7.4