Make font size a property of Style

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

diff --git a/source/text.cpp b/source/text.cpp
index c6fe129fc405ab4c61aa34b3c088a784c9bf3f03..a4ec22668537946a6d72e4ded8c0adbfdaadfb43 100644 (file)
--- a/source/text.cpp
+++ b/source/text.cpp
@@ -1,5 +1,6 @@
 #include <msp/gl/immediate.h>
 #include <msp/gl/matrix.h>
+#include <msp/gl/texture2d.h>
 #include "style.h"
 #include "text.h"
 
@@ -37,7 +38,7 @@ void Text::set_style(const Style *s)
 
        if(style)
        {
-               float font_size = style->get_font()->get_default_size();
+               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);
        }
@@ -57,7 +58,7 @@ unsigned Text::get_height() const
                return lines.size();
 
        const GL::Font *font = style->get_font();
-       float font_size = font->get_default_size();
+       float font_size = style->get_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;
@@ -160,6 +161,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::Color &color = style->get_font_color();
        GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
        imm.color(color.r, color.g, color.b);
@@ -167,6 +169,8 @@ void Text::render(const Part &part, const Geometry &parent, unsigned first_row)
        RenderData data;
        data.bld = &imm;
 
+       GL::Bind bind_tex(font->get_texture());
+
        process_lines<RenderData, &Text::render_line>(part, parent, first_row, data);
 }
 
@@ -179,7 +183,7 @@ Text &Text::operator=(const string &t)
 void Text::find_lines()
 {
        lines.clear();
-       float font_size = (style ? style->get_font()->get_default_size() : 1);
+       float font_size = (style ? style->get_font_size() : 1);
        string::size_type start = 0;
        while(1)
        {
@@ -209,7 +213,7 @@ void Text::process_lines(const Part &part, const Geometry &parent, unsigned firs
                return;
 
        const GL::Font *font = style->get_font();
-       float font_size = font->get_default_size();
+       float font_size = style->get_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;
@@ -240,9 +244,9 @@ void Text::render_line(unsigned i, const Geometry &rgeom, RenderData &data) cons
 
        GL::PushMatrix _pushm;
        GL::translate(rgeom.x, rgeom.y, 0);
-       GL::scale_uniform(font->get_default_size());
+       GL::scale_uniform(style->get_font_size());
 
-       font->draw_string(text.substr(line.start, line.length), *data.bld);
+       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
@@ -253,7 +257,7 @@ void Text::coords_to_geom_line(unsigned i, const Geometry &rgeom, CoordsToGeomDa
                const GL::Font *font = style->get_font();
 
                data.result = rgeom;
-               data.result.x += static_cast<unsigned>(font->get_string_width(text.substr(line.start, data.col))*font->get_default_size());
+               data.result.x += static_cast<unsigned>(font->get_string_width(text.substr(line.start, data.col))*style->get_font_size());
        }
 }