Pass coordinates relative to the receiving widget's geometry

[libs/gltk.git] / source / panel.cpp

diff --git a/source/panel.cpp b/source/panel.cpp
index 36585c97716778431c96cdcf4285c2cbaedc1b5b..9373ff2ebd7559fecccc0e058a140a1c647ca55a 100644 (file)
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -7,9 +7,14 @@ 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 "vslider.h"
 
 using namespace std;
 
@@ -50,14 +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))
                {
-                       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);
                }
        }
 }
@@ -66,35 +76,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)
@@ -112,7 +133,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")
        {
@@ -120,13 +147,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();
@@ -136,6 +164,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)
@@ -155,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;
@@ -168,8 +198,13 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
        wdg_map(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>);
 }
 
 template<typename T>