Changeset 8769 in orxonox.OLD for trunk

Timestamp:

Jun 24, 2006, 4:21:52 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Font in Button-Widget used

Location:

trunk/src/lib

Files:

• graphics/text_engine/text.cc (modified) (1 diff)
• gui/gl/glgui_button.cc (modified) (1 diff)
• gui/gl/glgui_widget.cc (modified) (4 diffs)
• gui/gl/glgui_widget.h (modified) (4 diffs)

trunk/src/lib/graphics/text_engine/text.cc

@@ -197 +197 @@
 {
   this->_font = font;
+  this->setupTextWidth();
 }
 

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

@@ -56 +56 @@
     this->setClickable(true);
 
-    this->_label.setFont("fonts/final_frontier.ttf", 20);
+    this->_label.setFont(this->font());
     this->_label.setColor(this->foregroundColor() );
 

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

@@ -98 +98 @@
 
 
-    this->_font = NULL;
+    this->_font = Font("/home/bensch/svn/orxonox/data/fonts/final_frontier.ttf", 20);
+    this->_font.debug();
     this->resetStyle();
 
@@ -329 +330 @@
 
     this->setFeaturePosition(FeatureLeft);
-    this->setFont(NULL);
 
     this->setAnimatedStateChanges(true);
@@ -726 +726 @@
    * @param font the Font.
    */
-  void GLGuiWidget::setFont(Font* font)
+  void GLGuiWidget::setFont(const Font& font)
   {
     this->_font = font;
@@ -735 +735 @@
    * @param fontName the FileName of the Font.
    */
-  void GLGuiWidget::setFont(const std::string& fontName)
-  {
-    //this->font = new Font(fontName);
+  void GLGuiWidget::setFont(const std::string& fontName, unsigned int renderSize)
+  {
+    this->_font = Font(fontName, renderSize);
   }
 

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

@@ -12 +12 @@
 
 #include "material.h"
+#include "font.h"
+
 #include "rect2D.h"
 
 #include "event.h"
 #include "signal_connector.h"
-
-class Font;
 
 namespace OrxGui
@@ -120 +120 @@
     inline FeaturePosition featurePosition() const { return _featurePosition; }
     /** @returns the font */
-    inline const Font* const font() const { return _font; }
+    inline const Font& font() const { return _font; }
     /** @returns true if the Element is Animated */
     inline bool animating() const { return _animating; }
@@ -204 +204 @@
     void setFeaturePositionS(const std::string& featurePosition);
 
-    void setFont(Font* font);
-    void setFont(const std::string& fontName);
+    void setFont(const Font& font);
+    void setFont(const std::string& fontName, unsigned int renderSize);
 
     void setAnimatedStateChanges(bool animated);
@@ -319 +319 @@
 
     FeaturePosition                _featurePosition;      //!< The Position a Feature will be layed at (checkbox(box), slider(text),...)
-    Font*                          _font;                 //!< The Font used in the current Widget.
+    Font                           _font;                 //!< The Font used in the current Widget.