Style update: add spaces around assignments

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

diff --git a/source/text.cpp b/source/text.cpp
index d18d7b5ba6c03fc233026afd178220d30b2babe0..5fc546c21dfe30a0c2eb9eb30662703490bf0c7e 100644 (file)
--- a/source/text.cpp
+++ b/source/text.cpp
@@ -29,31 +29,31 @@ void Text::set_style(const Style *s)
 {
        style = s;
 
-       float font_size=style->get_font()->get_default_size();
+       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);
+               i->width = static_cast<unsigned>(style->get_font()->get_string_width(text.substr(i->start, i->length))*font_size);
 }
 
 unsigned Text::get_width() const
 {
-       unsigned width=0;
+       unsigned width = 0;
        for(vector<Line>::const_iterator i=lines.begin(); i!=lines.end(); ++i)
-               width=max(width, i->width);
+               width = max(width, i->width);
        return width;
 }
 
 unsigned Text::get_height() const
 {
-       const GL::Font *font=style->get_font();
-       float font_size=font->get_default_size();
-       unsigned line_height=static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
-       unsigned line_spacing=line_height*6/5;
+       const GL::Font *font = style->get_font();
+       float font_size = font->get_default_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;
 }
 
 void Text::set(const string &t)
 {
-       text=t;
+       text = t;
        find_lines();
 }
 
@@ -68,10 +68,10 @@ void Text::erase(unsigned pos, unsigned len)
                find_lines();
        else
        {
-               i->length-=len;
+               i->length -= len;
 
                for(++i; i!=lines.end(); ++i)
-                       i->start-=len;
+                       i->start -= len;
        }
 }
 
@@ -86,10 +86,10 @@ void Text::insert(unsigned pos, const string &s)
                vector<Line>::iterator i;
                for(i=lines.begin(); (i!=lines.end() && i->start+i->length<pos); ++i) ;
 
-               i->length+=s.size();
+               i->length += s.size();
 
                for(++i; i!=lines.end(); ++i)
-                       i->start+=s.size();
+                       i->start += s.size();
        }
 }
 
@@ -104,16 +104,16 @@ void Text::offset_to_coords(unsigned offs, unsigned &row, unsigned &col) const
 {
        if(lines.empty())
        {
-               row=0;
-               col=0;
+               row = 0;
+               col = 0;
                return;
        }
 
        for(unsigned i=0; i<lines.size(); ++i)
                if(offs>=lines[i].start && offs<=lines[i].start+lines[i].length)
                {
-                       row=i;
-                       col=offs-lines[i].start;
+                       row = i;
+                       col = offs-lines[i].start;
                        return;
                }
 }
@@ -129,23 +129,23 @@ unsigned Text::coords_to_offset(unsigned row, unsigned col) const
 Geometry Text::coords_to_geometry(unsigned row, unsigned col) const
 {
        if(row>=lines.size())
-               row=lines.size()-1;
-       const Line &line=lines[row];
+               row = lines.size()-1;
+       const Line &line = lines[row];
        if(col>line.length)
-               col=line.length;
+               col = line.length;
 
-       const GL::Font *font=style->get_font();
-       float font_size=font->get_default_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 GL::Font *font = style->get_font();
+       float font_size = font->get_default_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);
 
        Geometry geom;
-       geom.w=line.width;
-       geom.h=height;
-       geom.x=static_cast<unsigned>(font->get_string_width(text.substr(line.start, col))*font_size);
-       geom.y=(lines.size()-1-row)*line_spacing+y_offset;
+       geom.w = line.width;
+       geom.h = height;
+       geom.x = static_cast<unsigned>(font->get_string_width(text.substr(line.start, col))*font_size);
+       geom.y = (lines.size()-1-row)*line_spacing+y_offset;
 
        return geom;
 }
@@ -155,24 +155,24 @@ void Text::render(const Part &part, const Geometry &geom) const
        if(lines.empty())
                return;
 
-       const GL::Font *font=style->get_font();
-       float font_size=font->get_default_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 GL::Font *font = style->get_font();
+       float font_size = font->get_default_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 GL::Color &color=style->get_font_color();
+       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);
        for(unsigned i=0; i<lines.size(); ++i)
        {
-               const Line &line=lines[i];
+               const Line &line = lines[i];
 
                Geometry rgeom;
-               rgeom.w=line.width;
-               rgeom.h=height;
-               rgeom.y=(lines.size()-1-i)*line_spacing+y_offset;
+               rgeom.w = line.width;
+               rgeom.h = height;
+               rgeom.y = (lines.size()-1-i)*line_spacing+y_offset;
                part.get_alignment().apply(rgeom, geom, part.get_margin());
 
                GL::push_matrix();
@@ -194,21 +194,21 @@ Text &Text::operator=(const string &t)
 void Text::find_lines()
 {
        lines.clear();
-       float font_size=style->get_font()->get_default_size();
-       string::size_type start=0;
+       float font_size = style->get_font()->get_default_size();
+       string::size_type start = 0;
        while(1)
        {
-               string::size_type newline=text.find('\n', start);
+               string::size_type newline = text.find('\n', start);
 
                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.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);
                lines.push_back(line);
 
                if(newline==string::npos)
                        break;
-               start=newline+1;
+               start = newline+1;
        }
 }