Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9624 in orxonox.OLD for branches


Ignore:
Timestamp:
Jul 30, 2006, 10:56:02 PM (18 years ago)
Author:
bensch
Message:

orxonox/proxy: gui with a better font

Location:
branches/proxy/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/proxy/src/Makefile.am

    r9577 r9624  
    4848                lib/graphics/effects/lightning_effect.cc \
    4949                lib/graphics/effects/lense_flare.cc \
    50                 \
    51                 lib/network/monitor/network_stats_widget.cc \
    5250                \
    5351                util/multiplayer_team_deathmatch.cc \

  • branches/proxy/src/lib/gui/gl/glgui_text.cc

    r9406 r9624  
    101101  {
    102102    this->_text.clear();
    103     this->changedText();
     103    this->resize();
    104104  }
     105
    105106
    106107  /**
    … …  
    114115    this->setFrontColor(_changedTextColor, true);
    115116    this->textChanged.emit(this->_text.text());
     117  }
     118
     119  void GLGuiText::setTextSize(float size)
     120  {
     121    this->_text.setSize(size);
     122    this->changedText();
     123  }
     124
     125  void GLGuiText::setFont(const Font& font)
     126  {
     127    GLGuiWidget::setFont(font);
     128    this->_text.setFont(font);
    116129  }
    117130

  • branches/proxy/src/lib/gui/gl/glgui_text.h

    r9406 r9624  
    3131    void clear();
    3232
     33    void setTextSize(float size);
     34    virtual void setFont(const Font& font);
    3335    void setChangedTextColor(const Color& color);
    3436

  • branches/proxy/src/lib/gui/gl/glgui_widget.cc

    r9620 r9624  
    779779  void GLGuiWidget::setFont(const std::string& fontName, unsigned int renderSize)
    780780  {
    781     this->_font = Font(fontName, renderSize);
     781    this->setFont(Font(fontName, renderSize));
    782782  }
    783783

  • branches/proxy/src/lib/gui/gl/glgui_widget.h

    r9622 r9624  
    206206    void setFeaturePositionS(const std::string& featurePosition);
    207207
    208     void setFont(const Font& font);
     208    virtual void setFont(const Font& font);
    209209    void setFont(const std::string& fontName, unsigned int renderSize = FONT_DEFAULT_RENDER_SIZE);
    210210

  • branches/proxy/src/lib/network/monitor/network_stats_widget.cc

    r9623 r9624  
    3636  this->setIP(ip);
    3737
    38   this->_name.setFont(ResourceManager::getInstance()->getDataDir() + "/fonts/arial.ttf");
    39   this->_ip.setFont(ResourceManager::getInstance()->getDataDir() + "fonts/arial.ttf");
     38  this->_name.setFont(Font(ResourceManager::getInstance()->getDataDir() + "/fonts/arial.ttf", 20));
     39  this->_name.setTextSize(15);
     40  this->_ip.setFont(Font(ResourceManager::getInstance()->getDataDir() + "fonts/arial.ttf", 20));
     41  this->_ip.setTextSize(15);
    4042
    4143  this->pack(&this->_name);
Note: See TracChangeset for help on using the changeset viewer.