Changeset 8649 in orxonox.OLD for branches

Timestamp:

Jun 20, 2006, 11:56:57 PM (18 years ago)

Author:

bensch

Message:

better draw

Location:

branches/gui/src/lib/gui/gl

Files:

• glgui_table.cc (modified) (5 diffs)
• glgui_table.h (modified) (3 diffs)

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

@@ -27 +27 @@
    */
   GLGuiTable::GLGuiTable (unsigned int rows, unsigned int columns)
+  : _selected(-1, -1), _focused(-1, -1)
   {
     this->init();
@@ -165 +166 @@
     if (event.type == EV_MOUSE_MOTION)
     {
-      unsigned int row, column;
-      this->pixelPositionToElement((OrxGui::GLGuiHandler::getInstance()->cursorPositionRel(this)), &row, &column);
+      this->pixelPositionToElement((OrxGui::GLGuiHandler::getInstance()->cursorPositionRel(this)), &this->_focused.row, &this->_focused.column);
       return true;
     }
@@ -233 +233 @@
     GLGuiWidget::draw();
 
-    float columnPos = 0.0f;
-    float rowPos = 0.0f;
+    float columnPos = this->borderLeft();
+    float rowPos = this->borderTop();
 
     unsigned int i;
@@ -266 +266 @@
 
 
-  void GLGuiTable::pixelPositionToElement(const Vector2D& pixelPosition, unsigned int* row, unsigned int* column)
+  void GLGuiTable::pixelPositionToElement(const Vector2D& pixelPosition, int* row, int* column)
   {
     *row = 0;
@@ -273 +273 @@
     float rowPos = 0.0f;
 
-    for (*row = 0; *row < this->rowCount(); (*row)++)
+    for (*row = 0; *row < (int)this->rowCount(); (*row)++)
     {
       if (pixelPosition.y > rowPos  && pixelPosition.y  < (rowPos += _rowHeights[*row]))
         break;
     }
-    for (*column = 0; *column < this->columnCount(); (*column)++)
+    for (*column = 0; *column < (int)this->columnCount(); (*column)++)
     {
       if (pixelPosition.x > columnPos && pixelPosition.x  < (columnPos += _columnWidths[*column]))

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

@@ -62 +62 @@
     void init();
 
-    void pixelPositionToElement(const Vector2D& pixelPosition, unsigned int* row, unsigned int* column);
+    void pixelPositionToElement(const Vector2D& pixelPosition, int* row, int* column);
     void repositionText(unsigned int fromLeft, unsigned int fromTop);
     void applyTextSettings(unsigned int row, unsigned int column, LimitedWidthText* text);
@@ -68 +68 @@
 
   private:
+    typedef struct Entry {
+      Entry(int row, int column) :row(row), column(column) {};
+      int  row;
+      int  column;
+    };
+
     typedef std::vector<LimitedWidthText> TableTextList;
     TableTextList                _headers;
@@ -75 +81 @@
     std::vector<TableTextList>   _entries;     //!< inner is by column, outer is by row.
 
+    Entry                        _selected;
+    Entry                        _focused;
+
 
   };