Rework how widget ownership works in Container

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

diff --git a/source/root.cpp b/source/root.cpp
index ef83bb9de3af842b8fe37878d1f4eb2185d36c12..16ed5bd58c1d9f94a22236b8900c1db8a1be0831 100644 (file)
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -7,39 +7,31 @@
 #include "root.h"
 #include "systemkeyboardinput.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GLtk {
 
-Root::Root(Resources &r, Graphics::Window &window):
-       resources(r),
-       keyboard(new Input::Keyboard(window)),
-       input_method(0),
-       mouse(new Input::Mouse(window)),
-       touchscreen(0),
-       own_input(true)
+Root::Root(Resources &r, Graphics::Window &window, unique_ptr<Input::Keyboard> k, unique_ptr<Input::Mouse> m):
+       Root(r, &window, k.get(), m.get(), nullptr)
 {
-       init(&window);
+       own_input[0] = move(k);
+       own_input[1] = move(m);
 }
 
+Root::Root(Resources &r, Graphics::Window &window):
+       Root(r, window, make_unique<Input::Keyboard>(window), make_unique<Input::Mouse>(window))
+{ }
+
 Root::Root(Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m, Input::Touchscreen *t):
        resources(r),
        keyboard(k),
-       input_method(0),
        mouse(m),
-       touchscreen(t),
-       own_input(false)
-{
-       init(window);
-}
-
-void Root::init(Graphics::Window *window)
+       touchscreen(t)
 {
        if(window)
                set_geometry(Geometry(0, 0, window->get_width(), window->get_height()));
 
-       lbl_tooltip = 0;
-       tooltip_target = 0;
-
        camera.set_orthographic(geom.w, geom.h);
        update_camera();
 
@@ -62,7 +54,7 @@ void Root::init(Graphics::Window *window)
        }
 
        if(keyboard && !input_method)
-               input_method = new SystemKeyboardInput(*this, *keyboard);
+               input_method = make_unique<SystemKeyboardInput>(*this, *keyboard);
 
        if(touchscreen)
        {
@@ -72,16 +64,6 @@ void Root::init(Graphics::Window *window)
        }
 }
 
-Root::~Root()
-{
-       delete input_method;
-       if(own_input)
-       {
-               delete keyboard;
-               delete mouse;
-       }
-}
-
 void Root::tick()
 {
        Time::TimeStamp t = Time::now();
@@ -93,7 +75,7 @@ void Root::tick()
        if(tooltip_timeout && Time::now()>tooltip_timeout)
        {
                std::string tip;
-               if(Widget *wdg = get_descendant_at(pointer_x, pointer_y))
+               if(Widget *wdg = find_descendant_at(pointer_x, pointer_y))
                {
                        tip = wdg->get_tooltip();
                        tooltip_target = wdg;
@@ -108,8 +90,7 @@ void Root::tick()
                {
                        if(!lbl_tooltip)
                        {
-                               lbl_tooltip = new Label;
-                               add(*lbl_tooltip);
+                               lbl_tooltip = &add_new<Label>();
                                lbl_tooltip->set_style("tooltip");
                        }
 
@@ -148,7 +129,7 @@ void Root::render(GL::Renderer &renderer, GL::Tag tag) const
        renderer.set_camera(camera);
        renderer.set_shader_program(shprog);
        renderer.set_blend(&blend);
-       renderer.set_depth_test(0);
+       renderer.set_depth_test(nullptr);
        Widget::render(renderer);
 }
 
@@ -200,11 +181,11 @@ bool Root::axis_motion_event(unsigned, float, float)
                        pointer_y = y;
                        tooltip_timeout = Time::now()+700*Time::msec;
                }
-               else if(get_descendant_at(x, y)!=tooltip_target)
+               else if(find_descendant_at(x, y)!=tooltip_target)
                {
                        if(lbl_tooltip)
                                lbl_tooltip->set_visible(false);
-                       tooltip_target = 0;
+                       tooltip_target = nullptr;
                }
 
                if(pointer_focus)