Return a reference from Style::get_font

[libs/gltk.git] / source / text.cpp

diff --git a/source/text.cpp b/source/text.cpp
index a4ec22668537946a6d72e4ded8c0adbfdaadfb43..0b582c5e8b6c0eb47b64784eef13fb3182161971 100644 (file)
--- a/source/text.cpp
+++ b/source/text.cpp
@@ -38,9 +38,10 @@ void Text::set_style(const Style *s)
 
        if(style)
        {
+               const GL::Font &font = style->get_font();
                float font_size = style->get_font_size();
                for(vector<Line>::iterator i=lines.begin(); i!=lines.end(); ++i)
-                       i->width = static_cast<unsigned>(style->get_font()->get_string_width(text.substr(i->start, i->length))*font_size);
+                       i->width = static_cast<unsigned>(font.get_string_width(text.substr(i->start, i->length))*font_size);
        }
 }
 
@@ -57,9 +58,9 @@ unsigned Text::get_height() const
        if(!style)
                return lines.size();
 
-       const GL::Font *font = style->get_font();
+       const GL::Font &font = style->get_font();
        float font_size = style->get_font_size();
-       unsigned line_height = static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
+       unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font_size);
        unsigned line_spacing = line_height*6/5;
        return line_height+(lines.size()-1)*line_spacing;
 }
@@ -161,7 +162,7 @@ void Text::render(const Part &part, const Geometry &parent, unsigned first_row)
        if(!style || lines.empty())
                return;
 
-       const GL::Font *font = style->get_font();
+       const GL::Font &font = style->get_font();
        const GL::Color &color = style->get_font_color();
        GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
        imm.color(color.r, color.g, color.b);
@@ -169,7 +170,7 @@ void Text::render(const Part &part, const Geometry &parent, unsigned first_row)
        RenderData data;
        data.bld = &imm;
 
-       GL::Bind bind_tex(font->get_texture());
+       GL::Bind bind_tex(font.get_texture());
 
        process_lines<RenderData, &Text::render_line>(part, parent, first_row, data);
 }
@@ -196,7 +197,7 @@ void Text::find_lines()
                if(style)
                {
                        string str = text.substr(line.start, line.length);
-                       line.width = static_cast<unsigned>(style->get_font()->get_string_width(str)*font_size);
+                       line.width = static_cast<unsigned>(style->get_font().get_string_width(str)*font_size);
                }
                lines.push_back(line);
 
@@ -212,12 +213,12 @@ void Text::process_lines(const Part &part, const Geometry &parent, unsigned firs
        if(!style)
                return;
 
-       const GL::Font *font = style->get_font();
+       const GL::Font &font = style->get_font();
        float font_size = style->get_font_size();
-       unsigned line_height = static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
+       unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font_size);
        unsigned line_spacing = static_cast<unsigned>(font_size*6/5);
        unsigned height = line_height+(lines.size()-1)*line_spacing;
-       int y_offset = static_cast<int>(-font->get_descent()*font_size);
+       int y_offset = static_cast<int>(-font.get_descent()*font_size);
 
        const Sides &margin = part.get_margin();
        unsigned n_lines = min(lines.size(), max((parent.h-margin.top-margin.bottom)/line_spacing, 1U));
@@ -240,24 +241,21 @@ void Text::process_lines(const Part &part, const Geometry &parent, unsigned firs
 void Text::render_line(unsigned i, const Geometry &rgeom, RenderData &data) const
 {
        const Line &line = lines[i];
-       const GL::Font *font = style->get_font();
 
        GL::PushMatrix _pushm;
        GL::translate(rgeom.x, rgeom.y, 0);
        GL::scale_uniform(style->get_font_size());
 
-       font->build_string(text.substr(line.start, line.length), *data.bld);
+       style->get_font().build_string(text.substr(line.start, line.length), *data.bld);
 }
 
 void Text::coords_to_geom_line(unsigned i, const Geometry &rgeom, CoordsToGeomData &data) const
 {
        if(i==data.row)
        {
-               const Line &line = lines[i];
-               const GL::Font *font = style->get_font();
-
+               float w = style->get_font().get_string_width(text.substr(lines[i].start, data.col));
                data.result = rgeom;
-               data.result.x += static_cast<unsigned>(font->get_string_width(text.substr(line.start, data.col))*style->get_font_size());
+               data.result.x += static_cast<unsigned>(w*style->get_font_size());
        }
 }