Changeset 7997 in orxonox.OLD

Timestamp:

May 30, 2006, 11:34:38 PM (18 years ago)

Author:

bensch

Message:

gui: more Signals

Location:

branches/gui/src/lib/gui/gl_gui

Files:

• glgui_box.cc (modified) (3 diffs)
• glgui_box.h (modified) (3 diffs)
• glgui_checkbutton.cc (modified) (2 diffs)
• glgui_checkbutton.h (modified) (1 diff)

branches/gui/src/lib/gui/gl_gui/glgui_box.cc

@@ -23 +23 @@
    * standard constructor
   */
-  GLGuiBox::GLGuiBox (BoxType type)
+  GLGuiBox::GLGuiBox (OrxGui::Orientation orientation)
   {
     this->init();
 
-    this->setType (type);
+    this->setOrientation(orientation);
   }
 
@@ -47 +47 @@
   void GLGuiBox::pack(GLGuiWidget* widget)
   {
-    if (widget == NULL)
-      return;
+    assert (widget != NULL);
 
     this->children.push_back(widget);
@@ -56 +55 @@
   void GLGuiBox::unpack(GLGuiWidget* widget)
   {
-    if (widget == NULL)
-    {
-      this->children.clear();
-    }
-    else
-    {
-      this->children.remove(widget);
-    }
+    assert(widget == NULL);
+
+    this->children.remove(widget);
   }
 

branches/gui/src/lib/gui/gl_gui/glgui_box.h

@@ -9 +9 @@
 
 #include "glgui_container.h"
-
+#include "glgui_defs.h"
 
 namespace OrxGui
 {
-  typedef enum
-  {
-    Box_H,
-    Box_V,
-  } BoxType;
-
   //! This is BOX part of the openglGUI class
   /**
@@ -27 +21 @@
 
   public:
-    GLGuiBox(BoxType type = Box_H);
+    GLGuiBox(OrxGui::Orientation orientation = OrxGui::Horizontal);
     virtual ~GLGuiBox();
 
     void init();
-    void setType(BoxType type) { this->type = type; };
+    /** @returns the Orientation of the Box */
+    OrxGui::Orientation orientation() const { return this->_orientation; };
+    void setOrientation(OrxGui::Orientation orientation) { this->_orientation = orientation; };
 
     virtual void pack(GLGuiWidget* widget);
@@ -41 +37 @@
 
   private:
-    BoxType                  type;
+    virtual void resize();
+
+    Orientation              _orientation;
     std::list<GLGuiWidget*>  children;
   };

branches/gui/src/lib/gui/gl_gui/glgui_checkbutton.cc

@@ -52 +52 @@
   }
 
+  void GLGuiCheckButton::setActivity(bool bActive)
+  {
+    this->bActive = bActive;
+    emit(this->toggled(this->bActive));
+  }
 
   void GLGuiCheckButton::toggleActiveState()
   {
-    this->bActive = !this->bActive;
+    this->setActivity(!this->isActive());
   }
 
@@ -70 +75 @@
   void GLGuiCheckButton::releasing(const Vector2D& pos)
   {
-    printf("%s released\n", this->getLabel().c_str());
     GLGuiButton::releasing(pos);
     this->toggleActiveState();

branches/gui/src/lib/gui/gl_gui/glgui_checkbutton.h

@@ -34 +34 @@
     virtual void update() {};
 
+    DeclareSignal1(toggled, bool);
+
   protected:
     virtual void resize();