#include "root.h"
#include "systemkeyboardinput.h"
+using namespace std;
+
namespace Msp {
namespace GLtk {
-Root::Root(Resources &r, Graphics::Window &window):
- Root(r, &window, new Input::Keyboard(window), new Input::Mouse(window), 0)
+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)
{
- own_input = true;
+ 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),
}
if(keyboard && !input_method)
- input_method = new SystemKeyboardInput(*this, *keyboard);
+ input_method = make_unique<SystemKeyboardInput>(*this, *keyboard);
if(touchscreen)
{
}
}
-Root::~Root()
-{
- delete input_method;
- if(own_input)
- {
- delete keyboard;
- delete mouse;
- }
-}
-
void Root::tick()
{
Time::TimeStamp t = Time::now();
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;
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);
}
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)