Changeset 8618 in orxonox.OLD

Timestamp:

Jun 20, 2006, 1:08:23 PM (18 years ago)

Author:

bensch

Message:

gui: no more segfaults

Location:

branches/gui/src/lib

Files:

• event/event_handler.cc (modified) (1 diff)
• gui/gl/glgui_table.cc (modified) (4 diffs)
• gui/gl/glgui_table.h (modified) (1 diff)

branches/gui/src/lib/event/event_handler.cc

@@ -355 +355 @@
   else
   {
-    SDL_WM_GrabInput(SDL_GRAB_ON);
+    //SDL_WM_GrabInput(SDL_GRAB_ON);
     SDL_ShowCursor(SDL_DISABLE);
   }

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

@@ -58 +58 @@
     this->_entries.resize(rowCount);
     for (unsigned int i = currentRowCount; i < this->rowCount(); ++i)
+    {
       this->_entries[i].resize(columnCount(), LimitedWidthText("fonts/final_frontier.ttf", 20));
+      for (unsigned int j = 0; j < columnCount(); ++j)
+        this->applyTextSettings(i, j, &this->_entries[i][j]);
+    }
 
     assert(this->checkIntegrity());
@@ -69 +73 @@
   void GLGuiTable::setColumnCount(unsigned int columnCount)
   {
+    unsigned int i;
+    unsigned int currentColumnCount = this->columnCount();
+
+    // setup Headers.
     this->_headers.resize(columnCount, LimitedWidthText("fonts/final_frontier.ttf", 20));
-    for (unsigned int i = 0; i < rowCount(); i++)
+    for (i = currentColumnCount; i < columnCount; ++i)
+      this->applyTextSettings(0, i, &this->_headers[i]);
+
+    for (i = 0; i < rowCount(); i++)
+    {
       this->_entries[i].resize(columnCount, LimitedWidthText("fonts/final_frontier.ttf", 20));
-
+      for (unsigned int j = currentColumnCount; j < columnCount; ++j)
+        this->applyTextSettings(i, j, &this->_entries[i][j]);
+
+    }
     assert(this->checkIntegrity());
     this->debug();
@@ -79 +94 @@
       this->hiding();
   }
+
+
 
 
@@ -199 +216 @@
   }
 
+
+  /**
+   * @brief applies the GLGuiNotifiers Settings to a single Text of the GLGuiNotifier.
+   * @param text the Text to apply the settings to.
+   */
+  void GLGuiTable::applyTextSettings(unsigned int row, unsigned int column, LimitedWidthText* text)
+  {
+    text->setSize(this->textSize());
+    //text->setLineWidth(  );
+    text->setFont("fonts/final_frontier.ttf", (int)this->textSize());
+
+    text->setColor(this->foregroundColor());
+    if (text->getParent2D() != this)
+      text->setParent2D(this);
+  }
+
+
   void GLGuiTable::debug() const
   {

branches/gui/src/lib/gui/gl/glgui_table.h

@@ -64 +64 @@
     void init();
 
+    void applyTextSettings(unsigned int row, unsigned int column, LimitedWidthText* text);
     bool checkIntegrity() const;