X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.cpp;h=1d7a7930dc4bc58c695e8d2082fb5895e9598f66;hb=8d09cdc5e642af9a2e1210ce708790c5b41cb585;hp=c6fe129fc405ab4c61aa34b3c088a784c9bf3f03;hpb=c1faa54a3218b53757b8b55de0ff8aa64412253b;p=libs%2Fgltk.git diff --git a/source/text.cpp b/source/text.cpp index c6fe129..1d7a793 100644 --- a/source/text.cpp +++ b/source/text.cpp @@ -1,5 +1,7 @@ -#include #include +#include +#include +#include "partcache.h" #include "style.h" #include "text.h" @@ -37,9 +39,10 @@ void Text::set_style(const Style *s) if(style) { - float font_size = style->get_font()->get_default_size(); + 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(style->get_font()->get_string_width(text.substr(i->start, i->length))*font_size); + i->width = static_cast(font.get_string_width(text.substr(i->start, i->length))*font_size); } } @@ -56,13 +59,20 @@ unsigned Text::get_height() const if(!style) return lines.size(); - 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); + 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; @@ -150,24 +160,29 @@ Geometry Text::coords_to_geometry(const Part &part, const Geometry &parent, unsi data.row = row; data.col = col; - process_lines(part, parent, first_row, data); + process_lines(part, parent, first_row, &Text::coords_to_geom_line, data); 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 +{ + 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, &Text::build_line, data); } Text &Text::operator=(const string &t) @@ -179,7 +194,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) { @@ -192,7 +207,7 @@ void Text::find_lines() if(style) { string str = text.substr(line.start, line.length); - line.width = static_cast(style->get_font()->get_string_width(str)*font_size); + line.width = static_cast(style->get_font().get_string_width(str)*font_size); } lines.push_back(line); @@ -202,22 +217,23 @@ void Text::find_lines() } } -template -void Text::process_lines(const Part &part, const Geometry &parent, unsigned first_row, T &data) const +template +void Text::process_lines(const Part &part, const Geometry &parent, unsigned first_row, void (Text::*func)(unsigned, const Geometry &, T &) const, T &data) const { if(!style) return; - 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); + 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(), max((parent.h-margin.top-margin.bottom)/line_spacing, 1U)); - first_row = min(first_row, lines.size()-n_lines); + unsigned fit_height = parent.h-margin.top-margin.bottom+line_spacing-line_height; + unsigned n_lines = min(lines.size(), max(fit_height/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()); } }