Changeset 8607 in orxonox.OLD

Timestamp:

Jun 20, 2006, 10:15:46 AM (18 years ago)

Author:

bensch

Message:

orxonox/gui: looks like before now, but way cooler

File:

• branches/gui/src/lib/gui/gl/glgui_widget.cc (modified) (11 diffs)

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

@@ -317 +317 @@
   {
     _style[state]._borderLeft = value;
+    if (state == _state)
+      _currentStyle._borderLeft = value;
   }
 
@@ -351 +353 @@
   {
     _style[state]._borderRight = value;
+    if (state == _state)
+      _currentStyle._borderRight = value;
   }
 
@@ -386 +390 @@
   {
     _style[state]._borderTop = value;
+    if (state == _state)
+      _currentStyle._borderTop = value;
   }
 
@@ -421 +427 @@
   {
     _style[state]._borderBottom = value;
+    if (state == _state)
+      _currentStyle._borderBottom = value;
+
   }
 
@@ -456 +465 @@
   {
     _style[state]._textSize = value;
+    if (state == _state)
+      _currentStyle._textSize = value;
   }
 
@@ -491 +502 @@
   {
     _style[state]._background.setDiffuseColor(color);
+    if (state == _state)
+      _currentStyle._background.setDiffuseColor(color);
+
   }
 
@@ -539 +553 @@
   {
     _style[state]._background.setDiffuseMap(texture);
+    if (state == _state)
+      _currentStyle._background.setDiffuseMap(texture);
   }
 
@@ -576 +592 @@
   {
     _style[state]._foreground.setDiffuseColor(color);
+    if (state == _state)
+      _currentStyle._foreground.setDiffuseColor(color);
+
   }
 
@@ -605 +624 @@
   {
     this->_style[state]._background = material;
+    if (state == _state)
+      _currentStyle._background = material;
+
   }
 
@@ -610 +632 @@
   {
     for (unsigned int i = 0; i < GLGUI_STATE_COUNT; ++i)
-      this->_style[i]._background.loadParams(element);
+      this->loadBackgroundMaterial(element, (OrxGui::State)i);
   }
 
@@ -616 +638 @@
   {
     this->_style[state]._background.loadParams(element);
-  }
+    if (state == _state)
+      this->_currentStyle._background = _style[state]._background;
+  }
+
   void GLGuiWidget::loadBackgroundMaterialS(const TiXmlElement* element, const std::string& stateName)
   {