Merge pull request #79 from NuiCpp/range-improvements

Range Improvements
NuiCpp · Oct 1, 2023 · d751320 · d751320
2 parents 279a3d2 + a275b48
commit d751320
Show file tree

Hide file tree

Showing 18 changed files with 731 additions and 217 deletions.
diff --git a/nui/include/nui/data_structures/selectables_registry.hpp b/nui/include/nui/data_structures/selectables_registry.hpp
@@ -573,6 +573,14 @@ namespace Nui
             return items_.begin();
         }
 
+        /**
+         * @brief Returns a const iterator to the underlying container.
+         */
+        typename ItemContainerType::const_iterator rawConstBegin() const
+        {
+            return items_.cbegin();
+        }
+
         /**
          * @brief Returns a const iterator to the underlying container.
          */
@@ -581,6 +589,56 @@ namespace Nui
             return items_.end();
         }
 
+        /**
+         * @brief Returns a const iterator to the underlying container.
+         */
+        typename ItemContainerType::const_iterator rawConstEnd() const
+        {
+            return items_.cend();
+        }
+
+        template <typename RegistryPtr>
+        struct RawRangeWrap
+        {
+            RegistryPtr registry;
+            typename ItemContainerType::iterator begin() const
+            {
+                return registry->rawBegin();
+            }
+            typename ItemContainerType::iterator end() const
+            {
+                return registry->rawEnd();
+            }
+            typename ItemContainerType::iterator cbegin() const
+            {
+                return registry->rawConstBegin();
+            }
+            typename ItemContainerType::iterator cend() const
+            {
+                return registry->rawConstEnd();
+            }
+        };
+
+        /**
+         * @brief Helper for range based for loops.
+         *
+         * @return RawRangeWrap
+         */
+        RawRangeWrap<SelectablesRegistry<T>*> rawRange()
+        {
+            return {this};
+        }
+
+        /**
+         * @brief Helper for range based for loops.
+         *
+         * @return RawRangeWrap
+         */
+        RawRangeWrap<SelectablesRegistry<T> const*> rawRange() const
+        {
+            return {this};
+        }
+
       private:
         typename ItemContainerType::iterator findItem(IdType id)
         {

diff --git a/nui/include/nui/feature_test.hpp b/nui/include/nui/feature_test.hpp
@@ -0,0 +1,14 @@
+#pragma once
+
+#ifdef __has_include
+#    if __has_include(<version>)
+#        include <version>
+#        ifdef __cpp_lib_ranges
+#            ifndef NUI_HAS_STD_RANGES
+#                define NUI_HAS_STD_RANGES 1
+#            elif NUI_HAS_STD_RANGES == 0
+#                undef NUI_HAS_STD_RANGES
+#            endif
+#        endif
+#    endif
+#endif
diff --git a/nui/include/nui/frontend/dom/element.hpp b/nui/include/nui/frontend/dom/element.hpp
@@ -249,4 +249,5 @@ namespace Nui::Dom
     };
 }
 
-#include <nui/frontend/elements/impl/html_element.tpp>
+#include <nui/frontend/elements/impl/html_element.tpp>
+#include <nui/frontend/elements/impl/range_renderer.tpp>