Add Widget::set_focus

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

diff --git a/source/panel.cpp b/source/panel.cpp
index f17439a5eca810b8510d3537fc750a53c2b5868a..3123db41bccd2dc6036a7fd89a1facfdea593e06 100644 (file)
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -5,6 +5,7 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <algorithm>
 #include <msp/core/refptr.h>
 #include "button.h"
 #include "dropdown.h"
@@ -15,6 +16,7 @@ Distributed under the LGPL
 #include "list.h"
 #include "panel.h"
 #include "part.h"
+#include "table.h"
 #include "toggle.h"
 #include "vslider.h"
 
@@ -46,22 +48,27 @@ void Panel::add(Widget &wdg)
 
 void Panel::remove(Widget &wdg)
 {
-       ChildSeq::iterator i=find(children.begin(), children.end(), &wdg);
-       if(i!=children.end())
-       {
-               set_parent(wdg, 0);
-               children.erase(i);
-       }
+       list<Widget *>::iterator i=find(children.begin(), children.end(), &wdg);
+       if(i==children.end())
+               throw InvalidState("That Widget is not in this Panel");
+
+       if(&wdg==pointer_focus)
+               set_pointer_focus(0, 0);
+       if(&wdg==input_focus)
+               set_input_focus(0);
+
+       set_parent(wdg, 0);
+       children.erase(i);
 }
 
 void Panel::raise(Widget &wdg)
 {
-       ChildSeq::iterator i=find(children.begin(), children.end(), &wdg);
-       if(i!=children.end())
-       {
-               children.erase(i);
-               children.push_back(&wdg);
-       }
+       list<Widget *>::iterator i=find(children.begin(), children.end(), &wdg);
+       if(i==children.end())
+               throw InvalidState("That Widget is not in this Panel");
+
+       children.erase(i);
+       children.push_back(&wdg);
 }
 
 void Panel::button_press(int x, int y, unsigned btn)
@@ -167,11 +174,22 @@ void Panel::ungrab_pointer(Widget &wdg)
                throw Exception("Someone is trying to steal the pointer!");
 }
 
+void Panel::grab_focus(Widget &wdg)
+{
+       list<Widget *>::iterator i=find(children.begin(), children.end(), &wdg);
+       if(i==children.end())
+               throw InvalidState("That Widget is not in this Panel");
+       
+       set_input_focus(&wdg);
+       if(parent)
+               parent->grab_focus(*this);
+}
+
 void Panel::render_special(const Part &part) const
 {
        if(part.get_name()=="children")
        {
-               for(ChildSeq::const_iterator i=children.begin(); i!=children.end(); ++i)
+               for(list<Widget *>::const_iterator i=children.begin(); i!=children.end(); ++i)
                        if((*i)->is_visible())
                                (*i)->render();
        }
@@ -212,7 +230,7 @@ void Panel::set_input_focus(Widget *wdg)
 
 Widget *Panel::get_child_at(int x, int y)
 {
-       for(ChildSeq::reverse_iterator i=children.rbegin(); i!=children.rend(); ++i)
+       for(list<Widget *>::reverse_iterator i=children.rbegin(); i!=children.rend(); ++i)
                if((*i)->is_visible() && (*i)->get_geometry().is_inside(x, y))
                        return *i;
 
@@ -233,6 +251,7 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
        add("label",     &Loader::child<Label>);
        add("list",      &Loader::child<List>);
        add("panel",     &Loader::panel);
+       add("table",     &Loader::child<Table>);
        add("toggle",    &Loader::child<Toggle>);
        add("vslider",   &Loader::child<VSlider>);
 }