Use PBD::to_string from pbd/string_convert.h in MeterStrip class

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

diff --git a/libs/canvas/canvas.cc b/libs/canvas/canvas.cc
index cdd2fbfeee8c240a1c092dda706886bd1baf0422..fb06b06b975eb49eca34793a18cfee07c125742f 100644 (file)
--- a/libs/canvas/canvas.cc
+++ b/libs/canvas/canvas.cc
@@ -46,7 +46,7 @@
 
 #ifdef __APPLE__
 #include <gdk/gdk.h>
-#include "canvas/nsglview.h"
+#include "gtkmm2ext/nsglview.h"
 #endif
 
 using namespace std;
@@ -401,11 +401,15 @@ GtkCanvas::GtkCanvas ()
        add_events (Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::POINTER_MOTION_MASK |
                    Gdk::SCROLL_MASK | Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK |
                    Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK);
+}
 
+void
+GtkCanvas::use_nsglview ()
+{
+       assert (!_nsglview);
+       assert (!is_realized());
 #ifdef ARDOUR_CANVAS_NSVIEW_TAG // patched gdkquartz.h
-# ifndef __ppc__ // would need to flip RGBA <> RGBA
-       _nsglview = nsglview_create (this);
-# endif
+       _nsglview = Gtkmm2ext::nsglview_create (this);
 #endif
 }
 
@@ -725,6 +729,15 @@ GtkCanvas::deliver_event (GdkEvent* event)
        return false;
 }
 
+void
+GtkCanvas::item_shown_or_hidden (Item* item)
+{
+       if (item == current_tooltip_item) {
+               stop_tooltip_timeout ();
+       }
+       Canvas::item_shown_or_hidden (item);
+}
+
 /** Called when an item is being destroyed.
  *  @param item Item being destroyed.
  *  @param bounding_box Last known bounding box of the item.
@@ -773,7 +786,7 @@ GtkCanvas::on_realize ()
        Gtk::EventBox::on_realize();
 #ifdef __APPLE__
        if (_nsglview) {
-               nsglview_overlay (_nsglview, get_window()->gobj());
+               Gtkmm2ext::nsglview_overlay (_nsglview, get_window()->gobj());
        }
 #endif
 }
@@ -802,7 +815,7 @@ GtkCanvas::on_size_allocate (Gtk::Allocation& a)
                                GTK_WIDGET(gobj()),
                                GTK_WIDGET(get_toplevel()->gobj()),
                                0, 0, &xx, &yy);
-               nsglview_resize (_nsglview, xx, yy, a.get_width(), a.get_height());
+               Gtkmm2ext::nsglview_resize (_nsglview, xx, yy, a.get_width(), a.get_height());
        }
 #endif
 
@@ -820,7 +833,7 @@ GtkCanvas::on_expose_event (GdkEventExpose* ev)
        }
 #ifdef __APPLE__
        if (_nsglview) {
-               nsglview_queue_draw (_nsglview, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
+               Gtkmm2ext::nsglview_queue_draw (_nsglview, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
                return true;
        }
 #endif
@@ -878,7 +891,7 @@ GtkCanvas::on_expose_event (GdkEventExpose* ev)
        /* render canvas */
        if ( _single_exposure ) {
 
-               render (Rect (ev->area.x, ev->area.y, ev->area.x + ev->area.width, ev->area.y + ev->area.height), draw_context);
+               Canvas::render (Rect (ev->area.x, ev->area.y, ev->area.x + ev->area.width, ev->area.y + ev->area.height), draw_context);
 
        } else {
                GdkRectangle* rects;
@@ -887,7 +900,7 @@ GtkCanvas::on_expose_event (GdkEventExpose* ev)
                gdk_region_get_rectangles (ev->region, &rects, &nrects);
                for (gint n = 0; n < nrects; ++n) {
                        draw_context->set_identity_matrix();  //reset the cairo matrix, just in case someone left it transformed after drawing ( cough )
-                       render (Rect (rects[n].x, rects[n].y, rects[n].x + rects[n].width, rects[n].y + rects[n].height), draw_context);
+                       Canvas::render (Rect (rects[n].x, rects[n].y, rects[n].x + rects[n].width, rects[n].y + rects[n].height), draw_context);
                }
                g_free (rects);
        }
@@ -1111,6 +1124,36 @@ GtkCanvas::on_leave_notify_event (GdkEventCrossing* ev)
        return true;
 }
 
+void
+GtkCanvas::on_map ()
+{
+       Gtk::EventBox::on_map();
+#ifdef __APPLE__
+       if (_nsglview) {
+               Gtkmm2ext::nsglview_set_visible (_nsglview, true);
+               Gtk::Allocation a = get_allocation();
+               gint xx, yy;
+               gtk_widget_translate_coordinates(
+                               GTK_WIDGET(gobj()),
+                               GTK_WIDGET(get_toplevel()->gobj()),
+                               0, 0, &xx, &yy);
+               Gtkmm2ext::nsglview_resize (_nsglview, xx, yy, a.get_width(), a.get_height());
+       }
+#endif
+}
+
+void
+GtkCanvas::on_unmap ()
+{
+       stop_tooltip_timeout ();
+       Gtk::EventBox::on_unmap();
+#ifdef __APPLE__
+       if (_nsglview) {
+               Gtkmm2ext::nsglview_set_visible (_nsglview, false);
+       }
+#endif
+}
+
 /** Called to request a redraw of our canvas.
  *  @param area Area to redraw, in window coordinates.
  */