diff options
| author | David Robillard <d@drobilla.net> | 2007-03-19 07:07:38 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-03-19 07:07:38 +0000 |
| commit | 0e705129fd420140b1711133fc4d3b9ac4b616d8 (patch) | |
| tree | 193b0c595b682bacb8f7c1670202bb211ec4937f /gtk2_ardour/time_axis_view.cc | |
| parent | 99904735e066804358f1d0bd138a84f1e9ecda91 (diff) | |
Merged with trunk R1622.
git-svn-id: svn://localhost/ardour2/branches/midi@1623 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/time_axis_view.cc')
| -rw-r--r-- | gtk2_ardour/time_axis_view.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index a0267d7e86..dbc5efc462 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)) || |