Changeset 9640 in orxonox.OLD for branches

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:

• gui/gl/glgui_widget.cc (modified) (2 diffs)
• gui/gl/glgui_widget.h (modified) (1 diff)
• network/monitor/network_stats_widget.cc (modified) (2 diffs)
• network/monitor/network_stats_widget.h (modified) (1 diff)

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

@@ -87 +87 @@
   GLGuiWidget* GLGuiWidget::_mouseFocused = NULL;
   GLGuiWidget* GLGuiWidget::_inputGrabber = NULL;
-
+  Font* GLGuiWidget::_defaultFont = NULL;
 
 
@@ -103 +103 @@
     this->_state = OrxGui::Normal;
 
-
-    this->_font = Font(ResourceManager::getInstance()->getDataDir() + "/fonts/final_frontier.ttf", 20);
+    if(GLGuiWidget::_defaultFont == NULL)
+      GLGuiWidget::_defaultFont = new Font(ResourceManager::getInstance()->getDataDir() + "/fonts/final_frontier.ttf", 20);
+
+    this->_font = *GLGuiWidget::_defaultFont;
     this->resetStyle();
 

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

@@ -326 +326 @@
     Font                           _font;                 //!< The Font used in the current Widget.
 
+    static Font*                   _defaultFont;          //!< The default Font.
 
     /// ANIMATION STUFF:

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

@@ -36 +36 @@
   this->setIP(ip);
 
-  this->_name.setFont(Font(ResourceManager::getInstance()->getDataDir() + "/fonts/arial.ttf", 20));
+  if(_font == NULL)
+    _font = new Font(ResourceManager::getInstance()->getDataDir() + "/fonts/arial.ttf", 20);
+
+  this->_name.setFont(*_font);
   this->_name.setTextSize(15);
-  this->_ip.setFont(Font(ResourceManager::getInstance()->getDataDir() + "fonts/arial.ttf", 20));
+  this->_ip.setFont(*_font);
   this->_ip.setTextSize(15);
 
@@ -57 +60 @@
 }
 
-
+Font* HostWidget::_font = NULL;
 
 //======================================================//

branches/proxy/src/lib/network/monitor/network_stats_widget.h

@@ -39 +39 @@
     OrxGui::GLGuiText _ip;             //!< The IP of the proxy server.
     IP                _storedIP;       //!< The ip to compare.
+
+    static Font*      _font;
 };