Changeset 8619 in orxonox.OLD for trunk/src/lib/gui/gl/glgui_inputline.cc

Timestamp:

Jun 20, 2006, 1:24:11 PM (19 years ago)

Author:

bensch

Message:

trunk: merged the gui-branche back.
merged with command:
svn merge -r8520:HEAD ​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

File:

• trunk/src/lib/gui/gl/glgui_inputline.cc (modified) (7 diffs)

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

@@ -52 +52 @@
     this->_text.setRelCoor2D(4,4);
     this->_text.setFont("fonts/final_frontier.ttf", 20);
-    this->_text.setColor(this->frontColor());
+    this->_text.setLineWidth(400);
+    this->_text.setDotsPosition(LimitedWidthText::Begin);
+    this->_text.setColor(foregroundColor());
     this->_text.setVisibility(false);
     this->resize();
+
+    this->delayNext = 0.0;
+    this->pressedKey = SDLK_FIRST;
+    this->pressedKeyName = SDLK_FIRST;
 
   }
@@ -116 +122 @@
     this->resize();
     this->setFrontColor(Color(1,1,1,1), true);
-    this->setFrontColor(Color(0,1,0,1));
-    emit(this->textChanged(this->_text.getText()));
+    emit(this->textChanged(this->_text.text()));
   }
 
@@ -139 +144 @@
   void GLGuiInputLine::pushEnter()
   {
-    emit(this->enterPushed(this->_text.getText()));
+    emit(this->enterPushed(this->_text.text()));
     if (this->_clearOnEnter)
       this->clear();
@@ -197 +202 @@
   void GLGuiInputLine::resize()
   {
-    this->_text.setRelCoor2D(this->borderLeft(), this->borderTop());
+    this->_text.setRelCoor2D(borderLeft(), borderTop());
     this->setSize2D( this->_text.getSize2D() + Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom()));
     GLGuiWidget::resize();
-/*    this->frontRect().setTopLeft(borderLeft(), borderTop());
-    this->frontRect().setSize(this->getSize2D() - Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom()));*/
+    /*    this->frontRect().setTopLeft(borderLeft(), borderTop());
+        this->frontRect().setSize(this->getSize2D() - Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom()));*/
   }
 
   void GLGuiInputLine::updateFrontColor()
   {
-    this->_text.setColor(this->frontColor());
+    this->_text.setColor(foregroundColor());
   }
 
@@ -228 +233 @@
     if (this->delayNext > 0.0)
       this->delayNext -= dt;
-        else if (this->pressedKey != SDLK_FIRST )
+    else if (this->pressedKey != SDLK_FIRST )
     {
       this->delayNext = GLGuiInputLine::repeatRate;
@@ -237 +242 @@
           break;
         default:
-        {
-          if (likely(this->pressedKey < 127))
-            this->appendCharacter(this->pressedKeyName);
-        }
+          {
+            if (likely(this->pressedKey < 127))
+              this->appendCharacter(this->pressedKeyName);
+          }
       }
     }
@@ -255 +260 @@
     GLGuiWidget::draw();
 
-//     this->frontMaterial().select();
-//     GLGuiWidget::drawRect(this->frontRect());
+    //     this->frontMaterial().select();
+    //     GLGuiWidget::drawRect(this->frontRect());
 
     this->endDraw();