summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2006-07-11 14:15:55 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2006-07-11 14:15:55 +0000
commitc5fbb8234b66ad3595933ced3ac2942237330865 (patch)
tree0926c553644943eafe2784cd1b6cf16b7bad0b99 /gtk2_ardour
parent2161752a1bba3426c1ffbf5c5ceda734d4a48b25 (diff)
fix for playhead/edit cursor having wrong z-order placement; fix fader mouse control
git-svn-id: svn://localhost/ardour2/trunk@676 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_ui.cc5
-rw-r--r--gtk2_ardour/editor_canvas.cc2
-rw-r--r--gtk2_ardour/editor_route_list.cc4
3 files changed, 5 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index ce4a12f330..833dc8512f 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -374,11 +374,9 @@ ARDOUR_UI::finish()
if (session && session->dirty()) {
switch (ask_about_saving_session(_("quit"))) {
case -1:
- cerr << "dialog return -1\n";
return;
break;
case 1:
- cerr << "dialog return +1\n";
/* use the default name */
if (save_state_canfail ("")) {
/* failed - don't quit */
@@ -392,10 +390,7 @@ If you still wish to quit, please use the\n\n\
}
break;
case 0:
- cerr << "dialog return 0\n";
break;
- default:
- cerr << "dialog return other\n";
}
}
Config->save_state();
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 41350a1da4..e8ba2b8a60 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -128,7 +128,7 @@ Editor::initialize_canvas ()
time_line_group = new ArdourCanvas::Group (*track_canvas.root(), 0.0, 0.0);
cursor_group = new ArdourCanvas::Group (*track_canvas.root(), 0.0, 0.0);
-
+
time_canvas.set_name ("EditorTimeCanvas");
time_canvas.add_events (Gdk::POINTER_MOTION_HINT_MASK);
time_canvas.set_flags (CAN_FOCUS);
diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc
index 2e036f5001..95ac358095 100644
--- a/gtk2_ardour/editor_route_list.cc
+++ b/gtk2_ardour/editor_route_list.cc
@@ -263,6 +263,10 @@ Editor::redisplay_route_list ()
}
+ /* make sure the cursors stay on top of every newly added track */
+
+ cursor_group->raise_to_top ();
+
reset_scrolling_region ();
}