X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=a708873edbeb4a7df6e2a2a1b097dfb057df6ced;hb=aab3c89d03c1a99cb91ff1870775b2c44806bb79;hp=22ccb1b97fbe9bde56fd38186e7233157f698f46;hpb=48fd4db84c4d0b43305d85f74de99eb4fef04fd6;p=libs%2Fgltk.git

diff --git a/source/panel.cpp b/source/panel.cpp
index 22ccb1b..a708873 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -5,8 +5,10 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <algorithm>
 #include <msp/core/refptr.h>
 #include "button.h"
+#include "dropdown.h"
 #include "entry.h"
 #include "hslider.h"
 #include "indicator.h"
@@ -14,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"
 
@@ -45,12 +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)
+{
+	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)
@@ -138,13 +156,50 @@ void Panel::child_hidden(Widget &wdg)
 {
 	if(&wdg==pointer_focus)
 		set_pointer_focus(0, 0);
+	if(&wdg==input_focus)
+		set_input_focus(0);
+}
+
+void Panel::grab_pointer(Widget &wdg)
+{
+	if(pointer_grab==0 || pointer_focus==&wdg)
+	{
+		set_pointer_focus(&wdg, 255);
+		if(parent)
+			parent->grab_pointer(*this);
+	}
+	else
+		throw InvalidState("Pointer is already grabbed");
+}
+
+void Panel::ungrab_pointer(Widget &wdg)
+{
+	if(pointer_focus==&wdg)
+	{
+		set_pointer_focus(0, 0);
+		if(parent)
+			parent->ungrab_pointer(*this);
+	}
+	else if(pointer_grab>0)
+		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();
 	}
@@ -185,7 +240,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;
 
@@ -199,12 +254,14 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 	wdg_map(m)
 {
 	add("button",    &Loader::child<Button>);
+	add("dropdown",  &Loader::child<Dropdown>);
 	add("entry",     &Loader::child<Entry>);
 	add("hslider",   &Loader::child<HSlider>);
 	add("indicator", &Loader::child<Indicator>);
 	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>);
 }