X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fpanel.cpp;h=9373ff2ebd7559fecccc0e058a140a1c647ca55a;hb=c435423919a20a87d100e1ee4cd1fc6ce223040c;hp=91562cea2b5d7df9a108128d8e31e2927e83ae1a;hpb=8f6f543758fb1b2b17ae2db519198d420eb9982d;p=libs%2Fgltk.git

diff --git a/source/panel.cpp b/source/panel.cpp
index 91562ce..9373ff2 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -9,7 +9,9 @@ Distributed under the LGPL
 #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 "vslider.h"
@@ -53,15 +55,19 @@ void Panel::remove(Widget &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 +76,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);
+		}
 	}
 }
 
@@ -169,7 +185,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;
@@ -184,7 +200,9 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 	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("vslider", &Loader::child<VSlider>);
 }