projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use ValueNode_DynamicList::set_member_canvas() to set the canvas for each blinepoint...
[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
1b61346
..
e783687
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
@@
-1199,8
+1199,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
+1218,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
+1347,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)();
@@
-1922,6
+1924,9
@@
WorkArea::refresh_dimension_info()
pw=canvaswidth/w;
ph=canvasheight/h;
pw=canvaswidth/w;
ph=canvasheight/h;
+ Duckmatic::set_flip_x(pw < 0);
+ Duckmatic::set_flip_y(ph > 0);
+
scrollx_adjustment.set_page_increment(abs(get_grid_size()[0]));
scrollx_adjustment.set_step_increment(abs(pw));
scrollx_adjustment.set_lower(-abs(canvaswidth));
scrollx_adjustment.set_page_increment(abs(get_grid_size()[0]));
scrollx_adjustment.set_step_increment(abs(pw));
scrollx_adjustment.set_lower(-abs(canvaswidth));
@@
-2256,6
+2261,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);