Make font size a property of Style

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

diff --git a/source/text.cpp b/source/text.cpp
index c173a8a5edb3a603351661dca1f22347270d85b6..a4ec22668537946a6d72e4ded8c0adbfdaadfb43 100644 (file)
--- a/source/text.cpp
+++ b/source/text.cpp
@@ -1,12 +1,6 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2009-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/gl/immediate.h>
 #include <msp/gl/matrix.h>
+#include <msp/gl/texture2d.h>
 #include "style.h"
 #include "text.h"
 
@@ -42,9 +36,12 @@ void Text::set_style(const Style *s)
 {
        style = s;
 
-       float font_size = style->get_font()->get_default_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);
+       if(style)
+       {
+               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);
+       }
 }
 
 unsigned Text::get_width() const
@@ -57,8 +54,11 @@ unsigned Text::get_width() const
 
 unsigned Text::get_height() const
 {
+       if(!style)
+               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;
@@ -109,7 +109,7 @@ void Text::insert(unsigned pos, const string &s)
 unsigned Text::get_line_length(unsigned i) const
 {
        if(i>=lines.size())
-               throw InvalidParameterValue("Invalid line number");
+               throw out_of_range("Text::get_line_length");
        return lines[i].length;
 }
 
@@ -158,9 +158,10 @@ Geometry Text::coords_to_geometry(const Part &part, const Geometry &parent, unsi
 
 void Text::render(const Part &part, const Geometry &parent, unsigned first_row) const
 {
-       if(lines.empty())
+       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);
@@ -168,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);
 }
 
@@ -180,7 +183,7 @@ Text &Text::operator=(const string &t)
 void Text::find_lines()
 {
        lines.clear();
-       float font_size = style->get_font()->get_default_size();
+       float font_size = (style ? style->get_font_size() : 1);
        string::size_type start = 0;
        while(1)
        {
@@ -189,7 +192,12 @@ void Text::find_lines()
                Line line;
                line.start = start;
                line.length = (newline==string::npos ? text.size() : newline)-start;
-               line.width = static_cast<unsigned>(style->get_font()->get_string_width(text.substr(line.start, line.length))*font_size);
+               line.width = line.length;
+               if(style)
+               {
+                       string str = text.substr(line.start, line.length);
+                       line.width = static_cast<unsigned>(style->get_font()->get_string_width(str)*font_size);
+               }
                lines.push_back(line);
 
                if(newline==string::npos)
@@ -201,15 +209,18 @@ void Text::find_lines()
 template<typename T, void (Text::*func)(unsigned, const Geometry &, T &) const>
 void Text::process_lines(const Part &part, const Geometry &parent, unsigned first_row, T &data) const
 {
+       if(!style)
+               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;
        int y_offset = static_cast<int>(-font->get_descent()*font_size);
 
        const Sides &margin = part.get_margin();
-       unsigned n_lines = max(min(lines.size(), (parent.h-margin.top-margin.bottom)/line_spacing), 1U);
+       unsigned n_lines = min(lines.size(), max((parent.h-margin.top-margin.bottom)/line_spacing, 1U));
        first_row = min(first_row, lines.size()-n_lines);
 
        for(unsigned i=0; i<n_lines; ++i)
@@ -233,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
@@ -246,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());
        }
 }