Rework how widget ownership works in Container

[libs/gltk.git] / source / toggle.cpp

diff --git a/source/toggle.cpp b/source/toggle.cpp
index 988b0a50eef4e1898fdb70f5f7e798affcce1109..cde3f24b0fd81254bd643aeeca592a8ac55db787 100644 (file)
--- a/source/toggle.cpp
+++ b/source/toggle.cpp
@@ -8,16 +8,13 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Toggle::Toggle(const string &t):
-       text(),
-       pressed(false),
-       value(false),
-       exclusive(false)
+Toggle::Toggle(const string &t)
 {
+       input_type = INPUT_NAVIGATION;
        set_text(t);
 }
 
-void Toggle::autosize_special(const Part &part, Geometry &ageom)
+void Toggle::autosize_special(const Part &part, Geometry &ageom) const
 {
        if(part.get_name()=="text")
                text.autosize(part, ageom);
@@ -27,7 +24,7 @@ void Toggle::set_text(const string &t)
 {
        text = t;
        signal_autosize_changed.emit();
-       rebuild();
+       mark_rebuild();
 }
 
 void Toggle::set_exclusive(bool e)
@@ -39,9 +36,8 @@ void Toggle::set_exclusive(bool e)
 
 void Toggle::exclude_siblings()
 {
-       const list<Widget *> &siblings = parent->get_children();
-       for(list<Widget *>::const_iterator i=siblings.begin(); i!=siblings.end(); ++i)
-               if(Toggle *tgl = dynamic_cast<Toggle *>(*i))
+       for(Widget *w: parent->get_children())
+               if(Toggle *tgl = dynamic_cast<Toggle *>(w))
                        if(tgl!=this && tgl->get_exclusive() && tgl->get_value())
                                tgl->set_value(false);
 }
@@ -87,6 +83,18 @@ void Toggle::button_release(int x, int y, unsigned btn)
        }
 }
 
+bool Toggle::navigate(Navigation nav)
+{
+       if(nav==NAV_ACTIVATE)
+       {
+               if(!value || !exclusive)
+                       set_value(!value);
+               return true;
+       }
+
+       return false;
+}
+
 void Toggle::on_style_change()
 {
        text.set_style(style);