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

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: Font in Button-Widget used

File:

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

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);
   }