X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=d7d61c00eb132c3f419ecbac18b6081ea85face3;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=5cd526d60149515fe754988bb60352cae6da0b3c;hpb=b6c331ec41a1788c39606b9c398a25f801bacb4a;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index 5cd526d..d7d61c0 100644
--- 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
-**	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
@@ -171,7 +171,7 @@ public:
 		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);
 		}
@@ -194,7 +194,7 @@ public:
 		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
@@ -309,7 +309,7 @@ public:
 			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);
@@ -351,7 +351,7 @@ public:
 		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,
@@ -476,7 +476,7 @@ public:
 		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
@@ -555,7 +555,7 @@ public:
 			//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);
@@ -564,7 +564,7 @@ public:
 			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;
 			}
@@ -597,7 +597,7 @@ public:
 		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,
@@ -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;
-	lowrespixel=1;
+	low_res_pixel_size=2;
 	rendering=false;
 	canceled_=false;
 	low_resolution=true;
@@ -1199,8 +1199,6 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
 	bool is_mouse(false);
 	Gdk::ModifierType modifier(Gdk::ModifierType(0));
 
-	drawing_area->grab_focus();
-
 	// 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);
+			drawing_area->grab_focus();
 		}
 
 		// Make sure we recognize the device
@@ -1922,6 +1921,9 @@ WorkArea::refresh_dimension_info()
 	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));
@@ -1994,7 +1996,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);
 
-	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));
 
@@ -2162,11 +2164,11 @@ WorkArea::set_quality(int x)
 }
 
 void
-WorkArea::set_lowrespixel(int x)
+WorkArea::set_low_res_pixel_size(int x)
 {
-	if(x==lowrespixel)
+	if(x==low_res_pixel_size)
 		return;
-	lowrespixel=x;
+	low_res_pixel_size=x;
 	queue_render_preview();
 }
 
@@ -2256,6 +2258,11 @@ studio::WorkArea::async_update_preview()
 	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);
@@ -2267,7 +2274,7 @@ studio::WorkArea::async_update_preview()
 
 	// if we have lots of pixels to render and the tile renderer isn't disabled, use it
 	int div;
-	div = low_resolution ? (1 << lowrespixel) : 1;
+	div = low_resolution ? low_res_pixel_size : 1;
 	if (w*h > 240*div*135*div && !getenv("SYNFIG_DISABLE_TILE_RENDER"))
 	{
 		// do a tile render