projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Woops, forgot to bump versions for the dependencies on ETL and synfig.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
workarea.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/workarea.cpp
b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index
09c38f2
..
c4f8be6
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/workarea.cpp
@@
-828,18
+828,22
@@
WorkArea::~WorkArea()
render_idle_func_id=0;
}
render_idle_func_id=0;
}
+#ifdef SINGLE_THREADED
bool
WorkArea::get_updating()const
{
return App::single_threaded && async_renderer && async_renderer->updating;
}
bool
WorkArea::get_updating()const
{
return App::single_threaded && async_renderer && async_renderer->updating;
}
+#endif
+#ifdef SINGLE_THREADED
void
WorkArea::stop_updating(bool cancel)
{
async_renderer->stop();
if (cancel) canceled_=true;
}
void
WorkArea::stop_updating(bool cancel)
{
async_renderer->stop();
if (cancel) canceled_=true;
}
+#endif
void
WorkArea::save_meta_data()
void
WorkArea::save_meta_data()
@@
-1164,7
+1168,7
@@
WorkArea::on_key_press_event(GdkEventKey* event)
break;
}
break;
}
- synfigapp::Action::PassiveGrouper grouper(instance.get(),
"Nudge"
);
+ synfigapp::Action::PassiveGrouper grouper(instance.get(),
_("Nudge")
);
// Grid snap does not apply to nudging
bool grid_snap_holder(get_grid_snap());
// Grid snap does not apply to nudging
bool grid_snap_holder(get_grid_snap());
@@
-1620,7
+1624,7
@@
WorkArea::on_drawing_area_event(GdkEvent *event)
else
if(dragging==DRAG_DUCK)
{
else
if(dragging==DRAG_DUCK)
{
- synfigapp::Action::PassiveGrouper grouper(instance.get(),
"Move"
);
+ synfigapp::Action::PassiveGrouper grouper(instance.get(),
_("Move")
);
dragging=DRAG_NONE;
//translate_selected_ducks(mouse_pos);
set_axis_lock(false);
dragging=DRAG_NONE;
//translate_selected_ducks(mouse_pos);
set_axis_lock(false);
@@
-2216,12
+2220,14
@@
public:
bool
studio::WorkArea::async_update_preview()
{
bool
studio::WorkArea::async_update_preview()
{
+#ifdef SINGLE_THREADED
if (get_updating())
{
stop_updating();
queue_render_preview();
return false;
}
if (get_updating())
{
stop_updating();
queue_render_preview();
return false;
}
+#endif
async_renderer=0;
async_renderer=0;