diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-19 08:15:25 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-19 08:15:25 -0400 |
| commit | 9f0012aaaa50eba6606a2612e5c6ad828c4d40cf (patch) | |
| tree | 9baf2a49daadb107c5e2c6726d39dd20b7ed8ac8 /gtk2_ardour/time_axis_view_item.cc | |
| parent | 8491a015e33fd306548c324f32c0225a2bd866e2 (diff) | |
various tweaks to the height/sizing of audioregion views and their waveforms
Diffstat (limited to 'gtk2_ardour/time_axis_view_item.cc')
| -rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 9a0e37708d..94f9b93467 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -209,24 +209,12 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co if (ARDOUR_UI::config()->get_show_name_highlight() && (visibility & ShowNameHighlight)) { - double width; - double start = 1.0; - - if (visibility & FullWidthNameHighlight) { - width = trackview.editor().sample_to_pixel(item_duration); - } else { - width = trackview.editor().sample_to_pixel(item_duration) - 2.0; - } - - name_highlight = new ArdourCanvas::Rectangle (group, - ArdourCanvas::Rect (start, - trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, - width - 2.0, - trackview.current_height() - 1.0)); + /* rectangle size will be set in ::manage_name_highlight() */ + name_highlight = new ArdourCanvas::Rectangle (group); CANVAS_DEBUG_NAME (name_highlight, string_compose ("name highlight for %1", get_item_name())); name_highlight->set_data ("timeaxisviewitem", this); name_highlight->set_outline_what (ArdourCanvas::Rectangle::TOP); - name_highlight->set_outline_color (RGBA_TO_UINT (0,0,0,255)); + name_highlight->set_outline_color (RGBA_TO_UINT (0,0,0,255)); // this should use a theme color } else { name_highlight = 0; @@ -575,7 +563,7 @@ TimeAxisViewItem::set_height (double height) if (frame) { - frame->set_y0 (1.0); + frame->set_y0 (0.0); frame->set_y1 (height); if (frame_handle_start) { @@ -589,7 +577,7 @@ TimeAxisViewItem::set_height (double height) } if (vestigial_frame) { - vestigial_frame->set_y0 (1.0); + vestigial_frame->set_y0 (0.0); vestigial_frame->set_y1 (height); } @@ -618,7 +606,8 @@ TimeAxisViewItem::manage_name_highlight () if (name_highlight && wide_enough_for_name && high_enough_for_name) { name_highlight->show(); - name_highlight->set (ArdourCanvas::Rect (1.0, (double) _height - NAME_HIGHLIGHT_SIZE, _width, (double) _height - 1.0)); + // name_highlight->set_x_position (1.0); + name_highlight->set (ArdourCanvas::Rect (0.0, (double) _height - NAME_HIGHLIGHT_SIZE, _width - 2.0, _height)); } else { name_highlight->hide(); |