X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=e7c800d8f858e0c5c7015a752440d0a1211c226c;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;hp=661774f158dce53c3f1372d5e492c5a68f1ea374;hpb=dca7076317079ed0ebc157e77e2e9cd529d7c26b;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index 661774f..e7c800d 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,11 @@ 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;
 }
 
 void
@@ -2048,7 +2056,6 @@ WorkArea::refresh(GdkEventExpose*event)
 		}
 	}
 
-
 	// Calculate the window coordinates of the top-left
 	// corner of the canvas.
 	//const synfig::Vector::value_type
@@ -2062,27 +2069,31 @@ WorkArea::refresh(GdkEventExpose*event)
 
 	Glib::RefPtr<Gdk::GC> gc=Gdk::GC::create(drawing_area->get_window());
 
-
-
 	// If we are in animate mode, draw a red border around the screen
 	if(canvas_interface->get_mode()&synfigapp::MODE_ANIMATE)
 	{
-		/*gc->set_rgb_fg_color(Gdk::Color("#FF0000"));
+// #define USE_FRAME_BACKGROUND_TO_SHOW_EDIT_MODE
+#ifdef USE_FRAME_BACKGROUND_TO_SHOW_EDIT_MODE
+		// This method of drawing the red border doesn't work on any
+		// Gtk theme which uses the crux-engine, hcengine, industrial,
+		// mist, or ubuntulooks engine, such as the default ubuntu
+		// 'Human' theme.
+		drawing_frame->modify_bg(Gtk::STATE_NORMAL,Gdk::Color("#FF0000"));
+#else
+		// So let's do it in a more primitive fashion.
+		gc->set_rgb_fg_color(Gdk::Color("#FF0000"));
 		gc->set_line_attributes(1,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
 		drawing_area->get_window()->draw_rectangle(
 			gc,
 			false,	// Fill?
 			0,0,	// x,y
-			drawing_area->get_width()-1,drawing_area->get_height()-1	//w,h
-		);
-		*/
-		drawing_frame->modify_bg(Gtk::STATE_NORMAL,Gdk::Color("#FF0000"));
-		//get_window()->set_background(Gdk::Color("#FF0000"));
+			drawing_area->get_width()-1,drawing_area->get_height()-1); // w,h
+#endif
 	}
+#ifdef USE_FRAME_BACKGROUND_TO_SHOW_EDIT_MODE
 	else
 		drawing_frame->unset_bg(Gtk::STATE_NORMAL);
-
-
+#endif
 
 	previous_focus=get_focus_point();
 
@@ -2450,13 +2461,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;
 }
 
@@ -2494,9 +2533,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());