Merge branch 'devel' of github.com:NuiCpp/Nui into devel

NuiCpp · Aug 30, 2023 · a0626fd · a0626fd
2 parents dad7131 + b574f89
commit a0626fd
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 11 deletions.
diff --git a/nui/include/nui/data_structures/selectables_registry.hpp b/nui/include/nui/data_structures/selectables_registry.hpp
@@ -257,19 +257,31 @@ namespace Nui
             return result;
         }
 
-        std::optional<T>* select(IdType id)
+        struct SelectionResult
+        {
+            std::optional<T>* item;
+            bool found;
+            bool alreadySelected;
+        };
+        SelectionResult select(IdType id)
         {
             const auto iter = findItem(id);
-            if (iter == std::end(items_) || !iter->item.has_value())
-                return nullptr;
+            if (iter == std::end(items_))
+                return {nullptr, false, false};
+            if (!iter->item.has_value())
+                return {nullptr, true, true};
 
             --itemCount_;
 
             const auto selectedIter = selected_.insert(std::move(*iter)).first;
             iter->item.reset();
             // having modifying access to the optional<T> does not mess with the set ordering. const casting is fine
             // here.
-            return &(const_cast<ItemWithId&>(*selectedIter).item);
+            return {
+                .item = &(const_cast<ItemWithId&>(*selectedIter).item),
+                .found = true,
+                .alreadySelected = false,
+            };
         }
 
         void deselectAll(std::invocable<ItemWithId const&> auto callback)

diff --git a/nui/include/nui/frontend/dom/childless_element.hpp b/nui/include/nui/frontend/dom/childless_element.hpp
@@ -29,6 +29,10 @@ namespace Nui::Dom
             else
                 element_.call<Nui::val>("setAttribute", Nui::val{std::string{key}}, Nui::val{value});
         }
+        void setAttribute(std::string_view key, std::string_view value)
+        {
+            setAttribute(key, std::string{value});
+        }
         void setAttribute(std::string_view key, std::invocable<Nui::val> auto&& value)
         {
             element_.set(Nui::val{std::string{key}}, Nui::bind(value, std::placeholders::_1));

diff --git a/nui/include/nui/frontend/event_system/event_context.hpp b/nui/include/nui/frontend/event_system/event_context.hpp
@@ -52,7 +52,7 @@ namespace Nui
         {
             return impl_->eventRegistry().registerEvent(std::move(event));
         }
-        auto* activateEvent(EventIdType id)
+        auto activateEvent(EventIdType id)
         {
             return impl_->eventRegistry().activateEvent(id);
         }

diff --git a/nui/include/nui/frontend/event_system/event_registry.hpp b/nui/include/nui/frontend/event_system/event_registry.hpp
@@ -13,6 +13,7 @@ namespace Nui
     class EventRegistry
     {
       public:
+        using RegistryType = SelectablesRegistry<Event>;
         using EventIdType = SelectablesRegistry<Event>::IdType;
         constexpr static EventIdType invalidEventId = std::numeric_limits<EventIdType>::max();
 
@@ -36,7 +37,7 @@ namespace Nui
          * @param id
          * @return auto*
          */
-        auto* activateEvent(EventIdType id)
+        RegistryType::SelectionResult activateEvent(EventIdType id)
         {
             return registry_.select(id);
         }
@@ -70,7 +71,7 @@ namespace Nui
         }
 
       private:
-        SelectablesRegistry<Event> registry_;
-        SelectablesRegistry<Event> afterEffects_;
+        RegistryType registry_;
+        RegistryType afterEffects_;
     };
 }
diff --git a/nui/include/nui/frontend/event_system/observed_value.hpp b/nui/include/nui/frontend/event_system/observed_value.hpp
@@ -16,8 +16,6 @@
 #include <deque>
 #include <string>
 
-#include <iostream>
-
 namespace Nui
 {
     class ObservedBase
@@ -88,7 +86,8 @@ namespace Nui
         {
             for (auto& event : attachedEvents_)
             {
-                if (globalEventContext.activateEvent(event) == nullptr)
+                auto activationResult = globalEventContext.activateEvent(event);
+                if (activationResult.found == false)
                     event = EventRegistry::invalidEventId;
             }
             for (auto& event : attachedOneshotEvents_)