X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=aeca9e71a61e83d6889e351cb678ddd1493f2741;hb=1a5f227ac945bc9e6449d1552e5d9eb4c1c196fb;hp=ac277a98ae1bfaa4b4823fd0ffe83401f2d73eb4;hpb=3fb1cc7fe7ffa3948af1a81d1cac91d1313b2452;p=libs%2Fgltk.git

diff --git a/source/panel.cpp b/source/panel.cpp
index ac277a9..aeca9e7 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -48,27 +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())
-	{
-		if(&wdg==pointer_focus)
-			set_pointer_focus(0, 0);
-		if(&wdg==input_focus)
-			set_input_focus(0);
+	list<Widget *>::iterator i=find(children.begin(), children.end(), &wdg);
+	if(i==children.end())
+		throw InvalidState("That Widget is not in this Panel");
 
-		set_parent(wdg, 0);
-		children.erase(i);
-	}
+	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)
@@ -95,11 +95,13 @@ void Panel::button_release(int x, int y, unsigned btn)
 {
 	if(pointer_grab>0)
 	{
-		const Geometry &cgeom=pointer_focus->get_geometry();
-		pointer_focus->button_release(x-cgeom.x, y-cgeom.y, btn);
+		Widget *wdg=pointer_focus;
 
 		if(btn==pointer_grab)
 			set_pointer_focus(get_child_at(x, y), 0);
+
+		const Geometry &cgeom=wdg->get_geometry();
+		wdg->button_release(x-cgeom.x, y-cgeom.y, btn);
 	}
 	else if(geom.is_inside_relative(x, y))
 	{
@@ -156,12 +158,18 @@ 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");
 }
@@ -169,16 +177,31 @@ void Panel::grab_pointer(Widget &wdg)
 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();
 	}
@@ -219,7 +242,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;