X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=9b77c6c16e916ad2918cb745045b45eb56cce71b;hb=823db6d3004c792ca4377ed0fe5606a0f74f716a;hp=d65d3d0fef4faeac4dc688a579597363da18a647;hpb=c2813b4d63804cac9b4067146a9e6eca717cb3e4;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index d65d3d0..9b77c6c 100644
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -630,14 +630,14 @@ WorkArea::WorkArea(etl::loose_handle<synfigapp::CanvasInterface> canvas_interfac
 	canvas(canvas_interface->get_canvas()),
 	scrollx_adjustment(0,-4,4,0.01,0.1),
 	scrolly_adjustment(0,-4,4,0.01,0.1),
-	w(128),
-	h(128),
+	w(TILE_SIZE),
+	h(TILE_SIZE),
 	last_event_time(0),
 	progresscallback(0),
 	dragging(DRAG_NONE),
 	show_grid(false),
-	tile_w(128),
-	tile_h(128),
+	tile_w(TILE_SIZE),
+	tile_h(TILE_SIZE),
 	timecode_width(0),
 	timecode_height(0)
 {
@@ -892,6 +892,8 @@ WorkArea::load_meta_data()
 
 		if(!tmp.empty())
 			gx=stratof(tmp);
+		else
+			synfig::error("WorkArea::load_meta_data(): Unable to parse data for \"grid_size\", which was \"%s\"",data.c_str());
 
 		if(iter==data.end())
 			tmp.clear();
@@ -900,11 +902,11 @@ WorkArea::load_meta_data()
 
 		if(!tmp.empty())
 			gy=stratof(tmp);
+		else
+			synfig::error("WorkArea::load_meta_data(): Unable to parse data for \"grid_size\", which was \"%s\"",data.c_str());
 
 		set_grid_size(Vector(gx,gy));
 	}
-	else
-		synfig::error("WorkArea::load_meta_data(): Unable to parse data for \"grid_size\", which was \"%s\"",data.c_str());
 
 	data=canvas->get_meta_data("grid_show");
 	if(data.size() && (data=="1" || data[0]=='t' || data[0]=='T'))
@@ -1869,10 +1871,8 @@ WorkArea::on_vruler_event(GdkEvent */*event*/)
 	switch(event->type)
     {
 	case GDK_BUTTON_PRESS:
-		DEBUGPOINT();
 		if(dragging==DRAG_NONE)
 		{
-			DEBUGPOINT();
 			dragging=DRAG_GUIDE;
 			curr_guide=get_guide_list_x().insert(get_guide_list_x().begin());
 			curr_guide_is_x=true;
@@ -1880,10 +1880,8 @@ WorkArea::on_vruler_event(GdkEvent */*event*/)
 		return true;
 		break;
 	case GDK_BUTTON_RELEASE:
-		DEBUGPOINT();
 		if(dragging==DRAG_GUIDE && curr_guide_is_x==true)
 		{
-			DEBUGPOINT();
 			dragging=DRAG_NONE;
 			get_guide_list_x().erase(curr_guide);
 		}
@@ -1980,7 +1978,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);
 
-	const int width_in_tiles(w/tile_w+(w%tile_w?1:0));
+	const int width_in_tiles(w/tile_w+((low_resolution?((w/2)%(tile_w/2)):(w%tile_w))?1:0));
 	const int height_in_tiles(h/tile_h+(h%tile_h?1:0));
 
 	int
@@ -2280,7 +2278,7 @@ studio::WorkArea::async_update_preview()
 	synfig::ProgressCallback *cb=get_canvas_view()->get_ui_interface().get();
 
 	rendering=true;
-	cb->task("Rendering...");
+	cb->task(_("Rendering..."));
 	rendering=true;
 
 	return true;
@@ -2302,12 +2300,12 @@ studio::WorkArea::async_update_finished()
 	{
 		dirty=false;
 		//queued=false;
-		cb->task("Idle");
+		cb->task(_("Idle"));
 	}
 	else
 	{
 		dirty=true;
-		cb->task("Render Failed");
+		cb->task(_("Render Failed"));
 	}
 	//get_canvas_view()->reset_cancel_status();
 	done_rendering();
@@ -2381,7 +2379,7 @@ again:
 	target->set_avoid_time_sync(true);
 
 	if(cb)
-		cb->task(strprintf("Rendering canvas %s...",get_canvas()->get_name().c_str()));
+		cb->task(strprintf(_("Rendering canvas %s..."),get_canvas()->get_name().c_str()));
 
 	bool ret = target->render(cb);
 
@@ -2397,9 +2395,9 @@ again:
 	if(cb)
 	{
 		if(ret)
-			cb->task("Idle");
+			cb->task(_("Idle"));
 		else
-			cb->task("Render Failed");
+			cb->task(_("Render Failed"));
 		cb->amount_complete(0,1);
 	}