summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_regions.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-01-01 20:08:26 +0000
committerCarl Hetherington <carl@carlh.net>2011-01-01 20:08:26 +0000
commit2cd8a5a752b19e2d529e0b52f3fba6824c5558e2 (patch)
tree108b78f13041f05350a9b2ba3f20693910672320 /gtk2_ardour/editor_regions.cc
parentf07af0c990bbc235fc327ebb29a59b71b986ab6d (diff)
Repeat of recent fix to EditorRoutes to improve behaviour when editing names.
git-svn-id: svn://localhost/ardour2/branches/3.0@8407 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_regions.cc')
-rw-r--r--gtk2_ardour/editor_regions.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index 4647104753..357bb7295e 100644
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -206,6 +206,10 @@ EditorRegions::focus_out (GdkEventFocus*)
bool
EditorRegions::enter_notify (GdkEventCrossing* ev)
{
+ if (name_editable) {
+ return true;
+ }
+
/* arm counter so that ::selection_filter() will deny selecting anything for the
next two attempts to change selection status.
*/
@@ -222,7 +226,6 @@ EditorRegions::leave_notify (GdkEventCrossing*)
old_focus = 0;
}
- name_editable = 0;
Keyboard::magic_widget_drop_focus ();
return false;
}