X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=21d31fb0e2af7a988159a74895cfddc863e8c536;hb=79af58bcfa941e0f2c33b172c9e924522ebcdfea;hp=fade54edbb00e58eb87283bb42f460bf99052dfe;hpb=1b29f1987b8891852a606afbb03e5e08b16c8c3e;p=libs%2Fgltk.git diff --git a/source/container.cpp b/source/container.cpp index fade54e..21d31fb 100644 --- a/source/container.cpp +++ b/source/container.cpp @@ -1,4 +1,5 @@ #include "container.h" +#include "part.h" using namespace std; @@ -15,7 +16,8 @@ Container::Container(): click_button(0), pointer_focus(0), pointer_grabbed(false), - input_focus(0) + input_focus(0), + touch_focus(0) { } Container::~Container() @@ -51,6 +53,36 @@ Container::Child *Container::create_child(Widget *wdg) return new Child(*this, wdg); } +Geometry Container::determine_child_geometry(const Widget &child, const Part &part) const +{ + Geometry pgeom = part.get_geometry(); + if(!pgeom.w || !pgeom.h) + { + Geometry cgeom; + child.autosize(cgeom); + if(!pgeom.w) + pgeom.w = cgeom.w; + if(!pgeom.h) + pgeom.h = cgeom.h; + } + + part.get_alignment().apply(pgeom, geom, part.get_margin()); + return pgeom; +} + +void Container::autosize_child(const Widget &child, const Part &part, Geometry &ageom) const +{ + Geometry cgeom = determine_child_geometry(child, part); + const Sides &margin = part.get_margin(); + ageom.w = max(ageom.w, cgeom.w+margin.left+margin.right); + ageom.h = max(ageom.h, cgeom.h+margin.top+margin.bottom); +} + +void Container::reposition_child(Widget &child, const Part &part) const +{ + child.set_geometry(determine_child_geometry(child, part)); +} + list Container::get_children() const { list result; @@ -59,16 +91,16 @@ list Container::get_children() const return result; } -Widget *Container::get_child_at(int x, int y) +Widget *Container::get_child_at(int x, int y) const { - for(list::iterator i=children.end(); i!=children.begin();) + for(list::const_iterator i=children.end(); i!=children.begin();) if((*--i)->widget->is_visible() && (*i)->widget->get_geometry().is_inside(x, y)) return (*i)->widget; return 0; } -Widget *Container::get_descendant_at(int x, int y) +Widget *Container::get_descendant_at(int x, int y) const { Widget *wdg = get_child_at(x, y); if(Container *cont = dynamic_cast(wdg)) @@ -135,96 +167,73 @@ Widget *Container::get_final_input_focus() const void Container::button_press(int x, int y, unsigned btn) { - if(pointer_grabbed) - { - const Geometry &cgeom = pointer_focus->get_geometry(); - pointer_focus->button_press(x-cgeom.x, y-cgeom.y, btn); - } - else + if(Widget *child = get_pointer_target(x, y, false)) { - if(Widget *wdg = get_child_at(x, y)) + if(!click_focus) { - set_pointer_focus(wdg); - if(wdg->is_focusable()) - set_input_focus(wdg); - } - if(click_focus) - { - const Geometry &cgeom = click_focus->get_geometry(); - click_focus->button_press(x-cgeom.x, y-cgeom.y, btn); - } - else - { - if(Widget *wdg = get_child_at(x, y)) - { - click_focus = wdg; - click_button = btn; - - const Geometry &cgeom = wdg->get_geometry(); - wdg->button_press(x-cgeom.x, y-cgeom.y, btn); - } + set_pointer_focus(child); + if(child->is_focusable()) + set_input_focus(child); + + click_focus = child; + click_button = btn; } + + const Geometry &cgeom = child->get_geometry(); + child->button_press(x-cgeom.x, y-cgeom.y, btn); } } void Container::button_release(int x, int y, unsigned btn) { - if(pointer_grabbed) - { - const Geometry &cgeom = pointer_focus->get_geometry(); - pointer_focus->button_release(x-cgeom.x, y-cgeom.y, btn); - } - else if(click_focus) - { - Widget *wdg = click_focus; - - if(btn==click_button) - click_focus = 0; - - const Geometry &cgeom = wdg->get_geometry(); - wdg->button_release(x-cgeom.x, y-cgeom.y, btn); - } - else + if(Widget *child = get_pointer_target(x, y, false)) { - if(Widget *wdg = get_child_at(x, y)) + if(child==click_focus && btn==click_button) { - const Geometry &cgeom = wdg->get_geometry(); - wdg->button_release(x-cgeom.x, y-cgeom.y, btn); + click_focus = 0; + if(!pointer_focus) + set_pointer_focus(get_child_at(x, y)); } + + const Geometry &cgeom = child->get_geometry(); + child->button_release(x-cgeom.x, y-cgeom.y, btn); } } void Container::pointer_motion(int x, int y) { - if(pointer_grabbed) + Widget *child = get_pointer_target(x, y, false); + if(!pointer_grabbed) + set_pointer_focus((!click_focus || child->get_geometry().is_inside(x, y)) ? child : 0); + + if(child) { - const Geometry &cgeom = pointer_focus->get_geometry(); - pointer_focus->pointer_motion(x-cgeom.x, y-cgeom.y); + const Geometry &cgeom = child->get_geometry(); + child->pointer_motion(x-cgeom.x, y-cgeom.y); } +} + +Widget *Container::get_pointer_target(int x, int y, bool touch) const +{ + if(pointer_grabbed) + return pointer_focus; + else if(!touch && click_focus) + return click_focus; + else if(touch && touch_focus) + return touch_focus; else { - set_pointer_focus(get_child_at(x, y)); - if(click_focus) - { - const Geometry &cgeom = click_focus->get_geometry(); - click_focus->pointer_motion(x-cgeom.x, y-cgeom.y); - } + Widget *child = get_child_at(x, y); + if(child && child->is_enabled()) + return child; else - { - Widget *wdg = get_child_at(x, y); - if(wdg) - { - const Geometry &cgeom = wdg->get_geometry(); - wdg->pointer_motion(x-cgeom.x, y-cgeom.y); - } - } + return 0; } } void Container::pointer_leave() { Widget::pointer_leave(); - click_focus = 0; set_pointer_focus(0); } @@ -246,6 +255,41 @@ void Container::character(wchar_t ch) input_focus->character(ch); } +void Container::touch_press(int x, int y, unsigned finger) +{ + if(Widget *child = get_pointer_target(x, y, true)) + { + // TODO track focus for each finger separately + if(!touch_focus) + touch_focus = child; + + const Geometry &cgeom = child->get_geometry(); + child->touch_press(x-cgeom.x, y-cgeom.y, finger); + } +} + +void Container::touch_release(int x, int y, unsigned finger) +{ + if(Widget *child = get_pointer_target(x, y, true)) + { + // TODO track focus for each finger separately + if(child==touch_focus) + touch_focus = 0; + + const Geometry &cgeom = child->get_geometry(); + child->touch_release(x-cgeom.x, y-cgeom.y, finger); + } +} + +void Container::touch_motion(int x, int y, unsigned finger) +{ + if(Widget *child = get_pointer_target(x, y, true)) + { + const Geometry &cgeom = child->get_geometry(); + child->touch_motion(x-cgeom.x, y-cgeom.y, finger); + } +} + void Container::focus_out() { set_input_focus(0);