diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-11-10 19:23:07 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-11-10 19:23:07 +0000 |
| commit | 296a0d7b32722cc772ea0c71ca6a65f316131d78 (patch) | |
| tree | aadc60ae967afda6623c1477844ba391b03eaaa8 /gtk2_ardour | |
| parent | 412d5c3b2b8e4c1bf9ef80bb3aa9ab399bd50461 (diff) | |
remove separators from audio clocks with info blocks below the main clock display
git-svn-id: svn://localhost/ardour2/branches/3.0@13420 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/audio_clock.cc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 5e3ff631f7..3797d1c9c1 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -54,7 +54,7 @@ using Gtkmm2ext::Keyboard; sigc::signal<void> AudioClock::ModeChanged; vector<AudioClock*> AudioClock::clocks; const double AudioClock::info_font_scale_factor = 0.6; -const double AudioClock::separator_height = 2.0; +const double AudioClock::separator_height = 0.0; const double AudioClock::x_leading_padding = 6.0; #define BBT_BAR_CHAR "|" @@ -294,7 +294,11 @@ AudioClock::render (cairo_t* cr) if (_need_bg) { cairo_set_source_rgba (cr, bg_r, bg_g, bg_b, bg_a); if (corner_radius) { - Gtkmm2ext::rounded_rectangle (cr, 0, 0, get_width(), upper_height, corner_radius); + if (_left_layout) { + Gtkmm2ext::rounded_top_half_rectangle (cr, 0, 0, get_width(), upper_height, corner_radius); + } else { + Gtkmm2ext::rounded_rectangle (cr, 0, 0, get_width(), upper_height, corner_radius); + } } else { cairo_rectangle (cr, 0, 0, get_width(), upper_height); } @@ -323,7 +327,7 @@ AudioClock::render (cairo_t* cr) if (_need_bg) { if (corner_radius) { - Gtkmm2ext::rounded_rectangle (cr, 0, upper_height + separator_height, left_rect_width, h, corner_radius); + Gtkmm2ext::rounded_bottom_half_rectangle (cr, 0, upper_height + separator_height, left_rect_width, h, corner_radius); } else { cairo_rectangle (cr, 0, upper_height + separator_height, left_rect_width, h); } @@ -335,9 +339,9 @@ AudioClock::render (cairo_t* cr) if (_need_bg) { if (corner_radius) { - Gtkmm2ext::rounded_rectangle (cr, left_rect_width + separator_height, upper_height + separator_height, - get_width() - separator_height - left_rect_width, h, - corner_radius); + Gtkmm2ext::rounded_bottom_half_rectangle (cr, left_rect_width + separator_height, upper_height + separator_height, + get_width() - separator_height - left_rect_width, h, + corner_radius); } else { cairo_rectangle (cr, left_rect_width + separator_height, upper_height + separator_height, get_width() - separator_height - left_rect_width, h); @@ -371,7 +375,7 @@ AudioClock::render (cairo_t* cr) if (_need_bg) { if (corner_radius) { - Gtkmm2ext::rounded_rectangle (cr, 0, upper_height + separator_height, get_width(), h, corner_radius); + Gtkmm2ext::rounded_bottom_half_rectangle (cr, 0, upper_height + separator_height, get_width(), h, corner_radius); } else { cairo_rectangle (cr, 0, upper_height + separator_height, get_width(), h); } |