Only focus widgets if the container is focused

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

diff --git a/source/root.cpp b/source/root.cpp
index e9e62f6785c3a203914dfb10594d1a0db74c812d..a76da5b84cc6abcbe49f5ae99ccf35e8e6d47774 100644 (file)
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -1,9 +1,9 @@
 #include <msp/gl/blend.h>
 #include <msp/gl/extensions/arb_shader_objects.h>
 #include <msp/gl/programbuilder.h>
+#include <msp/gl/tests.h>
 #include <msp/gl/uniform.h>
 #include <msp/input/keys.h>
-#include <msp/time/units.h>
 #include <msp/time/utils.h>
 #include "label.h"
 #include "style.h"
@@ -58,6 +58,9 @@ void Root::init(Graphics::Window *window)
        else
                shprog = 0;
 
+       if(keyboard)
+               set_state(FOCUS);
+
        update_style();
 
        if(mouse)
@@ -91,6 +94,12 @@ Root::~Root()
 
 void Root::tick()
 {
+       Time::TimeStamp t = Time::now();
+       Time::TimeDelta dt = (last_tick ? t-last_tick : Time::zero);
+       last_tick = t;
+
+       animate(dt);
+
        if(tooltip_timeout && Time::now()>tooltip_timeout)
        {
                std::string tip;
@@ -135,11 +144,8 @@ void Root::tick()
        }
 }
 
-void Root::render(const GL::Tag &tag) const
+void Root::render() const
 {
-       if(tag.id)
-               return;
-
        GL::Bind bind_blend(GL::Blend::alpha());
 
        GL::Renderer renderer(&camera);
@@ -152,8 +158,12 @@ void Root::render(GL::Renderer &renderer, const GL::Tag &tag) const
        if(tag.id)
                return;
 
-       renderer.end();
-       render(tag);
+       GL::Renderer::Push push(renderer);
+       renderer.set_camera(camera);
+       renderer.set_shader_program(shprog);
+       GL::BindRestore bind_blend(GL::Blend::alpha());
+       GL::BindRestore unbind_dtest(static_cast<GL::DepthTest *>(0));
+       Widget::render(renderer);
 }
 
 bool Root::button_press_event(unsigned btn)