Changeset 8424 in orxonox.OLD

Timestamp:

Jun 15, 2006, 12:00:55 AM (18 years ago)

Author:

bensch

Message:

gui: new style

Location:

branches/gui/src/lib/gui/gl

Files:

• glgui_inputline.cc (modified) (4 diffs)
• glgui_widget.cc (modified) (2 diffs)

branches/gui/src/lib/gui/gl/glgui_inputline.cc

@@ -22 +22 @@
   /**
    * @brief standard constructor
-  */
+   */
   GLGuiInputLine::GLGuiInputLine ()
   {
@@ -117 +117 @@
 
   /**
-   * Processes an Event.
+   * @brief Processes an Event.
    * @param event The event to be processed
    * @return true if the event was catched.
@@ -163 +163 @@
   void GLGuiInputLine::resize()
   {
-    this->_text.setRelCoor2D(this->borderLeft() + 2.0,this->borderTop() + 2.0);
+    this->_text.setRelCoor2D(this->borderLeft() + 2.0, this->borderTop() + 2.0);
     this->setSize2D( this->_text.getSize2D() + Vector2D(borderLeft() + borderRight() + 4.0, borderTop() + borderBottom() + 4.0));
     GLGuiWidget::resize();
@@ -185 +185 @@
   }
 
-
-  /**
-   * ticks the InputLine
+  /**
+   * @brief ticks the InputLine
    * @param dt the time passed.
    */

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

@@ -66 +66 @@
     this->setVisibility(GLGUI_WIDGET_DEFAULT_VISIBLE);
 
-    this->_backMat.setDiffuse(0.0, 0.0, 0.0);
+    this->_backMat.setDiffuse(1.0, 0.5, 0.4);
+    this->_backMat.setDiffuseMap("gui_element_background.png");
     this->_frontColor.setColor(1.0, 0.0, 0.0);
 
-    this->_borderLeft = 1.0;
+    this->_borderLeft = 10.0;
     this->_borderRight = 1.0;
     this->_borderTop = 1.0;
@@ -250 +251 @@
     this->backMaterial().select();
     this->drawRect(this->backRect());
+    this->backMaterial().unselect();
   }