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

diff --git a/source/panel.cpp b/source/panel.cpp
index 529ec19..22ccb1b 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -7,9 +7,15 @@ Distributed under the LGPL
 
 #include <msp/core/refptr.h>
 #include "button.h"
+#include "entry.h"
+#include "hslider.h"
+#include "indicator.h"
 #include "label.h"
+#include "list.h"
 #include "panel.h"
 #include "part.h"
+#include "toggle.h"
+#include "vslider.h"
 
 using namespace std;
 
@@ -27,26 +33,42 @@ Panel::Panel(const Resources &r):
 
 Panel::~Panel()
 {
-	for(ChildSeq::iterator i=children.begin(); i!=children.end(); ++i)
-		delete *i;
+	while(!children.empty())
+		delete children.front();
 }
 
 void Panel::add(Widget &wdg)
 {
+	set_parent(wdg, this);
 	children.push_back(&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);
+	}
+}
+
 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))
 		{
-			wdg->button_press(x-geom.x, y-geom.y, btn);
-			pointer_grab=btn;
+			set_pointer_focus(wdg, btn);
 			set_input_focus(wdg);
+
+			const Geometry &cgeom=wdg->get_geometry();
+			wdg->button_press(x-cgeom.x, y-cgeom.y, btn);
 		}
 	}
 }
@@ -55,35 +77,46 @@ 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)
-		{
-			pointer_grab=0;
-
-			set_pointer_focus(get_child_at(x, y));
-		}
+			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);
+		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);
+		}
 	}
 }
 
+void Panel::pointer_leave()
+{
+	set_pointer_focus(0, 0);
+}
+
 void Panel::key_press(unsigned key, unsigned mod, wchar_t ch)
 {
 	if(input_focus)
@@ -101,7 +134,13 @@ void Panel::focus_out()
 	set_input_focus(0);
 }
 
-void Panel::render_part(const Part &part) const
+void Panel::child_hidden(Widget &wdg)
+{
+	if(&wdg==pointer_focus)
+		set_pointer_focus(0, 0);
+}
+
+void Panel::render_special(const Part &part) const
 {
 	if(part.get_name()=="children")
 	{
@@ -109,13 +148,14 @@ void Panel::render_part(const Part &part) const
 			if((*i)->is_visible())
 				(*i)->render();
 	}
-	else
-		Widget::render_part(part);
 }
 
-void Panel::set_pointer_focus(Widget *wdg)
+void Panel::set_pointer_focus(Widget *wdg, int grab)
 {
-	if(wdg!=pointer_focus && pointer_grab==0)
+	if(grab>0 && !wdg)
+		throw InvalidParameterValue("Can't grab on null widget");
+
+	if(wdg!=pointer_focus)
 	{
 		if(pointer_focus)
 			pointer_focus->pointer_leave();
@@ -125,6 +165,8 @@ void Panel::set_pointer_focus(Widget *wdg)
 		if(pointer_focus)
 			pointer_focus->pointer_enter();
 	}
+
+	pointer_grab=grab;
 }
 
 void Panel::set_input_focus(Widget *wdg)
@@ -144,7 +186,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)
-		if((*i)->is_visible() && (*i)->get_geometry().is_inside(x-geom.x, y-geom.y))
+		if((*i)->is_visible() && (*i)->get_geometry().is_inside(x, y))
 			return *i;
 
 	return 0;
@@ -156,9 +198,15 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 	pnl(p),
 	wdg_map(m)
 {
-	add("button", &Loader::child<Button>);
-	add("label",  &Loader::child<Label>);
-	add("panel",  &Loader::panel);
+	add("button",    &Loader::child<Button>);
+	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("toggle",    &Loader::child<Toggle>);
+	add("vslider",   &Loader::child<VSlider>);
 }
 
 template<typename T>