X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.cpp;h=de2472797199108870d8b045679d53019ad815a8;hb=c8291177b545ec81930603a5915234a60296db51;hp=1b47e8a0ff3843fb645d5ef6abffdb076b62de8f;hpb=14e71eccf3a54a056b74266d54ddb70a77528777;p=libs%2Fgltk.git diff --git a/source/root.cpp b/source/root.cpp index 1b47e8a..de24727 100644 --- a/source/root.cpp +++ b/source/root.cpp @@ -15,22 +15,23 @@ Root::Root(const Resources &r, Graphics::Window &window): mouse(new Input::Mouse(window)), own_input(true) { - set_geometry(Geometry(0, 0, window.get_width(), window.get_height())); - - init(); + init(&window); } -Root::Root(const Resources &r, Input::Keyboard *k, Input::Mouse *m): +Root::Root(const Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m): resources(r), keyboard(k), mouse(m), own_input(false) { - init(); + init(window); } -void Root::init() +void Root::init(Graphics::Window *window) { + if(window) + set_geometry(Geometry(0, 0, window->get_width(), window->get_height())); + lbl_tooltip = 0; tooltip_target = 0; @@ -230,5 +231,11 @@ void Root::get_pointer(int &x, int &y) y = (mouse->get_axis_value(1)*0.5+0.5)*geom.h; } +void Root::on_child_added(Widget &wdg) +{ + if(&wdg!=lbl_tooltip) + Panel::on_child_added(wdg); +} + } // namespace GLtk } // namespace Msp