Changeset 9656 in orxonox.OLD for trunk/src/lib/gui/gl/glgui_widget.cc

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:

• trunk/src/lib/gui/gl/glgui_widget.cc (modified) (4 diffs)

trunk/src/lib/gui/gl/glgui_widget.cc

@@ -79 +79 @@
     if (this == GLGuiWidget::selected())
       this->unselect();
+
+    if (this->_parent != NULL)
+      this->_parent->removeChildWidget(this);
   }
 
@@ -84 +87 @@
   GLGuiWidget* GLGuiWidget::_mouseFocused = NULL;
   GLGuiWidget* GLGuiWidget::_inputGrabber = NULL;
-
+  Font* GLGuiWidget::_defaultFont = NULL;
 
 
@@ -100 +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();
 
@@ -776 +781 @@
   void GLGuiWidget::setFont(const std::string& fontName, unsigned int renderSize)
   {
-    this->_font = Font(fontName, renderSize);
+    this->setFont(Font(fontName, renderSize));
   }