diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-18 15:35:58 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-18 15:35:58 +0000 |
| commit | 8ad4133d26a098e15c6de984a6a6aff5d9271c24 (patch) | |
| tree | 2f6110558c20ecb743e6900e875f38ed118fcaed /gtk2_ardour/mixer_group_tabs.cc | |
| parent | e5329ca777caea45a754ef1b57e031602c9a61ab (diff) | |
don't cache width & height for CairoWidget; provide option for all CairoWidgets to not draw their backgrounds; provide a static method to allow any (Container, probably) widget to provide background color to a CairoWidget without the requirement that it have its own window; remove existing cursor from clocks; clock text no longer has background attribute set, to correct a mistake in my understanding of pango attributes
git-svn-id: svn://localhost/ardour2/branches/3.0@10673 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_group_tabs.cc')
| -rw-r--r-- | gtk2_ardour/mixer_group_tabs.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc index fa01579f78..2d33b54af3 100644 --- a/gtk2_ardour/mixer_group_tabs.cc +++ b/gtk2_ardour/mixer_group_tabs.cc @@ -89,7 +89,7 @@ MixerGroupTabs::compute_tabs () const void MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const { - double const arc_radius = _height; + double const arc_radius = get_height(); if (tab.group && tab.group->is_active()) { cairo_set_source_rgba (cr, tab.color.get_red_p (), tab.color.get_green_p (), tab.color.get_blue_p (), 1); @@ -97,10 +97,10 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const cairo_set_source_rgba (cr, 1, 1, 1, 0.2); } - cairo_arc (cr, tab.from + arc_radius, _height, arc_radius, M_PI, 3 * M_PI / 2); + cairo_arc (cr, tab.from + arc_radius, get_height(), arc_radius, M_PI, 3 * M_PI / 2); cairo_line_to (cr, tab.to - arc_radius, 0); - cairo_arc (cr, tab.to - arc_radius, _height, arc_radius, 3 * M_PI / 2, 2 * M_PI); - cairo_line_to (cr, tab.from, _height); + cairo_arc (cr, tab.to - arc_radius, get_height(), arc_radius, 3 * M_PI / 2, 2 * M_PI); + cairo_line_to (cr, tab.from, get_height()); cairo_fill (cr); if (tab.group) { @@ -110,7 +110,7 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const cairo_text_extents (cr, tab.group->name().c_str(), &ext); cairo_set_source_rgb (cr, 1, 1, 1); - cairo_move_to (cr, tab.from + (tab.to - tab.from - f.second) / 2, _height - ext.height / 2); + cairo_move_to (cr, tab.from + (tab.to - tab.from - f.second) / 2, get_height() - ext.height / 2); cairo_save (cr); cairo_show_text (cr, f.first.c_str()); cairo_restore (cr); |