smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-07 22:25:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix method hiding in Canvas::Text

Browse source
This commit is contained in:
Paul Davis 2014-11-25 20:44:01 +02:00
parent 019940e3a5
commit c3e0cad199
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/canvas/canvas/text.h
View file

@ -66,9 +66,9 @@ private:
mutable double _width_correction;
double _clamped_width;
void redraw (Cairo::RefPtr<Cairo::Context>) const;
void redraw (Glib::RefPtr<Pango::Context>) const;
void _redraw (Glib::RefPtr<Pango::Layout>) const;
void _redraw (Cairo::RefPtr<Cairo::Context>) const;
void _redraw (Glib::RefPtr<Pango::Context>) const;
void __redraw (Glib::RefPtr<Pango::Layout>) const;
};
}

14
libs/canvas/text.cc
View file

@ -80,7 +80,7 @@ Text::set (string const & text)
}
void
Text::redraw (Cairo::RefPtr<Cairo::Context> context) const
Text::_redraw (Cairo::RefPtr<Cairo::Context> context) const
{
if (_text.empty()) {
return;
@ -88,22 +88,22 @@ Text::redraw (Cairo::RefPtr<Cairo::Context> context) const
Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (context);
_redraw (layout);
__redraw (layout);
}
void
Text::redraw (Glib::RefPtr<Pango::Context> context) const
Text::_redraw (Glib::RefPtr<Pango::Context> context) const
{
if (_text.empty()) {
return;
}
Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (context);
_redraw (layout);
__redraw (layout);
}
void
Text::_redraw (Glib::RefPtr<Pango::Layout> layout) const
Text::__redraw (Glib::RefPtr<Pango::Layout> layout) const
{
#ifdef __APPLE__
if (_width_correction < 0.0) {
@ -184,7 +184,7 @@ Text::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
}
if (_need_redraw) {
redraw (context);
_redraw (context);
}
Rect intersection (i.get());
@ -215,7 +215,7 @@ Text::compute_bounding_box () const
if (_bounding_box_dirty) {
if (_need_redraw || !_image) {
Glib::RefPtr<Pango::Context> context = Glib::wrap (gdk_pango_context_get()); // context now owns C object and will free it
redraw (context);
_redraw (context);
}
_bounding_box = Rect (0, 0, min (_clamped_width, (double) _image->get_width()), _image->get_height());
_bounding_box_dirty = false;