Changeset 10336 in orxonox.OLD

Timestamp:

Jan 24, 2007, 4:47:34 PM (18 years ago)

Author:

hejja

Message:

Versuch State fuer die buttons einzubauen..

Location:

branches/gui/src

Files:

• lib/gui/gl/glgui_widget.cc (modified) (2 diffs)
• lib/gui/gl/glgui_widget.h (modified) (1 diff)
• world_entities/questGUI/quest_gui.cc (modified) (2 diffs)

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

@@ -565 +565 @@
   }
 
+  
+  
+  
+  
+  
   /**
   * @brief sets the Background Texture to all States.
@@ -579 +584 @@
   }
 
+  void GLGuiWidget::setBackgroundTexture(const std::string& textureName, OrxGui::State state)
+  {
+    _style[state]._background.setDiffuseMap(textureName);
+    _style[state]._background.setDiffuseColor(Color(1.0, 1.0, 1.0, 1.0));
+
+    if (state == _state) {
+      _currentStyle._background.setDiffuseMap(textureName);
+      _currentStyle._background.setDiffuseColor(Color(1.0, 1.0, 1.0, 1.0));
+    }
+  }
+  
+  
+  
+  
   /**
    * @brief sets the Background Texture.

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

@@ -181 +181 @@
     void setBackgroundTexture(const std::string& textureName);
     void setBackgroundTexture(const Texture& texture, OrxGui::State state);
+    void setBackgroundTexture(const std::string& textureName, OrxGui::State state);
     void setBackgroundTexture(const std::string& textureName, const std::string& stateName);
 

branches/gui/src/world_entities/questGUI/quest_gui.cc

@@ -197 +197 @@
       OrxGui::GLGuiBox* acceptBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
       {
-        acceptBox->setBackgroundTexture("maps/accept.png");
-        //acceptBox->setBackgroundColor(Color::black, OrxGui::Normal);
-        //acceptBox->setBackgroundColor(Color::green, OrxGui::Selected);
+        //acceptBox->setBackgroundTexture("maps/accept.png");
+        acceptBox->setBackgroundTexture("maps/accept.png", OrxGui::Normal);
+        acceptBox->setBackgroundTexture("maps/acceptrout.png", OrxGui::Selected);
         OrxGui::GLGuiButton* acceptButton = new OrxGui::GLGuiPushButton("        ");
         acceptButton->released.connect(this, &QuestGUI::accept);
-        acceptBox->setBorderTop(5);
-        acceptBox->setBorderRight(5);
-        acceptBox->setBorderLeft(5);
-        acceptBox->setBorderBottom(5);
+        acceptBox->setBorderTop(7);
+        acceptBox->setBorderRight(7);
+        acceptBox->setBorderLeft(7);
+        acceptBox->setBorderBottom(7);
         acceptBox->pack(acceptButton);
       }
@@ -219 +219 @@
       {
         refuseBox->setBackgroundTexture("maps/refuserout.png");
-        //refuseBox->setBackgroundColor(Color::black, OrxGui::Normal);
-        //refuseBox->setBackgroundColor(Color::green, OrxGui::Selected);
         OrxGui::GLGuiButton* refuseButton = new OrxGui::GLGuiPushButton("        ");
         refuseButton->released.connect(this, &QuestGUI::refuse);
-        refuseBox->setBorderTop(5);
-        refuseBox->setBorderRight(5);
-        refuseBox->setBorderLeft(5);
-        refuseBox->setBorderBottom(5);
+        refuseBox->setBorderTop(7);
+        refuseBox->setBorderRight(7);
+        refuseBox->setBorderLeft(7);
+        refuseBox->setBorderBottom(7);
         refuseBox->pack(refuseButton);
       }