projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Only show 'export' when right-clicking a canvas parameter if it's not already...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
layeractionmanager.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp
b/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp
index
321a069
..
436271a
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp
@@
-33,6
+33,7
@@
#include "layeractionmanager.h"
#include "layertree.h"
#include <synfig/context.h>
#include "layeractionmanager.h"
#include "layertree.h"
#include <synfig/context.h>
+#include <synfig/layer_pastecanvas.h>
#include <synfigapp/action_param.h>
#include "instance.h"
#include <synfigapp/selectionmanager.h>
#include <synfigapp/action_param.h>
#include "instance.h"
#include <synfigapp/selectionmanager.h>
@@
-333,8
+334,8
@@
void
LayerActionManager::cut()
{
copy();
LayerActionManager::cut()
{
copy();
- if(action_group_->get_action("action-
layer_r
emove"))
- action_group_->get_action("action-
layer_r
emove")->activate();
+ if(action_group_->get_action("action-
LayerR
emove"))
+ action_group_->get_action("action-
LayerR
emove")->activate();
}
void
}
void
@@
-380,7
+381,7
@@
LayerActionManager::paste()
{
layer=(*iter)->clone(guid);
layer_selection.push_back(layer);
{
layer=(*iter)->clone(guid);
layer_selection.push_back(layer);
- synfigapp::Action::Handle action(synfigapp::Action::create("
layer_a
dd"));
+ synfigapp::Action::Handle action(synfigapp::Action::create("
LayerA
dd"));
assert(action);
if(!action)
assert(action);
if(!action)
@@
-400,12
+401,15
@@
LayerActionManager::paste()
return;
}
return;
}
+ etl::handle<Layer_PasteCanvas> paste = etl::handle<Layer_PasteCanvas>::cast_dynamic(layer);
+ if (paste) paste->update_renddesc();
+
// synfig::info("DEPTH=%d",depth);
// Action to move the layer (if necessary)
if(depth>0)
{
// synfig::info("DEPTH=%d",depth);
// Action to move the layer (if necessary)
if(depth>0)
{
- synfigapp::Action::Handle action(synfigapp::Action::create("
layer_m
ove"));
+ synfigapp::Action::Handle action(synfigapp::Action::create("
LayerM
ove"));
assert(action);
if(!action)
assert(action);
if(!action)
@@
-491,21
+495,14
@@
LayerActionManager::amount_inc()
float adjust(0.1);
// Create the action group
float adjust(0.1);
// Create the action group
- synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("Decrease Amount"));
-
- if(adjust>0)
- group.set_name(_("Increase Amount"));
-
+ synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("Increase Amount"));
synfigapp::SelectionManager::LayerList layer_list(layer_tree_->get_selected_layers());
synfigapp::SelectionManager::LayerList layer_list(layer_tree_->get_selected_layers());
-
while(!layer_list.empty
())
+
for (; !layer_list.empty(); layer_list.pop_front
())
{
ValueBase value(layer_list.front()->get_param("amount"));
if(value.same_type_as(Real()))
{
ValueBase value(layer_list.front()->get_param("amount"));
if(value.same_type_as(Real()))
- {
get_canvas_interface()->change_value(synfigapp::ValueDesc(layer_list.front(),"amount"),value.get(Real())+adjust);
get_canvas_interface()->change_value(synfigapp::ValueDesc(layer_list.front(),"amount"),value.get(Real())+adjust);
- }
- layer_list.pop_front();
}
}
}
}
@@
-516,19
+513,12
@@
LayerActionManager::amount_dec()
// Create the action group
synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("Decrease Amount"));
// Create the action group
synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("Decrease Amount"));
-
- if(adjust>0)
- group.set_name(_("Increase Amount"));
-
synfigapp::SelectionManager::LayerList layer_list(layer_tree_->get_selected_layers());
synfigapp::SelectionManager::LayerList layer_list(layer_tree_->get_selected_layers());
-
while(!layer_list.empty
())
+
for (; !layer_list.empty(); layer_list.pop_front
())
{
ValueBase value(layer_list.front()->get_param("amount"));
if(value.same_type_as(Real()))
{
ValueBase value(layer_list.front()->get_param("amount"));
if(value.same_type_as(Real()))
- {
get_canvas_interface()->change_value(synfigapp::ValueDesc(layer_list.front(),"amount"),value.get(Real())+adjust);
get_canvas_interface()->change_value(synfigapp::ValueDesc(layer_list.front(),"amount"),value.get(Real())+adjust);
- }
- layer_list.pop_front();
}
}
}
}