Changeset 9624 in orxonox.OLD for branches/proxy/src/lib/gui

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/lib/gui/gl

Files:

• glgui_text.cc (modified) (2 diffs)
• glgui_text.h (modified) (1 diff)
• glgui_widget.cc (modified) (1 diff)
• glgui_widget.h (modified) (1 diff)

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

@@ -101 +101 @@
   {
     this->_text.clear();
-    this->changedText();
+    this->resize();
   }
+
 
   /**
@@ -114 +115 @@
     this->setFrontColor(_changedTextColor, true);
     this->textChanged.emit(this->_text.text());
+  }
+
+  void GLGuiText::setTextSize(float size)
+  {
+    this->_text.setSize(size);
+    this->changedText();
+  }
+
+  void GLGuiText::setFont(const Font& font)
+  {
+    GLGuiWidget::setFont(font);
+    this->_text.setFont(font);
   }
 

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

@@ -31 +31 @@
     void clear();
 
+    void setTextSize(float size);
+    virtual void setFont(const Font& font);
     void setChangedTextColor(const Color& color);
 

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

@@ -779 +779 @@
   void GLGuiWidget::setFont(const std::string& fontName, unsigned int renderSize)
   {
-    this->_font = Font(fontName, renderSize);
+    this->setFont(Font(fontName, renderSize));
   }
 

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

@@ -206 +206 @@
     void setFeaturePositionS(const std::string& featurePosition);
 
-    void setFont(const Font& font);
+    virtual void setFont(const Font& font);
     void setFont(const std::string& fontName, unsigned int renderSize = FONT_DEFAULT_RENDER_SIZE);