From 4ab33a06c9f8a85b193d7db8bc6ee9b8895aab09 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Wed, 28 Nov 2012 21:45:30 +0200 Subject: [PATCH] Return a reference from Style::get_font Styles always have a font, so the returned value could never be null. --- source/dropdown.cpp | 4 ++-- source/entry.cpp | 2 +- source/list.cpp | 5 +++-- source/style.h | 2 +- source/table.cpp | 8 ++++---- source/text.cpp | 28 +++++++++++++--------------- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/source/dropdown.cpp b/source/dropdown.cpp index d1a7bd7..cab6d91 100644 --- a/source/dropdown.cpp +++ b/source/dropdown.cpp @@ -31,9 +31,9 @@ void Dropdown::autosize() if(const Part *text_part = style->get_part("text")) { const Sides &margin = text_part->get_margin(); - 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((font->get_ascent()-font->get_descent())*font_size); + unsigned line_height = static_cast((font.get_ascent()-font.get_descent())*font_size); geom.h = max(geom.h, line_height+margin.top+margin.bottom); } } diff --git a/source/entry.cpp b/source/entry.cpp index 261cf8b..a0df8cb 100644 --- a/source/entry.cpp +++ b/source/entry.cpp @@ -35,7 +35,7 @@ void Entry::autosize() if(text_part) { const Sides &margin = text_part->get_margin(); - const GL::Font &font = *style->get_font(); + const GL::Font &font = style->get_font(); unsigned en_width = static_cast(font.get_string_width("n")*style->get_font_size()); geom.w = max(geom.w, 10*en_width+margin.left+margin.right); diff --git a/source/list.cpp b/source/list.cpp index e1f39b7..a886118 100644 --- a/source/list.cpp +++ b/source/list.cpp @@ -40,12 +40,13 @@ void List::autosize_rows(unsigned n) if(items_part) { const Sides &margin = items_part->get_margin(); + const GL::Font &font = style->get_font(); float font_size = style->get_font_size(); unsigned max_w = 0; for(vector::iterator i=items.begin(); i!=items.end(); ++i) { - unsigned w = static_cast(style->get_font()->get_string_width(*i)*font_size); + unsigned w = static_cast(font.get_string_width(*i)*font_size); max_w = max(max_w, w); } @@ -222,7 +223,7 @@ void List::on_style_change() items_part = style->get_part("items"); - const GL::Font &font = *style->get_font(); + const GL::Font &font = style->get_font(); row_height = static_cast((font.get_ascent()-font.get_descent())*style->get_font_size()); check_view_range(); diff --git a/source/style.h b/source/style.h index 29c5e34..56f7ac4 100644 --- a/source/style.h +++ b/source/style.h @@ -47,7 +47,7 @@ private: public: Style(Resources &); - const GL::Font *get_font() const { return font; } + const GL::Font &get_font() const { return *font; } unsigned get_font_size() const { return font_size; } const GL::Color &get_font_color() const { return font_color; } const PartSeq &get_parts() const { return parts; } diff --git a/source/table.cpp b/source/table.cpp index 67a93bc..1fe6961 100644 --- a/source/table.cpp +++ b/source/table.cpp @@ -56,7 +56,7 @@ void Table::render_special(const Part &part) const { if(part.get_name()=="cells") { - const GL::Font *const font = style->get_font(); + const GL::Font &font = style->get_font(); float font_size = style->get_font_size(); unsigned free_width = geom.w; @@ -81,15 +81,15 @@ void Table::render_special(const Part &part) const Geometry rgeom; rgeom.x = cgeom.x; rgeom.y = cgeom.y; - rgeom.w = static_cast(font->get_string_width(text)*font_size); - rgeom.h = static_cast((font->get_ascent()-font->get_descent())*font_size); + rgeom.w = static_cast(font.get_string_width(text)*font_size); + rgeom.h = static_cast((font.get_ascent()-font.get_descent())*font_size); part.get_alignment().apply(rgeom, cgeom, part.get_margin()); GL::push_matrix(); GL::translate(rgeom.x, rgeom.y, 0); GL::scale_uniform(font_size); - font->draw_string(text); + font.draw_string(text); GL::pop_matrix(); cgeom.x += cgeom.w; diff --git a/source/text.cpp b/source/text.cpp index a4ec226..0b582c5 100644 --- 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::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); } } @@ -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((font->get_ascent()-font->get_descent())*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; } @@ -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(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(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); @@ -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((font->get_ascent()-font->get_descent())*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)); @@ -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(font->get_string_width(text.substr(line.start, data.col))*style->get_font_size()); + data.result.x += static_cast(w*style->get_font_size()); } } -- 2.45.2