X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=2ede2a9c77fd8b32a105971b894fb5fba66d3919;hb=fdc7fecc65f5f517d66abe3546a949a46836c4a6;hp=14e9b6ea8cc3dbf97b9c57f4f673df53870bacc2;hpb=8a0058b5b90bb7e9eacf1646142f4d73b426fd66;p=libs%2Fgltk.git diff --git a/source/panel.cpp b/source/panel.cpp index 14e9b6e..2ede2a9 100644 --- a/source/panel.cpp +++ b/source/panel.cpp @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of libmspgltk -Copyright © 2007-2009 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include #include #include "button.h" @@ -13,6 +6,7 @@ Distributed under the LGPL #include "hslider.h" #include "indicator.h" #include "label.h" +#include "layout.h" #include "list.h" #include "panel.h" #include "part.h" @@ -25,14 +19,35 @@ using namespace std; namespace Msp { namespace GLtk { -Panel::Panel(const Resources &r): - Widget(r), - Container(r), +Panel::Panel(): + layout(0), pointer_focus(0), pointer_grabbed(false), input_focus(0) +{ } + +Panel::~Panel() +{ + delete layout; + layout = 0; +} + +void Panel::set_layout(Layout *l) +{ + l->set_container(*this); + delete layout; + layout = l; +} + +void Panel::autosize() +{ + if(layout) + layout->autosize(); +} + +Panel::Child *Panel::create_child(Widget *wdg) { - update_style(); + return new Child(*this, wdg); } void Panel::raise(Widget &wdg) @@ -44,22 +59,44 @@ void Panel::raise(Widget &wdg) return; } - throw InvalidState("That Widget is not in this Panel"); + throw hierarchy_error("widget not in panel"); +} + +Widget *Panel::get_final_input_focus() const +{ + if(Panel *panel = dynamic_cast(input_focus)) + { + Widget *focus = panel->get_final_input_focus(); + if(focus) + return focus; + } + return input_focus; +} + +void Panel::render_special(const Part &part, GL::Renderer &renderer) const +{ + if(part.get_name()=="children") + { + for(list::const_iterator i=children.begin(); i!=children.end(); ++i) + if((*i)->widget->is_visible()) + (*i)->widget->render(renderer); + } } void Panel::button_press(int x, int y, unsigned btn) { if(pointer_grabbed) { - const Geometry &cgeom=pointer_focus->get_geometry(); + const Geometry &cgeom = pointer_focus->get_geometry(); pointer_focus->button_press(x-cgeom.x, y-cgeom.y, btn); } else { - if(Widget *wdg=get_child_at(x, y)) + if(Widget *wdg = get_child_at(x, y)) { set_pointer_focus(wdg); - set_input_focus(wdg); + if(wdg->is_focusable()) + set_input_focus(wdg); } Container::button_press(x, y, btn); } @@ -69,7 +106,7 @@ void Panel::button_release(int x, int y, unsigned btn) { if(pointer_grabbed) { - const Geometry &cgeom=pointer_focus->get_geometry(); + const Geometry &cgeom = pointer_focus->get_geometry(); pointer_focus->button_release(x-cgeom.x, y-cgeom.y, btn); } else @@ -80,7 +117,7 @@ void Panel::pointer_motion(int x, int y) { if(pointer_grabbed) { - const Geometry &cgeom=pointer_focus->get_geometry(); + const Geometry &cgeom = pointer_focus->get_geometry(); pointer_focus->pointer_motion(x-cgeom.x, y-cgeom.y); } else @@ -96,10 +133,10 @@ void Panel::pointer_leave() set_pointer_focus(0); } -void Panel::key_press(unsigned key, unsigned mod, wchar_t ch) +void Panel::key_press(unsigned key, unsigned mod) { if(input_focus) - input_focus->key_press(key, mod, ch); + input_focus->key_press(key, mod); } void Panel::key_release(unsigned key, unsigned mod) @@ -108,24 +145,40 @@ void Panel::key_release(unsigned key, unsigned mod) input_focus->key_release(key, mod); } +void Panel::character(wchar_t ch) +{ + if(input_focus) + input_focus->character(ch); +} + void Panel::focus_out() { set_input_focus(0); + Widget::focus_out(); } -void Panel::render_special(const Part &part) const +void Panel::on_geometry_change() { - if(part.get_name()=="children") + if(layout) + layout->update(); +} + +void Panel::on_child_added(Widget &wdg) +{ + if(layout) { - for(list::const_iterator i=children.begin(); i!=children.end(); ++i) - if((*i)->widget->is_visible()) - (*i)->widget->render(); + layout->add_widget(wdg); + signal_autosize_changed.emit(); } } -Panel::Child *Panel::create_child(Widget *wdg) +void Panel::on_child_removed(Widget &wdg) { - return new Child(*this, wdg); + if(layout) + { + layout->remove_widget(wdg); + signal_autosize_changed.emit(); + } } void Panel::set_pointer_focus(Widget *wdg) @@ -135,7 +188,7 @@ void Panel::set_pointer_focus(Widget *wdg) if(pointer_focus) pointer_focus->pointer_leave(); - pointer_focus=wdg; + pointer_focus = wdg; if(pointer_focus) pointer_focus->pointer_enter(); @@ -149,7 +202,7 @@ void Panel::set_input_focus(Widget *wdg) if(input_focus) input_focus->focus_out(); - input_focus=wdg; + input_focus = wdg; if(input_focus) { @@ -181,18 +234,18 @@ Panel::Loader::Loader(Panel &p, map &m): template void Panel::Loader::child(const string &n) { - RefPtr chl=new T(pnl.res); + RefPtr chl = new T(); load_sub(*chl); pnl.add(*chl.get()); - wdg_map[n]=chl.release(); + wdg_map[n] = chl.release(); } void Panel::Loader::panel(const string &n) { - RefPtr p=new Panel(pnl.res); + RefPtr p = new Panel(); load_sub(*p, wdg_map); pnl.add(*p.get()); - wdg_map[n]=p.release(); + wdg_map[n] = p.release(); } @@ -214,7 +267,7 @@ void Panel::Child::visibility_changed(bool v) { if(!v) { - Panel &panel=static_cast(container); + Panel &panel = static_cast(container); if(widget==panel.pointer_focus) panel.set_pointer_focus(0); if(widget==panel.input_focus) @@ -222,30 +275,40 @@ void Panel::Child::visibility_changed(bool v) } } +void Panel::Child::autosize_changed() +{ + Panel &panel = static_cast(container); + if(panel.layout) + panel.layout->update(); +} + void Panel::Child::request_focus() { - static_cast(container).set_input_focus(widget); + Panel &panel = static_cast(container); + panel.set_input_focus(widget); + if(panel.parent && panel.visible) + panel.set_focus(); } void Panel::Child::grab_pointer() { - Panel &panel=static_cast(container); + Panel &panel = static_cast(container); if(!panel.pointer_grabbed) { panel.set_pointer_focus(widget); - panel.pointer_grabbed=true; + panel.pointer_grabbed = true; panel.signal_grab_pointer.emit(); } } void Panel::Child::ungrab_pointer() { - Panel &panel=static_cast(container); + Panel &panel = static_cast(container); if(panel.pointer_grabbed && panel.pointer_focus==widget) { // XXX Should set to the widget under pointer panel.set_pointer_focus(0); - panel.pointer_grabbed=false; + panel.pointer_grabbed = false; panel.signal_ungrab_pointer.emit(); } }