summaryrefslogtreecommitdiff
path: root/gtk2_ardour/time_axis_view.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-03-19 06:53:16 +0000
committerDavid Robillard <d@drobilla.net>2007-03-19 06:53:16 +0000
commit95df1449670a1b58f93021119edbbfd4171a330b (patch)
tree160d1f1b1b5c07320f11a5a36ed90b7fd04bef8c /gtk2_ardour/time_axis_view.cc
parent4601066bb4f213534140287e70e186631b537eb2 (diff)
Editor GUI touchups:
Fixed separator lines between marker "tracks". Fixed track alignment with track controls. Changed track controls bevel to better fit in with canvas. Made selected track controls colour match selected region colour (could maybe use a better colour for both though...). Added frame to time labels to match toolbar. git-svn-id: svn://localhost/ardour2/trunk@1622 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/time_axis_view.cc')
-rw-r--r--gtk2_ardour/time_axis_view.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 2a0087dc2c..95b0002f94 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -147,7 +147,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
controls_frame.add (controls_hbox);
controls_frame.set_name ("TimeAxisViewControlsBaseUnselected");
- controls_frame.set_shadow_type (Gtk::SHADOW_OUT);
+ controls_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
ColorChanged.connect (mem_fun (*this, &TimeAxisView::color_handler));
}
@@ -233,7 +233,7 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent)
if (canvas_item_visible ((*i)->canvas_display)) {
++nth;
- effective_height += (*i)->show_at (y + 1 + effective_height, nth, parent);
+ effective_height += (*i)->show_at (y + effective_height, nth, parent);
}
}
@@ -361,7 +361,7 @@ void
TimeAxisView::set_height_pixels (uint32_t h)
{
height = h;
- controls_frame.set_size_request (-1, height);
+ controls_frame.set_size_request (-1, height + ((order == 0) ? 1 : 0));
if (canvas_item_visible (selection_group)) {
/* resize the selection rect */
@@ -846,7 +846,7 @@ TimeAxisView::touched (double top, double bot)
y_position is the "origin" or "top" of the track.
*/
- double mybot = y_position + height; // XXX need to include Editor::track_spacing;
+ double mybot = y_position + height;
return ((y_position <= bot && y_position >= top) ||
((mybot <= bot) && (top < mybot)) ||