X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=97c9ca4f3438d336cc77f1104dcad9e2d379ecf2;hb=3d04d550b8ba1336c36f569d924b6b425bfc47f3;hp=91562cea2b5d7df9a108128d8e31e2927e83ae1a;hpb=8f6f543758fb1b2b17ae2db519198d420eb9982d;p=libs%2Fgltk.git

diff --git a/source/panel.cpp b/source/panel.cpp
index 91562ce..97c9ca4 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -5,13 +5,19 @@ 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"
 #include "label.h"
+#include "list.h"
 #include "panel.h"
 #include "part.h"
+#include "table.h"
+#include "toggle.h"
 #include "vslider.h"
 
 using namespace std;
@@ -42,26 +48,45 @@ 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)
 {
 	if(pointer_grab>0)
-		pointer_focus->button_press(x-geom.x, y-geom.y, btn);
-	else if(geom.is_inside(x, y))
+	{
+		const Geometry &cgeom=pointer_focus->get_geometry();
+		pointer_focus->button_press(x-cgeom.x, y-cgeom.y, btn);
+	}
+	else if(geom.is_inside_relative(x, y))
 	{
 		if(Widget *wdg=get_child_at(x, y))
 		{
 			set_pointer_focus(wdg, btn);
 			set_input_focus(wdg);
 
-			wdg->button_press(x-geom.x, y-geom.y, btn);
+			const Geometry &cgeom=wdg->get_geometry();
+			wdg->button_press(x-cgeom.x, y-cgeom.y, btn);
 		}
 	}
 }
@@ -70,28 +95,38 @@ void Panel::button_release(int x, int y, unsigned btn)
 {
 	if(pointer_grab>0)
 	{
-		pointer_focus->button_release(x-geom.x, y-geom.y, btn);
+		const Geometry &cgeom=pointer_focus->get_geometry();
+		pointer_focus->button_release(x-cgeom.x, y-cgeom.y, btn);
 
 		if(btn==pointer_grab)
 			set_pointer_focus(get_child_at(x, y), 0);
 	}
-	else if(geom.is_inside(x, y))
+	else if(geom.is_inside_relative(x, y))
 	{
 		if(Widget *wdg=get_child_at(x, y))
-			wdg->button_release(x-geom.x, y-geom.y, btn);
+		{
+			const Geometry &cgeom=wdg->get_geometry();
+			wdg->button_release(x-cgeom.x, y-cgeom.y, btn);
+		}
 	}
 }
 
 void Panel::pointer_motion(int x, int y)
 {
 	if(pointer_grab>0)
-		pointer_focus->pointer_motion(x-geom.x, y-geom.y);
-	else if(geom.is_inside(x, y))
+	{
+		const Geometry &cgeom=pointer_focus->get_geometry();
+		pointer_focus->pointer_motion(x-cgeom.x, y-cgeom.y);
+	}
+	else if(geom.is_inside_relative(x, y))
 	{
 		Widget *wdg=get_child_at(x, y);
 		set_pointer_focus(wdg, 0);
 		if(wdg)
-			wdg->pointer_motion(x-geom.x, y-geom.y);
+		{
+			const Geometry &cgeom=wdg->get_geometry();
+			wdg->pointer_motion(x-cgeom.x, y-cgeom.y);
+		}
 	}
 }
 
@@ -121,13 +156,42 @@ 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);
+	else
+		throw InvalidState("Pointer is already grabbed");
+}
+
+void Panel::ungrab_pointer(Widget &wdg)
+{
+	if(pointer_focus==&wdg)
+		set_pointer_focus(0, 0);
+	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();
 	}
@@ -168,8 +232,8 @@ 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)
-		if((*i)->is_visible() && (*i)->get_geometry().is_inside(x-geom.x, y-geom.y))
+	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;
 
 	return 0;
@@ -181,12 +245,17 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 	pnl(p),
 	wdg_map(m)
 {
-	add("button", &Loader::child<Button>);
-	add("entry",  &Loader::child<Entry>);
-	add("hslider", &Loader::child<HSlider>);
-	add("label",  &Loader::child<Label>);
-	add("panel",  &Loader::panel);
-	add("vslider", &Loader::child<VSlider>);
+	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>);
 }
 
 template<typename T>