projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use 0 for the index if the closest point is on the segment which closes the loop...
[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
22b0526
..
57d079d
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/workarea.cpp
@@
-6,8
+6,8
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-** Copyright 2006 Yue Shi Lai
-** Copyright (c) 2007 Chris Moore
+** Copyright
(c)
2006 Yue Shi Lai
+** Copyright (c) 2007
, 2008
Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-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());
@@
-1347,8
+1351,11
@@
WorkArea::on_drawing_area_event(GdkEvent *event)
selected_bezier=find_bezier(mouse_pos,radius,&bezier_click_pos);
selected_bezier=find_bezier(mouse_pos,radius,&bezier_click_pos);
- if(duck
&& duck->get_editable()
)
+ if(duck)
{
{
+ if (!duck->get_editable())
+ return true;
+
//get_selected_duck()->signal_user_click(0)();
//if(clicked_duck)clicked_duck->signal_user_click(0)();
//get_selected_duck()->signal_user_click(0)();
//if(clicked_duck)clicked_duck->signal_user_click(0)();
@@
-1617,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);
@@
-2213,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;
@@
-2570,20
+2579,18
@@
studio::WorkArea::zoom_out()
void
studio::WorkArea::zoom_fit()
{
void
studio::WorkArea::zoom_fit()
{
- // This really doesn't zoom to fit. Bug.
- zoom_norm();
+ float new_zoom(min(drawing_area->get_width() * zoom / w, drawing_area->get_height() * zoom / h));
+ if (zoom == new_zoom) return set_zoom(prev_zoom);
+ prev_zoom = zoom;
+ set_zoom(new_zoom);
}
void
studio::WorkArea::zoom_norm()
{
}
void
studio::WorkArea::zoom_norm()
{
- if(zoom==1.0)
- set_zoom(prev_zoom);
- else
- {
- prev_zoom=zoom;
- set_zoom(1.0f);
- }
+ if (zoom == 1.0) return set_zoom(prev_zoom);
+ prev_zoom = zoom;
+ set_zoom(1.0f);
}
gboolean
}
gboolean