Facilitate querying for the currently focused UI node

Author: felipemanga

src/gui/Node.hpp

@@ -56,11 +56,13 @@ namespace ui {
  }
 
  virtual void eventHandler(const Focus& event) {
- parent->processEvent(FocusChild{this});
+ if (parent)
+ parent->processEvent(FocusChild{this});
  }
 
  virtual void eventHandler(const Blur& event) {
- parent->processEvent(BlurChild{this});
+ if (parent)
+ parent->processEvent(BlurChild{this});
  }
 
  public:
@@ -141,6 +143,10 @@ namespace ui {
  }
  }
 
+ virtual std::shared_ptr<ui::Node> getFocus() {
+ return parent ? parent->getFocus() : nullptr;
+ }
+
  virtual bool hasFocus(std::shared_ptr<ui::Node> child = nullptr) {
  if (parent) {
  return parent->hasFocus(child ?: shared_from_this());

src/gui/Window.cpp

@@ -22,7 +22,7 @@ namespace ui {
  Node::doResize();
  }
 
- std::shared_ptr<ui::Node> Window::getFocused() {
+ std::shared_ptr<ui::Node> Window::getFocus() {
  if (focusTarget.expired()) {
  focus(findChildByPredicate([](ui::Node* node){
  return *node->stealFocus;
@@ -117,10 +117,9 @@ namespace ui {
  if (!guiEvent.target)
  return;
 
- focus(guiEvent.target->shared_from_this());
-
- if (guiEvent.target)
- guiEvent.target->processEvent(guiEvent);
+ auto target = guiEvent.target->shared_from_this();
+ focus(target);
+ target->processEvent(guiEvent);
  }
  }
 
@@ -147,7 +146,7 @@ namespace ui {
 
  auto shared = guiEvent.target->shared_from_this();
 
- if (auto focus = getFocused()) {
+ if (auto focus = getFocus()) {
  if (focus.get() == guiEvent.target) {
  guiEvent.target->processEvent(ui::Click{focus.get(), eventX, eventY, event.buttons});
  }
@@ -162,13 +161,15 @@ namespace ui {
  hoverWindow = this;
  ui::MouseWheel guiEvent{nullptr, mouseX, mouseY, mouseButtons, event.wheelX, event.wheelY};
  guiEvent.target = findEventTarget(guiEvent);
- if (guiEvent.target)
- guiEvent.target->processEvent(guiEvent);
+ if (guiEvent.target) {
+ auto shared = guiEvent.target->shared_from_this();
+ shared->processEvent(guiEvent);
+ }
  }
  }
 
  void Window::on(msg::TextEvent& event) {
- if (auto focus = getFocused()) {
+ if (auto focus = getFocus()) {
  focus->processEvent(ui::TextEvent{
  focus.get(),
  event.text,
@@ -178,7 +179,7 @@ namespace ui {
  }
 
  void Window::on(msg::KeyDown& event) {
- if (auto focus = getFocused()) {
+ if (auto focus = getFocus()) {
  focus->processEvent(ui::KeyDown{
  focus.get(),
  event.scancode,
@@ -190,7 +191,7 @@ namespace ui {
  }
 
  void Window::on(msg::KeyUp& event) {
- if (auto focus = getFocused()) {
+ if (auto focus = getFocus()) {
  focus->processEvent(ui::KeyUp{
  focus.get(),
  event.scancode,

src/gui/Window.hpp

@@ -29,7 +29,6 @@ class Window : public Node {
  msg::PollActiveWindow> pub{this};
  std::weak_ptr<ui::Node> mouseOverTarget;
  std::weak_ptr<ui::Node> focusTarget;
- std::shared_ptr<ui::Node> getFocused();
 
  static inline ui::Window* hoverWindow = nullptr;
  static inline std::weak_ptr<ui::Node> dragTarget;
@@ -53,6 +52,7 @@ class Window : public Node {
  void postInject() override;
  void resize() override;
  void doResize() override;
+ std::shared_ptr<ui::Node> getFocus() override;
  bool hasFocus(std::shared_ptr<ui::Node> child) override;
  void focus(std::shared_ptr<ui::Node> child) override;
  void blur(std::shared_ptr<ui::Node> child) override;