mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-26 00:17:49 +01:00
Use events from gtk trunk, update immediately on scroll for osx as well.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3775 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
a31775baf1
commit
a868e7b260
2 changed files with 4 additions and 6 deletions
|
|
@ -844,10 +844,8 @@ Editor::scroll_canvas_vertically ()
|
|||
_trackview_group->move (0, -y_delta);
|
||||
_region_motion_group->move (0, -y_delta);
|
||||
|
||||
#ifndef GTKOSX
|
||||
/* required to keep the controls_layout in lock step with the canvas group */
|
||||
track_canvas->update_now ();
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -396,7 +396,7 @@ set_color (Gdk::Color& c, int rgb)
|
|||
c.set_rgb((rgb >> 16)*256, ((rgb & 0xff00) >> 8)*256, (rgb & 0xff)*256);
|
||||
}
|
||||
|
||||
#ifdef GTKOSX
|
||||
#ifdef GTKOSX_ARDOUR_EVENTS_PATCH
|
||||
extern "C" {
|
||||
gboolean gdk_quartz_possibly_forward (GdkEvent*);
|
||||
}
|
||||
|
|
@ -473,7 +473,7 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
|
|||
return true;
|
||||
}
|
||||
|
||||
#ifdef GTKOSX
|
||||
#ifdef GTKOSX_ARDOUR_EVENTS_PATCH
|
||||
int oldval = ev->keyval;
|
||||
ev->keyval = fakekey;
|
||||
if (gdk_quartz_possibly_forward ((GdkEvent*) ev)) {
|
||||
|
|
@ -497,7 +497,7 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
|
|||
cerr << "\tactivate, then propagate\n";
|
||||
}
|
||||
#endif
|
||||
#ifdef GTKOSX
|
||||
#ifdef GTKOSX_ARDOUR_EVENTS_PATCH
|
||||
if (gdk_quartz_possibly_forward ((GdkEvent*) ev)) {
|
||||
return true;
|
||||
}
|
||||
|
|
@ -532,7 +532,7 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
|
|||
cerr << "\tpropagation didn't handle, so activate\n";
|
||||
}
|
||||
#endif
|
||||
#ifdef GTKOSX
|
||||
#ifdef GTKOSX_ARDOUR_EVENTS_PATCH
|
||||
if (gdk_quartz_possibly_forward ((GdkEvent*) ev)) {
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue