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
f436f91
..
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
@@
-171,7
+171,7
@@
public:
set_clipping(true);
if(low_res)
{
set_clipping(true);
if(low_res)
{
- int div =
1 << workarea->get_lowrespixel
();
+ int div =
workarea->get_low_res_pixel_size
();
set_tile_w(workarea->tile_w/div);
set_tile_h(workarea->tile_h/div);
}
set_tile_w(workarea->tile_w/div);
set_tile_h(workarea->tile_h/div);
}
@@
-194,7
+194,7
@@
public:
assert(workarea);
newdesc->set_flags(RendDesc::PX_ASPECT|RendDesc::IM_SPAN);
if(low_res) {
assert(workarea);
newdesc->set_flags(RendDesc::PX_ASPECT|RendDesc::IM_SPAN);
if(low_res) {
- int div =
1 << workarea->get_lowrespixel
();
+ int div =
workarea->get_low_res_pixel_size
();
newdesc->set_wh(w/div,h/div);
}
else
newdesc->set_wh(w/div,h/div);
}
else
@@
-309,7
+309,7
@@
public:
int h(get_tile_h());
int x(surface.get_w()*surface.get_h());
//if(low_res) {
int h(get_tile_h());
int x(surface.get_w()*surface.get_h());
//if(low_res) {
- // int div =
1 << workarea->get_lowrespixel
();
+ // int div =
workarea->get_low_res_pixel_size
();
// w/=div,h/=div;
//}
Color dark(0.6,0.6,0.6);
// w/=div,h/=div;
//}
Color dark(0.6,0.6,0.6);
@@
-351,7
+351,7
@@
public:
if(low_res)
{
// We need to scale up
if(low_res)
{
// We need to scale up
- int div =
1 << workarea->get_lowrespixel
();
+ int div =
workarea->get_low_res_pixel_size
();
pixbuf=pixbuf->scale_simple(
surface.get_w()*div,
surface.get_h()*div,
pixbuf=pixbuf->scale_simple(
surface.get_w()*div,
surface.get_h()*div,
@@
-476,7
+476,7
@@
public:
newdesc->set_flags(RendDesc::PX_ASPECT|RendDesc::IM_SPAN);
if(low_res)
{
newdesc->set_flags(RendDesc::PX_ASPECT|RendDesc::IM_SPAN);
if(low_res)
{
- int div =
1 << workarea->get_lowrespixel
();
+ int div =
workarea->get_low_res_pixel_size
();
newdesc->set_wh(w/div,h/div);
}
else
newdesc->set_wh(w/div,h/div);
}
else
@@
-555,7
+555,7
@@
public:
//int h(surface.get_h());
int x(surface.get_w()*surface.get_h());
//if(low_res) {
//int h(surface.get_h());
int x(surface.get_w()*surface.get_h());
//if(low_res) {
- // int div =
1 << workarea->get_lowrespixel
();
+ // int div =
workarea->get_low_res_pixel_size
();
// w/=div,h/=div;
//}
Color dark(0.6,0.6,0.6);
// w/=div,h/=div;
//}
Color dark(0.6,0.6,0.6);
@@
-564,7
+564,7
@@
public:
int th=workarea->tile_h;
if(low_res)
{
int th=workarea->tile_h;
if(low_res)
{
- int div =
1 << workarea->get_lowrespixel
();
+ int div =
workarea->get_low_res_pixel_size
();
tw/=div;
th/=div;
}
tw/=div;
th/=div;
}
@@
-597,7
+597,7
@@
public:
if(low_res)
{
// We need to scale up
if(low_res)
{
// We need to scale up
- int div =
1 << workarea->get_lowrespixel
();
+ int div =
workarea->get_low_res_pixel_size
();
pixbuf=pixbuf->scale_simple(
surface.get_w()*div,
surface.get_h()*div,
pixbuf=pixbuf->scale_simple(
surface.get_w()*div,
surface.get_h()*div,
@@
-664,7
+664,7
@@
WorkArea::WorkArea(etl::loose_handle<synfigapp::CanvasInterface> canvas_interfac
render_idle_func_id=0;
zoom=prev_zoom=1.0;
quality=10;
render_idle_func_id=0;
zoom=prev_zoom=1.0;
quality=10;
- low
respixel=1
;
+ low
_res_pixel_size=2
;
rendering=false;
canceled_=false;
low_resolution=true;
rendering=false;
canceled_=false;
low_resolution=true;
@@
-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());
@@
-1199,8
+1203,6
@@
WorkArea::on_drawing_area_event(GdkEvent *event)
bool is_mouse(false);
Gdk::ModifierType modifier(Gdk::ModifierType(0));
bool is_mouse(false);
Gdk::ModifierType modifier(Gdk::ModifierType(0));
- drawing_area->grab_focus();
-
// Handle input stuff
if(
event->any.type==GDK_MOTION_NOTIFY ||
// Handle input stuff
if(
event->any.type==GDK_MOTION_NOTIFY ||
@@
-1220,6
+1222,7
@@
WorkArea::on_drawing_area_event(GdkEvent *event)
{
device=event->button.device;
modifier=Gdk::ModifierType(event->button.state);
{
device=event->button.device;
modifier=Gdk::ModifierType(event->button.state);
+ drawing_area->grab_focus();
}
// Make sure we recognize the device
}
// Make sure we recognize the device
@@
-1348,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)();
@@
-1618,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);
@@
-1994,7
+2000,7
@@
WorkArea::next_unrendered_tile(int refreshes)const
x(focus_point[0]/pw+drawing_area->get_width()/2-w/2),
y(focus_point[1]/ph+drawing_area->get_height()/2-h/2);
x(focus_point[0]/pw+drawing_area->get_width()/2-w/2),
y(focus_point[1]/ph+drawing_area->get_height()/2-h/2);
- int div =
1 << lowrespixel
;
+ int div =
low_res_pixel_size
;
const int width_in_tiles(w/tile_w+((low_resolution?((w/div)%(tile_w/div)):(w%tile_w))?1:0));
const int height_in_tiles(h/tile_h+(h%tile_h?1:0));
const int width_in_tiles(w/tile_w+((low_resolution?((w/div)%(tile_w/div)):(w%tile_w))?1:0));
const int height_in_tiles(h/tile_h+(h%tile_h?1:0));
@@
-2162,11
+2168,11
@@
WorkArea::set_quality(int x)
}
void
}
void
-WorkArea::set_low
respixel
(int x)
+WorkArea::set_low
_res_pixel_size
(int x)
{
{
- if(x==low
respixel
)
+ if(x==low
_res_pixel_size
)
return;
return;
- low
respixel
=x;
+ low
_res_pixel_size
=x;
queue_render_preview();
}
queue_render_preview();
}
@@
-2214,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;
@@
-2256,6
+2264,11
@@
studio::WorkArea::async_update_preview()
int w=(int)(desc.get_w()*zoom);
int h=(int)(desc.get_h()*zoom);
int w=(int)(desc.get_w()*zoom);
int h=(int)(desc.get_h()*zoom);
+ // ensure that the size we draw is at least one pixel in each dimension
+ int min_size = low_resolution ? low_res_pixel_size : 1;
+ if (w < min_size) w = min_size;
+ if (h < min_size) h = min_size;
+
// Setup the description parameters
desc.set_antialias(1);
desc.set_time(cur_time);
// Setup the description parameters
desc.set_antialias(1);
desc.set_time(cur_time);
@@
-2266,9
+2279,9
@@
studio::WorkArea::async_update_preview()
handle<Target> target;
// if we have lots of pixels to render and the tile renderer isn't disabled, use it
handle<Target> target;
// if we have lots of pixels to render and the tile renderer isn't disabled, use it
- int div
= 1 << lowrespixel
;
- if(w*h>(low_resolution?480*270:480*270/div) &&
-
!getenv("SYNFIG_DISABLE_TILE_RENDER"))
+ int div;
+ div = low_resolution ? low_res_pixel_size : 1;
+
if (w*h > 240*div*135*div &&
!getenv("SYNFIG_DISABLE_TILE_RENDER"))
{
// do a tile render
handle<WorkAreaTarget> trgt(new class WorkAreaTarget(this,w,h));
{
// do a tile render
handle<WorkAreaTarget> trgt(new class WorkAreaTarget(this,w,h));
@@
-2566,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