X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_polygon.cpp;h=3d0dd01433568a76b091a3f443d6f6d10eae0f5a;hb=fc62d51d61bc6ca78c9e96eb2974e3adfcc4468d;hp=ab1138b368940736e69879b5703314e8deff1090;hpb=c3ad95144d148602f672e95ddda1f18fc35502f8;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp b/synfig-studio/trunk/src/gtkmm/state_polygon.cpp
index ab1138b..3d0dd01 100644
--- a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_polygon.cpp
@@ -47,6 +47,8 @@
 #include "dialog_tooloptions.h"
 #include <synfigapp/main.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -118,10 +120,10 @@ public:
 	void save_settings();
 	void reset();
 	void increment_id();
-	bool no_egress_on_selection_change;
+	bool egress_on_selection_change;
 	Smach::event_result event_layer_selection_changed_handler(const Smach::event& /*x*/)
 	{
-		if(!no_egress_on_selection_change)
+		if(egress_on_selection_change)
 			throw Smach::egress_exception();
 		return Smach::RESULT_OK;
 	}
@@ -215,13 +217,13 @@ StatePolygon_Context::increment_id()
 StatePolygon_Context::StatePolygon_Context(CanvasView* canvas_view):
 	canvas_view_(canvas_view),
 	is_working(*canvas_view),
-	prev_workarea_layer_status_(get_work_area()->allow_layer_clicks),
+	prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()),
 	duckmatic_push(get_work_area()),
 	settings(synfigapp::Main::get_selected_input_device()->settings()),
 	entry_id(),
 	button_make(_("Make"))
 {
-	no_egress_on_selection_change=false;
+	egress_on_selection_change=true;
 	load_settings();
 
 	// Set up the tool options dialog
@@ -235,7 +237,7 @@ StatePolygon_Context::StatePolygon_Context(CanvasView* canvas_view):
 
 
 	// Turn off layer clicking
-	get_work_area()->allow_layer_clicks=false;
+	get_work_area()->set_allow_layer_clicks(false);
 
 	// clear out the ducks
 	get_work_area()->clear_ducks();
@@ -301,7 +303,7 @@ StatePolygon_Context::~StatePolygon_Context()
 
 	save_settings();
 	// Restore layer clicking
-	get_work_area()->allow_layer_clicks=prev_workarea_layer_status_;
+	get_work_area()->set_allow_layer_clicks(prev_workarea_layer_status_);
 
 	App::dialog_tool_options->clear();
 
@@ -383,6 +385,7 @@ StatePolygon_Context::run()
 				action->set_param("canvas_interface",get_canvas_interface());
 				action->set_param("value_desc",value_desc);
 				action->set_param("type","dynamic_list");
+				action->set_param("time",get_canvas_interface()->get_time());
 				if(!get_canvas_interface()->get_instance()->perform_action(action))
 				{
 					group.cancel();
@@ -390,10 +393,10 @@ StatePolygon_Context::run()
 					return;
 				}
 			}
-			no_egress_on_selection_change=true;
+			egress_on_selection_change=false;
 			get_canvas_interface()->get_selection_manager()->clear_selected_layers();
 			get_canvas_interface()->get_selection_manager()->set_selected_layer(layer);
-			no_egress_on_selection_change=false;
+			egress_on_selection_change=true;
 			//get_canvas_interface()->signal_dirty_preview()();
 		}
 /*
@@ -422,8 +425,9 @@ StatePolygon_Context::event_mouse_click_handler(const Smach::event& x)
 		refresh_ducks();
 		return Smach::RESULT_ACCEPT;
 
-	case BUTTON_RIGHT: // Intercept the right-button click to short-circut the pop-up menu
-		return Smach::RESULT_ACCEPT;
+	case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
+		if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS"))
+			return Smach::RESULT_ACCEPT;
 
 	default:
 		return Smach::RESULT_OK;