X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=0dd4ffc8650e1ac575c9d6bef8e1ce0f4b644f0c;hb=9fec9e45acee8a602a11699eac2dea3a0bfe4154;hp=14a54c0ad6745673fc9396aa7e49253473f19417;hpb=8238696eb6ec59ec035c208f13c3e786e3112f89;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index 14a54c0..0dd4ffc 100644
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -7,6 +7,7 @@
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **	Copyright 2006 Yue Shi Lai
+**	Copyright (c) 2007 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
@@ -634,7 +635,9 @@ WorkArea::WorkArea(etl::loose_handle<synfigapp::CanvasInterface> canvas_interfac
 	dragging(DRAG_NONE),
 	show_grid(false),
 	tile_w(128),
-	tile_h(128)
+	tile_h(128),
+	timecode_width(0),
+	timecode_height(0)
 {
 	show_guides=true;
 	curr_input_device=0;
@@ -800,6 +803,24 @@ WorkArea::WorkArea(etl::loose_handle<synfigapp::CanvasInterface> canvas_interfac
 WorkArea::~WorkArea()
 {
 //	delete [] buffer;
+
+	// don't leave the render function queued if we are about to vanish;
+	// that causes crashes
+	if(render_idle_func_id)
+		render_idle_func_id=0;
+}
+
+bool
+WorkArea::get_updating()const
+{
+	return App::single_threaded && async_renderer && async_renderer->updating;
+}
+
+void
+WorkArea::stop_updating(bool cancel)
+{
+	async_renderer->stop();
+	if (cancel) canceled_=true;
 }
 
 void
@@ -2166,6 +2187,13 @@ public:
 bool
 studio::WorkArea::async_update_preview()
 {
+	if (get_updating())
+	{
+		stop_updating();
+		queue_render_preview();
+		return false;
+	}
+
 	async_renderer=0;
 
 	queued=false;
@@ -2453,13 +2481,41 @@ WorkArea::queue_scroll()
 
 	drawing_area->get_window()->scroll(-dx,-dy);
 
-	/*drawing_area->queue_draw_area(
-		0,
-		0,
-		128,
-		64
-	);
-	*/
+	if (timecode_width && timecode_height)
+	{
+		drawing_area->queue_draw_area(4,       4,    4+timecode_width,    4+timecode_height);
+		drawing_area->queue_draw_area(4-dx, 4-dy, 4-dx+timecode_width, 4-dy+timecode_height);
+	}
+
+#ifndef USE_FRAME_BACKGROUND_TO_SHOW_EDIT_MODE
+	if(canvas_interface->get_mode()&synfigapp::MODE_ANIMATE)
+	{
+		int maxx = drawing_area->get_width()-1;
+		int maxy = drawing_area->get_height()-1;
+
+		if (dx > 0)
+		{
+			drawing_area->queue_draw_area(      0, 0,       1, maxy);
+			drawing_area->queue_draw_area(maxx-dx, 0, maxx-dx, maxy);
+		}
+		else if (dx < 0) 
+		{
+			drawing_area->queue_draw_area(   maxx, 0,    maxx, maxy);
+			drawing_area->queue_draw_area(    -dx, 0,     -dx, maxy);
+		}
+		if (dy > 0)
+		{
+			drawing_area->queue_draw_area(0,       0, maxx,       1);
+			drawing_area->queue_draw_area(0, maxy-dy, maxx, maxy-dy);
+		}
+		else if (dy < 0) 
+		{
+			drawing_area->queue_draw_area(0,    maxy, maxx,    maxy);
+			drawing_area->queue_draw_area(0,     -dy, maxx,     -dy);
+		}
+	}
+#endif // USE_FRAME_BACKGROUND_TO_SHOW_EDIT_MODE
+
 	last_focus_point=focus_point;
 }
 
@@ -2497,9 +2553,11 @@ studio::WorkArea::zoom_norm()
 gboolean
 studio::WorkArea::__render_preview(gpointer data)
 {
-
 	WorkArea *work_area(static_cast<WorkArea*>(data));
 
+	// there's no point anyone trying to cancel the timer now - it's gone off already
+	work_area->render_idle_func_id = 0;
+
 	work_area->queued=false;
 	work_area->async_render_preview(work_area->get_canvas_view()->get_time());
 
@@ -2587,12 +2645,12 @@ studio::WorkArea::set_cursor(Gdk::CursorType x)
 	drawing_area->get_window()->set_cursor(Gdk::Cursor(x));
 }
 
-#include "iconcontroler.h"
+#include "iconcontroller.h"
 
 void
 studio::WorkArea::refresh_cursor()
 {
-//	set_cursor(IconControler::get_tool_cursor(canvas_view->get_smach().get_state_name(),drawing_area->get_window()));
+//	set_cursor(IconController::get_tool_cursor(canvas_view->get_smach().get_state_name(),drawing_area->get_window()));
 }
 
 void