Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9640 in orxonox.OLD for branches


Ignore:
Timestamp:
Jul 31, 2006, 10:01:36 AM (18 years ago)
Author:
bensch
Message:

orxonox/proxy: way faster update, so update will be made automatically

Location:
branches/proxy/src/lib
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/proxy/src/lib/gui/gl/glgui_widget.cc

    r9624 r9640  
    8787  GLGuiWidget* GLGuiWidget::_mouseFocused = NULL;
    8888  GLGuiWidget* GLGuiWidget::_inputGrabber = NULL;
    89 
     89  Font* GLGuiWidget::_defaultFont = NULL;
    9090
    9191
     
    103103    this->_state = OrxGui::Normal;
    104104
    105 
    106     this->_font = Font(ResourceManager::getInstance()->getDataDir() + "/fonts/final_frontier.ttf", 20);
     105    if(GLGuiWidget::_defaultFont == NULL)
     106      GLGuiWidget::_defaultFont = new Font(ResourceManager::getInstance()->getDataDir() + "/fonts/final_frontier.ttf", 20);
     107
     108    this->_font = *GLGuiWidget::_defaultFont;
    107109    this->resetStyle();
    108110
  • branches/proxy/src/lib/gui/gl/glgui_widget.h

    r9624 r9640  
    326326    Font                           _font;                 //!< The Font used in the current Widget.
    327327
     328    static Font*                   _defaultFont;          //!< The default Font.
    328329
    329330    /// ANIMATION STUFF:
  • branches/proxy/src/lib/network/monitor/network_stats_widget.cc

    r9624 r9640  
    3636  this->setIP(ip);
    3737
    38   this->_name.setFont(Font(ResourceManager::getInstance()->getDataDir() + "/fonts/arial.ttf", 20));
     38  if(_font == NULL)
     39    _font = new Font(ResourceManager::getInstance()->getDataDir() + "/fonts/arial.ttf", 20);
     40
     41  this->_name.setFont(*_font);
    3942  this->_name.setTextSize(15);
    40   this->_ip.setFont(Font(ResourceManager::getInstance()->getDataDir() + "fonts/arial.ttf", 20));
     43  this->_ip.setFont(*_font);
    4144  this->_ip.setTextSize(15);
    4245
     
    5760}
    5861
    59 
     62Font* HostWidget::_font = NULL;
    6063
    6164//======================================================//
  • branches/proxy/src/lib/network/monitor/network_stats_widget.h

    r9618 r9640  
    3939    OrxGui::GLGuiText _ip;             //!< The IP of the proxy server.
    4040    IP                _storedIP;       //!< The ip to compare.
     41
     42    static Font*      _font;
    4143};
    4244
Note: See TracChangeset for help on using the changeset viewer.