mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-06 05:35:47 +01:00
don't put NDF/DF in clocks if there is no DF/NDF alternative; make deselect-all and invert-selection operations work properly; fix bug in edit range determination with no selected marker; popup dialog when no range can be determined; add new WINDOW modifier to SConscript to allow different conventions on OS X and linux
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2730 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
ff519d31b4
commit
577f1571f8
10 changed files with 80 additions and 21 deletions
|
|
@ -487,7 +487,7 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
|
|||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!special_handling_of_unmodified_accelerators ||
|
||||
ev->state & (Gdk::MOD1_MASK|
|
||||
Gdk::MOD3_MASK|
|
||||
|
|
@ -495,7 +495,7 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
|
|||
Gdk::MOD5_MASK|
|
||||
Gdk::CONTROL_MASK)) {
|
||||
|
||||
/* no special handling or modifiers in effect: accelerate first */
|
||||
/* no special handling or there are modifiers in effect: accelerate first */
|
||||
|
||||
#ifdef DEBUG_ACCELERATOR_HANDLING
|
||||
if (debug) {
|
||||
|
|
@ -508,12 +508,17 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
|
|||
}
|
||||
#endif
|
||||
if (!gtk_window_activate_key (win, ev)) {
|
||||
#ifdef DEBUG_ACCELERATOR_HANDLING
|
||||
if (debug) {
|
||||
cerr << "\tnot accelerated, now propagate\n";
|
||||
}
|
||||
#endif
|
||||
return gtk_window_propagate_key_event (win, ev);
|
||||
} else {
|
||||
#ifdef DEBUG_ACCELERATOR_HANDLING
|
||||
if (debug) {
|
||||
cerr << "\tnot handled\n";
|
||||
}
|
||||
if (debug) {
|
||||
cerr << "\taccelerated - done.\n";
|
||||
}
|
||||
#endif
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue