X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.cpp;h=aa5ad8030efe6be34a08218932e4c0d284d2a98f;hb=b61361ee9f1f049fb3c22a38f68c757c7ca54cd0;hp=1b465120a31d5b5b50ff699969c646aaa5f625a8;hpb=70c409d5ae005b96f89d47da49f868e65b4e5734;p=libs%2Fgltk.git diff --git a/source/text.cpp b/source/text.cpp index 1b46512..aa5ad80 100644 --- a/source/text.cpp +++ b/source/text.cpp @@ -1,12 +1,7 @@ -/* $Id$ - -This file is part of libmspgltk -Copyright © 2009-2010 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - -#include #include +#include +#include +#include "partcache.h" #include "style.h" #include "text.h" @@ -42,9 +37,13 @@ void Text::set_style(const Style *s) { style = s; - float font_size = style->get_font()->get_default_size(); - for(vector::iterator i=lines.begin(); i!=lines.end(); ++i) - i->width = static_cast(style->get_font()->get_string_width(text.substr(i->start, i->length))*font_size); + if(style) + { + const GL::Font &font = style->get_font(); + float font_size = style->get_font_size(); + for(vector::iterator i=lines.begin(); i!=lines.end(); ++i) + i->width = static_cast(font.get_string_width(text.substr(i->start, i->length))*font_size); + } } unsigned Text::get_width() const @@ -57,13 +56,23 @@ unsigned Text::get_width() const unsigned Text::get_height() const { - const GL::Font *font = style->get_font(); - float font_size = font->get_default_size(); - unsigned line_height = static_cast((font->get_ascent()-font->get_descent())*font_size); + if(!style) + return lines.size(); + + const GL::Font &font = style->get_font(); + float font_size = style->get_font_size(); + unsigned line_height = static_cast((font.get_ascent()-font.get_descent())*font_size); unsigned line_spacing = line_height*6/5; return line_height+(lines.size()-1)*line_spacing; } +void Text::autosize(const Part &part, Geometry &geom) const +{ + const Sides &margin = part.get_margin(); + geom.w = max(geom.w, get_width()+margin.left+margin.right); + geom.h = max(geom.h, get_height()+margin.top+margin.bottom); +} + void Text::set(const string &t) { text = t; @@ -109,7 +118,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; } @@ -156,19 +165,24 @@ Geometry Text::coords_to_geometry(const Part &part, const Geometry &parent, unsi return data.result; } -void Text::render(const Part &part, const Geometry &parent, unsigned first_row) const +void Text::build(const Part &part, State state, const Geometry &parent, PartCache &cache) const { - if(lines.empty()) + build(part, state, parent, 0, cache); +} + +void Text::build(const Part &part, State state, const Geometry &parent, unsigned first_row, PartCache &cache) const +{ + if(!style || lines.empty()) return; - 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); + const GL::Font &font = style->get_font(); + GL::MeshBuilder bld(cache.create_mesh(part, font.get_texture())); + bld.color(style->get_font_color(state)); RenderData data; - data.bld = &imm; + data.bld = &bld; - process_lines(part, parent, first_row, data); + process_lines(part, parent, first_row, data); } Text &Text::operator=(const string &t) @@ -180,7 +194,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 +203,12 @@ void Text::find_lines() Line line; line.start = start; line.length = (newline==string::npos ? text.size() : newline)-start; - line.width = static_cast(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(style->get_font().get_string_width(str)*font_size); + } lines.push_back(line); if(newline==string::npos) @@ -201,16 +220,19 @@ void Text::find_lines() template void Text::process_lines(const Part &part, const Geometry &parent, unsigned first_row, T &data) const { - const GL::Font *font = style->get_font(); - float font_size = font->get_default_size(); - unsigned line_height = static_cast((font->get_ascent()-font->get_descent())*font_size); + if(!style) + return; + + const GL::Font &font = style->get_font(); + float font_size = style->get_font_size(); + unsigned line_height = static_cast((font.get_ascent()-font.get_descent())*font_size); unsigned line_spacing = static_cast(font_size*6/5); unsigned height = line_height+(lines.size()-1)*line_spacing; - int y_offset = static_cast(-font->get_descent()*font_size); + int y_offset = static_cast(-font.get_descent()*font_size); const Sides &margin = part.get_margin(); - unsigned n_lines = min(lines.size(), (parent.h-margin.top-margin.bottom)/line_spacing); - first_row = min(first_row, lines.size()-n_lines); + 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; iget_font(); - GL::PushMatrix _pushm; - GL::translate(rgeom.x, rgeom.y, 0); - GL::scale_uniform(font->get_default_size()); + GL::MatrixStack::Push _pushm(data.bld->matrix()); + data.bld->matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0); + data.bld->matrix() *= GL::Matrix::scaling(style->get_font_size()); - font->draw_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(font->get_string_width(text.substr(line.start, data.col))*font->get_default_size()); + data.result.x += static_cast(w*style->get_font_size()); } }