summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
11d1b67)
Styles always have a font, so the returned value could never be null.
if(const Part *text_part = style->get_part("text"))
{
const Sides &margin = text_part->get_margin();
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();
float font_size = style->get_font_size();
- unsigned line_height = static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
+ unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font_size);
geom.h = max(geom.h, line_height+margin.top+margin.bottom);
}
}
geom.h = max(geom.h, line_height+margin.top+margin.bottom);
}
}
if(text_part)
{
const Sides &margin = text_part->get_margin();
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<unsigned>(font.get_string_width("n")*style->get_font_size());
geom.w = max(geom.w, 10*en_width+margin.left+margin.right);
unsigned en_width = static_cast<unsigned>(font.get_string_width("n")*style->get_font_size());
geom.w = max(geom.w, 10*en_width+margin.left+margin.right);
if(items_part)
{
const Sides &margin = items_part->get_margin();
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<string>::iterator i=items.begin(); i!=items.end(); ++i)
{
float font_size = style->get_font_size();
unsigned max_w = 0;
for(vector<string>::iterator i=items.begin(); i!=items.end(); ++i)
{
- unsigned w = static_cast<unsigned>(style->get_font()->get_string_width(*i)*font_size);
+ unsigned w = static_cast<unsigned>(font.get_string_width(*i)*font_size);
items_part = style->get_part("items");
items_part = style->get_part("items");
- const GL::Font &font = *style->get_font();
+ const GL::Font &font = style->get_font();
row_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*style->get_font_size());
check_view_range();
row_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*style->get_font_size());
check_view_range();
public:
Style(Resources &);
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; }
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; }
{
if(part.get_name()=="cells")
{
{
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;
float font_size = style->get_font_size();
unsigned free_width = geom.w;
Geometry rgeom;
rgeom.x = cgeom.x;
rgeom.y = cgeom.y;
Geometry rgeom;
rgeom.x = cgeom.x;
rgeom.y = cgeom.y;
- rgeom.w = static_cast<unsigned>(font->get_string_width(text)*font_size);
- rgeom.h = static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
+ rgeom.w = static_cast<unsigned>(font.get_string_width(text)*font_size);
+ rgeom.h = static_cast<unsigned>((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);
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;
GL::pop_matrix();
cgeom.x += cgeom.w;
+ const GL::Font &font = style->get_font();
float font_size = style->get_font_size();
for(vector<Line>::iterator i=lines.begin(); i!=lines.end(); ++i)
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);
+ i->width = static_cast<unsigned>(font.get_string_width(text.substr(i->start, i->length))*font_size);
if(!style)
return lines.size();
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();
float font_size = style->get_font_size();
- unsigned line_height = static_cast<unsigned>((font->get_ascent()-font->get_descent())*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;
}
unsigned line_spacing = line_height*6/5;
return line_height+(lines.size()-1)*line_spacing;
}
if(!style || lines.empty())
return;
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);
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);
RenderData data;
data.bld = &imm;
RenderData data;
data.bld = &imm;
- GL::Bind bind_tex(font->get_texture());
+ GL::Bind bind_tex(font.get_texture());
process_lines<RenderData, &Text::render_line>(part, parent, first_row, data);
}
process_lines<RenderData, &Text::render_line>(part, parent, first_row, data);
}
if(style)
{
string str = text.substr(line.start, 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);
+ line.width = static_cast<unsigned>(style->get_font().get_string_width(str)*font_size);
- const GL::Font *font = style->get_font();
+ const GL::Font &font = style->get_font();
float font_size = style->get_font_size();
float font_size = style->get_font_size();
- unsigned line_height = static_cast<unsigned>((font->get_ascent()-font->get_descent())*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;
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);
+ int y_offset = static_cast<int>(-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));
const Sides &margin = part.get_margin();
unsigned n_lines = min(lines.size(), max((parent.h-margin.top-margin.bottom)/line_spacing, 1U));
void Text::render_line(unsigned i, const Geometry &rgeom, RenderData &data) const
{
const Line &line = lines[i];
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());
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)
{
}
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.x += static_cast<unsigned>(font->get_string_width(text.substr(line.start, data.col))*style->get_font_size());
+ data.result.x += static_cast<unsigned>(w*style->get_font_size());