X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Frenderer_canvas.cpp;h=960807997e4ddeb2cd94360073f5e351732ec88c;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=9e8e86388849fda9fd8d7b1a76771614973393f8;hpb=c6af6e1c3816eb3b15c573089b32e6ae65cd2f49;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp b/synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp
index 9e8e863..9608079 100644
--- a/synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp
+++ b/synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp
@@ -2,10 +2,11 @@
 /*!	\file renderer_canvas.cpp
 **	\brief Template File
 **
-**	$Id: renderer_canvas.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	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
@@ -33,6 +34,8 @@
 #include "workarea.h"
 #include <ETL/misc>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -91,7 +94,7 @@ Renderer_Canvas::get_rendering()const
 void
 Renderer_Canvas::render_vfunc(
 	const Glib::RefPtr<Gdk::Drawable>& drawable,
-	const Gdk::Rectangle& expose_area
+	const Gdk::Rectangle& /*expose_area*/
 )
 {
 	assert(get_work_area());
@@ -129,74 +132,77 @@ Renderer_Canvas::render_vfunc(
 	Glib::RefPtr<Gdk::GC> gc(Gdk::GC::create(drawable));
 
 	if(!tile_book.empty())
-	if(get_full_frame())
 	{
-		if(tile_book[0].first)
+		if(get_full_frame())
 		{
-			drawable->draw_pixbuf(
-				gc, //GC
-				tile_book[0].first, //pixbuf
-				0, 0,	// Source X and Y
-				round_to_int(x),round_to_int(y),	// Dest X and Y
-				-1,-1,	// Width and Height
-				Gdk::RGB_DITHER_MAX,		// RgbDither
-				2, 2 // Dither offset X and Y
-			);
+			if(tile_book[0].first)
+			{
+				drawable->draw_pixbuf(
+					gc, //GC
+					tile_book[0].first, //pixbuf
+					0, 0,	// Source X and Y
+					round_to_int(x),round_to_int(y),	// Dest X and Y
+					-1,-1,	// Width and Height
+					Gdk::RGB_DITHER_MAX,		// RgbDither
+					2, 2 // Dither offset X and Y
+					);
+			}
+			if(tile_book[0].second!=get_refreshes() && get_canceled()==false && get_rendering()==false && get_queued()==false)
+				get_work_area()->async_update_preview();
 		}
-		if(tile_book[0].second!=get_refreshes() && get_canceled()==false && get_rendering()==false && get_queued()==false)
-			get_work_area()->async_update_preview();
-	}
-	else
-	{
-		const int width_in_tiles(w/tile_w+(w%tile_w?1:0));
-		const int height_in_tiles(h/tile_h+(h%tile_h?1:0));
+		else
+		{
+			int div = get_work_area()->get_low_res_pixel_size();
+			const int width_in_tiles(w/tile_w+(((get_work_area()->get_low_resolution_flag())?((w/div)%(tile_w/div)):(w%tile_w))?1:0));
+			const int height_in_tiles(h/tile_h+(h%tile_h?1:0));
 
-		int u(0),v(0),tx,ty;
-		int u1(0),v1(0),u2(width_in_tiles), v2(height_in_tiles);
+			int u(0),v(0),tx,ty;
+			int u1(0),v1(0),u2(width_in_tiles), v2(height_in_tiles);
 
-		bool needs_refresh(false);
+			bool needs_refresh(false);
 
-		u1=int(-x/tile_w);
-		v1=int(-y/tile_h);
-		u2=int((-x+drawable_w)/tile_w+1);
-		v2=int((-y+drawable_h)/tile_h+1);
-		if(u2>width_in_tiles)u2=width_in_tiles;
-		if(v2>height_in_tiles)v2=height_in_tiles;
-		if(u1<0)u1=0;
-		if(v1<0)v1=0;
+			u1=int(-x/tile_w);
+			v1=int(-y/tile_h);
+			u2=int((-x+drawable_w)/tile_w+1);
+			v2=int((-y+drawable_h)/tile_h+1);
+			if(u2>width_in_tiles)u2=width_in_tiles;
+			if(v2>height_in_tiles)v2=height_in_tiles;
+			if(u1<0)u1=0;
+			if(v1<0)v1=0;
 
-		for(v=v1;v<v2;v++)
-		{
-			for(u=u1;u<u2;u++)
+			for(v=v1;v<v2;v++)
 			{
-				int index=v*width_in_tiles+u;
-				if(tile_book.size()>index && tile_book[index].first)
+				for(u=u1;u<u2;u++)
 				{
-					tx=u*tile_w;
-					ty=v*tile_w;
-
-					drawable->draw_pixbuf(
-						gc, //GC
-						tile_book[index].first, //pixbuf
-						0, 0,	// Source X and Y
-						round_to_int(x)+tx,round_to_int(y)+ty,	// Dest X and Y
-						-1,-1,	// Width and Height
-						Gdk::RGB_DITHER_MAX,		// RgbDither
-						2, 2 // Dither offset X and Y
-					);
+					int index=v*width_in_tiles+u;
+					if(int(tile_book.size())>index && tile_book[index].first)
+					{
+						tx=u*tile_w;
+						ty=v*tile_w;
+
+						drawable->draw_pixbuf(
+							gc, //GC
+							tile_book[index].first, //pixbuf
+							0, 0,	// Source X and Y
+							round_to_int(x)+tx,round_to_int(y)+ty,	// Dest X and Y
+							-1,-1,	// Width and Height
+							Gdk::RGB_DITHER_MAX,		// RgbDither
+							2, 2 // Dither offset X and Y
+							);
+					}
+					if(tile_book[index].second!=get_refreshes())
+						needs_refresh=true;
 				}
-				if(tile_book[index].second!=get_refreshes())
-					needs_refresh=true;
 			}
-		}
-		if(needs_refresh==true && get_canceled()==false && get_rendering()==false && get_queued()==false)
-		{
-			//queue_render_preview();
-			get_work_area()->async_update_preview();
-			//update_preview();
-			//return true;
-		}
+			if(needs_refresh==true && get_canceled()==false && get_rendering()==false && get_queued()==false)
+			{
+				//queue_render_preview();
+				get_work_area()->async_update_preview();
+				//update_preview();
+				//return true;
+			}
 
+		}
 	}
 
 	// Draw the border around the rendered region