Show a better entry in the history dialog when renaming a layer.

[synfig.git] / synfig-studio / trunk / src / gtkmm / state_polygon.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp b/synfig-studio/trunk/src/gtkmm/state_polygon.cpp
index afe6a5b..3d0dd01 100644 (file)
--- 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 =========================================================== */
@@ -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();
@@ -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;