Merge pull request #71 from NuiCpp/devel

Small Improvements

Author: 5cript

nui/include/nui/frontend/dom/childless_element.hpp

@@ -49,13 +49,17 @@ namespace Nui::Dom
             if (value)
                 element_.call<Nui::val>("setAttribute", Nui::val{std::string{key}}, Nui::val{""});
         }
-        void setAttribute(std::string_view key, int value)
+        template <typename T>
+        requires std::integral<T>
+        void setAttribute(std::string_view key, T value)
         {
-            element_.call<Nui::val>("setAttribute", Nui::val{std::string{key}}, Nui::val{value});
+            element_.call<Nui::val>("setAttribute", Nui::val{std::string{key}}, Nui::val{static_cast<int>(value)});
         }
-        void setAttribute(std::string_view key, double value)
+        template <typename T>
+        requires std::floating_point<T>
+        void setAttribute(std::string_view key, T value)
         {
-            element_.call<Nui::val>("setAttribute", Nui::val{std::string{key}}, Nui::val{value});
+            element_.call<Nui::val>("setAttribute", Nui::val{std::string{key}}, Nui::val{static_cast<double>(value)});
         }
         void setAttribute(std::string_view key, Nui::val value)
         {

nui/include/nui/frontend/elements/impl/html_element.hpp

@@ -345,9 +345,9 @@ namespace Nui
         // Children functions:
         template <typename... ElementT>
         requires requires(ElementT&&... elements) {
-            std::vector<std::function<std::shared_ptr<Dom::Element>(Dom::Element&, Renderer const&)>>{
-                std::forward<ElementT>(elements)...};
-        }
+                     std::vector<std::function<std::shared_ptr<Dom::Element>(Dom::Element&, Renderer const&)>>{
+                         std::forward<ElementT>(elements)...};
+                 }
         auto operator()(ElementT&&... elements) &&
         {
             return std::function<std::shared_ptr<Dom::Element>(Dom::Element&, Renderer const&)>{

nui/include/nui/frontend/elements/svg/impl/svg_element.hpp

@@ -1,20 +1,22 @@
 #pragma once
 
+#include <nui/frontend/elements/impl/html_element.hpp>
+
 #define NUI_DECLARE_SVG_ELEMENT_RENAME(NAME, HTML_ACTUAL) \
     namespace Nui::Elements::Svg \
     { \
         struct NAME : HtmlElement \
         { \
-            constexpr NAME(NAME const&) = default; \
-            constexpr NAME(NAME&&) = default; \
-            constexpr NAME(std::vector<Attribute> const& attributes) \
+            HTML_ELEMENT_CONSTEXPR NAME(NAME const&) = default; \
+            HTML_ELEMENT_CONSTEXPR NAME(NAME&&) = default; \
+            HTML_ELEMENT_CONSTEXPR NAME(std::vector<Attribute> const& attributes) \
                 : HtmlElement{HTML_ACTUAL, &SvgElementBridge, attributes} \
             {} \
-            constexpr NAME(std::vector<Attribute>&& attributes) \
+            HTML_ELEMENT_CONSTEXPR NAME(std::vector<Attribute>&& attributes) \
                 : HtmlElement{HTML_ACTUAL, &SvgElementBridge, std::move(attributes)} \
             {} \
             template <typename... T> \
-            constexpr NAME(T&&... attributes) \
+            HTML_ELEMENT_CONSTEXPR NAME(T&&... attributes) \
                 : HtmlElement{HTML_ACTUAL, &SvgElementBridge, std::forward<T>(attributes)...} \
             {} \
         }; \