Restore focus to re-enabled elements

src/dusk/ui/component.cpp

@@ -49,13 +49,24 @@ void Component::set_disabled(bool value) {
     if (Component::disabled() == value) {
         return;
     }
+    auto* context = mRoot->GetContext();
     if (value) {
+        if (context != nullptr && context->GetFocusElement() == mRoot) {
+            // RmlUi moves focus to the parent when a focused control is disabled.
+            mDisabledFocusFallback = mRoot->GetParentNode();
+        }
         mRoot->SetAttribute("disabled", "");
         mRoot->SetPseudoClass("disabled", true);
         mRoot->Blur();
     } else {
+        const bool restoreFocus = mDisabledFocusFallback != nullptr && context != nullptr &&
+                                  context->GetFocusElement() == mDisabledFocusFallback;
         mRoot->RemoveAttribute("disabled");
         mRoot->SetPseudoClass("disabled", false);
+        mDisabledFocusFallback = nullptr;
+        if (restoreFocus) {
+            focus();
+        }
     }
 }
 

src/dusk/ui/component.hpp

@@ -54,6 +54,7 @@ protected:
     void clear_children();
 
     Rml::Element* mRoot = nullptr;
+    Rml::Element* mDisabledFocusFallback = nullptr;
     std::vector<std::unique_ptr<Component>> mChildren;
     std::vector<std::unique_ptr<ScopedEventListener>> mListeners;
 };