X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=14e9b6ea8cc3dbf97b9c57f4f673df53870bacc2;hb=3f301f9b6f73e886bdbb61565edb2c02667039d0;hp=bfd0aa8eca7f8f33e5d0ab0ab9688ac1431de911;hpb=ed9873ba7ee862ad76937f579fe371c1a27d5715;p=libs%2Fgltk.git diff --git a/source/panel.cpp b/source/panel.cpp index bfd0aa8..14e9b6e 100644 --- a/source/panel.cpp +++ b/source/panel.cpp @@ -1,16 +1,24 @@ /* $Id$ This file is part of libmspgltk -Copyright © 2007 Mikko Rasa, Mikkosoft Productions +Copyright © 2007-2009 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ +#include #include #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; @@ -19,83 +27,73 @@ namespace GLtk { Panel::Panel(const Resources &r): Widget(r), + Container(r), pointer_focus(0), - pointer_grab(0), + pointer_grabbed(false), input_focus(0) { update_style(); } -Panel::~Panel() +void Panel::raise(Widget &wdg) { - while(!children.empty()) - delete children.front(); -} + for(list::iterator i=children.begin(); i!=children.end(); ++i) + if((*i)->widget==&wdg) + { + children.splice(children.end(), children, i); + return; + } -void Panel::add(Widget &wdg) -{ - set_parent(wdg, this); - children.push_back(&wdg); + throw InvalidState("That Widget is not in this Panel"); } -void Panel::remove(Widget &wdg) +void Panel::button_press(int x, int y, unsigned btn) { - ChildSeq::iterator i=find(children.begin(), children.end(), &wdg); - if(i!=children.end()) + if(pointer_grabbed) { - set_parent(wdg, 0); - children.erase(i); + const Geometry &cgeom=pointer_focus->get_geometry(); + pointer_focus->button_press(x-cgeom.x, y-cgeom.y, btn); } -} - -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)) + else { if(Widget *wdg=get_child_at(x, y)) { - set_pointer_focus(wdg, btn); + set_pointer_focus(wdg); set_input_focus(wdg); - - wdg->button_press(x-geom.x, y-geom.y, btn); } + Container::button_press(x, y, btn); } } void Panel::button_release(int x, int y, unsigned btn) { - if(pointer_grab>0) + if(pointer_grabbed) { - pointer_focus->button_release(x-geom.x, y-geom.y, btn); - - if(btn==pointer_grab) - set_pointer_focus(get_child_at(x, y), 0); - } - else if(geom.is_inside(x, y)) - { - if(Widget *wdg=get_child_at(x, y)) - wdg->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); } + else + Container::button_release(x, 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)) + if(pointer_grabbed) { - 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=pointer_focus->get_geometry(); + pointer_focus->pointer_motion(x-cgeom.x, y-cgeom.y); + } + else + { + set_pointer_focus(get_child_at(x, y)); + Container::pointer_motion(x, y); } } void Panel::pointer_leave() { - set_pointer_focus(0, 0); + Container::pointer_leave(); + set_pointer_focus(0); } void Panel::key_press(unsigned key, unsigned mod, wchar_t ch) @@ -115,27 +113,23 @@ void Panel::focus_out() set_input_focus(0); } -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") { - for(ChildSeq::const_iterator i=children.begin(); i!=children.end(); ++i) - if((*i)->is_visible()) - (*i)->render(); + for(list::const_iterator i=children.begin(); i!=children.end(); ++i) + if((*i)->widget->is_visible()) + (*i)->widget->render(); } } -void Panel::set_pointer_focus(Widget *wdg, int grab) +Panel::Child *Panel::create_child(Widget *wdg) { - if(grab>0 && !wdg) - throw InvalidParameterValue("Can't grab on null widget"); + return new Child(*this, wdg); +} +void Panel::set_pointer_focus(Widget *wdg) +{ if(wdg!=pointer_focus) { if(pointer_focus) @@ -146,8 +140,6 @@ void Panel::set_pointer_focus(Widget *wdg, int grab) if(pointer_focus) pointer_focus->pointer_enter(); } - - pointer_grab=grab; } void Panel::set_input_focus(Widget *wdg) @@ -160,29 +152,30 @@ void Panel::set_input_focus(Widget *wdg) input_focus=wdg; if(input_focus) + { + raise(*wdg); input_focus->focus_in(); + } } } -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)) - return *i; - - return 0; -} - Panel::Loader::Loader(Panel &p, map &m): Widget::Loader(p), pnl(p), wdg_map(m) { - add("button", &Loader::child