Changeset 6879

Timestamp:

May 10, 2010, 3:50:27 PM (15 years ago)

Author:

smerkli

Message:

bugfixes, performance improvements.

Location:

code/branches/chat2/src/orxonox

Files:

• ChatInputHandler.cc (modified) (4 diffs)
• ChatInputHandler.h (modified) (1 diff)

code/branches/chat2/src/orxonox/ChatInputHandler.cc

@@ -128 +128 @@
     else
       GUIManager::getInstance().showGUI( "ChatBox-inputonly" );
+
+    this->fullchat = full;
   }
 
@@ -174 +176 @@
     std::string assembled = "$ " + left + "|" + right;
 
-    /* adjust curser position - magic number 5 for font width */
-    sub_adjust_dispoffset( (this->input->getUnclippedInnerRect().getWidth()/6), 
-      cursorpos, assembled.length() );
-    this->input->setProperty( "Text", assembled.substr( disp_offset ) );
-
-    /* reset display offset */
-    disp_offset = 0;
-
-    /* adjust curser position - magic number 5 for font width */
-    sub_adjust_dispoffset( (this->inputonly->getUnclippedInnerRect().getWidth()/6), 
-      cursorpos, assembled.length() );
-    this->inputonly->setProperty( "Text", assembled.substr( disp_offset) );
+    if( this->fullchat )
+    { 
+      /* adjust curser position - magic number 5 for font width */
+      sub_adjust_dispoffset( (this->input->getUnclippedInnerRect().getWidth()/6), 
+        cursorpos, assembled.length() );
+      this->input->setProperty( "Text", assembled.substr( disp_offset ) );
+    }
+    else
+    {
+      /* adjust curser position - magic number 5 for font width */
+      sub_adjust_dispoffset( (this->inputonly->getUnclippedInnerRect().getWidth()/6), 
+        cursorpos, assembled.length() );
+      this->inputonly->setProperty( "Text", assembled.substr( disp_offset) );
+    }
 
     /* reset display offset */
@@ -210 +214 @@
 
     /* d) stop listening to input  */
-    this->deactivate();
+    if( !this->fullchat )
+      this->deactivate();
 
     /* e) create item and add to history */
@@ -240 +245 @@
 
   void ChatInputHandler::exit()
-  { }
+  {
+    /* b) clear the input buffer */
+    if (this->inpbuf->getSize() > 0)
+      this->inpbuf->clear();
+
+    /* d) stop listening to input  */
+    this->deactivate();
+  }
 
 }

code/branches/chat2/src/orxonox/ChatInputHandler.h

@@ -63 +63 @@
       InputBuffer *inpbuf;
       int disp_offset, width;
+      bool fullchat;
 
       /** input state */