#include "dialog_tooloptions.h"
#include <synfigapp/main.h>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
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;
}
entry_id(),
button_make(_("Make"))
{
- no_egress_on_selection_change=false;
+ egress_on_selection_change=true;
load_settings();
// Set up the tool options dialog
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();
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()();
}
/*
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;