remove debug output and get logic correct to cause first render to always use the...

[ardour.git] / libs / canvas / canvas.cc

diff --git a/libs/canvas/canvas.cc b/libs/canvas/canvas.cc
index cc588cf3e1ae1e58c85b2d4fcbdd3a7f781d4d27..7f9c8fab597337ca08f71b7bbeb45cae266ee673 100644 (file)
--- a/libs/canvas/canvas.cc
+++ b/libs/canvas/canvas.cc
@@ -18,6 +18,10 @@
 
 */
 
+#if !defined USE_CAIRO_IMAGE_SURFACE && !defined NDEBUG
+#define OPTIONAL_CAIRO_IMAGE_SURFACE
+#endif
+
 /** @file  canvas/canvas.cc
  *  @brief Implementation of the main canvas classes.
  */
@@ -754,12 +758,18 @@ void
 GtkCanvas::on_size_allocate (Gtk::Allocation& a)
 {
        EventBox::on_size_allocate (a);
-#ifdef USE_CAIRO_IMAGE_SURFACE
+#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE
+       if (getenv("ARDOUR_IMAGE_SURFACE")) {
+#endif
+#if defined USE_CAIRO_IMAGE_SURFACE || defined OPTIONAL_CAIRO_IMAGE_SURFACE
        /* allocate an image surface as large as the canvas itself */
 
        canvas_image.clear ();
        canvas_image = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, a.get_width(), a.get_height());
 #endif
+#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE
+       }
+#endif
 }
 
 /** Handler for GDK expose events.
@@ -769,7 +779,19 @@ GtkCanvas::on_size_allocate (Gtk::Allocation& a)
 bool
 GtkCanvas::on_expose_event (GdkEventExpose* ev)
 {
-#ifdef USE_CAIRO_IMAGE_SURFACE
+#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE
+       Cairo::RefPtr<Cairo::Context> draw_context;
+       Cairo::RefPtr<Cairo::Context> window_context;
+       if (getenv("ARDOUR_IMAGE_SURFACE")) {
+               if (!canvas_image) {
+                       canvas_image = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, get_width(), get_height());
+               }
+               draw_context = Cairo::Context::create (canvas_image);
+               window_context = get_window()->create_cairo_context ();
+       } else {
+               draw_context = get_window()->create_cairo_context ();
+       }
+#elif defined USE_CAIRO_IMAGE_SURFACE
        if (!canvas_image) {
                canvas_image = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, get_width(), get_height());
        }
@@ -803,7 +825,10 @@ GtkCanvas::on_expose_event (GdkEventExpose* ev)
                        g_free (rects);
                }
                
-#ifdef USE_CAIRO_IMAGE_SURFACE
+#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE
+       if (getenv("ARDOUR_IMAGE_SURFACE")) {
+#endif
+#if defined USE_CAIRO_IMAGE_SURFACE || defined OPTIONAL_CAIRO_IMAGE_SURFACE
        /* now blit our private surface back to the GDK one */
 
        window_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height);
@@ -812,6 +837,9 @@ GtkCanvas::on_expose_event (GdkEventExpose* ev)
        window_context->set_operator (Cairo::OPERATOR_SOURCE);
        window_context->paint ();
 #endif
+#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE
+       }
+#endif
 
        return true;
 }
@@ -1156,7 +1184,7 @@ GtkCanvas::show_tooltip ()
                tooltip_label = manage (new Gtk::Label);
                tooltip_label->show ();
                tooltip_window->add (*tooltip_label);
-               tooltip_window->set_border_width (6);
+               tooltip_window->set_border_width (1);
                tooltip_window->set_name ("tooltip");
        }
 
@@ -1189,7 +1217,8 @@ GtkCanvas::show_tooltip ()
         * to get it away from the pointer.
         */
 
-       tooltip_window_origin.x += 20;
+       tooltip_window_origin.x += 30;
+       tooltip_window_origin.y += 45;
 
        /* move the tooltip window into position */
 
@@ -1211,6 +1240,11 @@ GtkCanvas::hide_tooltip ()
 
        if (tooltip_window) {
                tooltip_window->hide ();
+
+               // Delete the tooltip window so it'll get re-created
+               // (i.e. properly re-sized) on the next usage.
+               delete tooltip_window;
+               tooltip_window = NULL;
        }
 }