smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 19:56:31 +01:00
Code Issues Projects Releases Wiki Activity

Forward un/map events to NSGLView

Browse source
This commit is contained in:
Robin Gareus 2017-03-20 16:31:42 +01:00
parent c0828792f0
commit 60a0b8f645
4 changed files with 64 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

29
libs/canvas/canvas.cc
View file

@ -1111,6 +1111,35 @@ GtkCanvas::on_leave_notify_event (GdkEventCrossing* ev)
return true; 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 ()
{
Gtk::EventBox::on_unmap();
#ifdef __APPLE__
if (_nsglview) {
Gtkmm2ext::nsglview_set_visible (_nsglview, false);
}
#endif
}
/** Called to request a redraw of our canvas. /** Called to request a redraw of our canvas.
* @param area Area to redraw, in window coordinates. * @param area Area to redraw, in window coordinates.
*/ */

2
libs/canvas/canvas/canvas.h
View file

@ -223,6 +223,8 @@ public:
bool on_motion_notify_event (GdkEventMotion *); bool on_motion_notify_event (GdkEventMotion *);
bool on_enter_notify_event (GdkEventCrossing*); bool on_enter_notify_event (GdkEventCrossing*);
bool on_leave_notify_event (GdkEventCrossing*); bool on_leave_notify_event (GdkEventCrossing*);
void on_map();
void on_unmap();
void on_realize (); void on_realize ();

29
libs/gtkmm2ext/cairo_widget.cc
View file

@ -472,6 +472,35 @@ CairoWidget::on_realize ()
#endif #endif
} }
void
CairoWidget::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
CairoWidget::on_unmap ()
{
Gtk::EventBox::on_unmap();
#ifdef __APPLE__
if (_nsglview) {
Gtkmm2ext::nsglview_set_visible (_nsglview, false);
}
#endif
}
void void
CairoWidget::on_state_changed (Gtk::StateType) CairoWidget::on_state_changed (Gtk::StateType)
{ {

2
libs/gtkmm2ext/gtkmm2ext/cairo_widget.h
View file

@ -123,6 +123,8 @@ protected:
void on_realize (); void on_realize ();
bool on_button_press_event (GdkEventButton*); bool on_button_press_event (GdkEventButton*);
Gdk::Color get_parent_bg (); Gdk::Color get_parent_bg ();
void on_map();
void on_unmap();
/* this is an additional virtual "on_..." method. Glibmm does not /* this is an additional virtual "on_..." method. Glibmm does not
provide a direct signal for name changes, so this acts as a proxy. provide a direct signal for name changes, so this acts as a proxy.