smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-21 12:55:57 +01:00
Code Issues Projects Releases Wiki Activity

final part of robsch's visual state patch

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5698 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-10-01 15:48:48 +00:00
parent 72bfc14a35
commit c01e920f15
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/editor_ops.cc
View file

@ -6238,10 +6238,8 @@ Editor::goto_visual_state (uint32_t n)
void
Editor::start_visual_state_op (uint32_t n)
{
cerr << "Start visual op\n";
if (visual_state_op_connection.empty()) {
visual_state_op_connection = Glib::signal_timeout().connect (bind (mem_fun (*this, &Editor::end_visual_state_op), n), 1000);
cerr << "\tqueued new timeout\n";
}
}
@ -6249,11 +6247,13 @@ void
Editor::cancel_visual_state_op (uint32_t n)
{
if (!visual_state_op_connection.empty()) {
cerr << "cancel visual op, time to goto\n";
visual_state_op_connection.disconnect();
goto_visual_state (n);
} else {
cerr << "cancel visual op, do nothing\n";
//we land here if called from the menu OR if end_visual_state_op has been called
//so check if we are already in visual state n
// XXX not yet checking it at all, but redoing does not hurt
goto_visual_state (n);
}
}

2
gtk2_ardour/keyboard.cc
View file

@ -233,7 +233,7 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event)
const AccelKey& ak (k->first);
if (keyval == ak.get_key() && (Gdk::ModifierType)(event->state | Gdk::RELEASE_MASK) == ak.get_mod()) {
if (keyval == ak.get_key() && (Gdk::ModifierType)((event->state & Keyboard::RelevantModifierKeyMask)| Gdk::RELEASE_MASK) == ak.get_mod()) {
ret = true;
break;
}