diff --git a/cmake/dependencies/fmt.cmake b/cmake/dependencies/fmt.cmake index de31954..35e6afb 100644 --- a/cmake/dependencies/fmt.cmake +++ b/cmake/dependencies/fmt.cmake @@ -1,6 +1,6 @@ option(NUI_FETCH_FMT "Fetch fmt" ON) set(NUI_FMT_GIT_REPOSITORY "https://github.com/fmtlib/fmt.git" CACHE STRING "fmt git repository") -set(NUI_FMT_GIT_TAG "5f774c0aed4af6494b412cd3883e0f09295bd79d" CACHE STRING "fmt git tag") +set(NUI_FMT_GIT_TAG "4e8640ed90ac8751d4a8ca500b893cc8c4bb9668" CACHE STRING "fmt git tag") if (NUI_FETCH_FMT) include(FetchContent) diff --git a/cmake/dependencies/roar.cmake b/cmake/dependencies/roar.cmake index f38ce52..8f352c8 100644 --- a/cmake/dependencies/roar.cmake +++ b/cmake/dependencies/roar.cmake @@ -1,6 +1,6 @@ option(NUI_FETCH_ROAR "Fetch roar" ON) set(NUI_ROAR_REPOSITORY "https://github.com/5cript/roar.git" CACHE STRING "roar repository") -set(NUI_ROAR_TAG "4fe66b20d9d99d1fe2953048a7a6c65ce9a751c7" CACHE STRING "roar tag") +set(NUI_ROAR_TAG "f88b5f46e145376d392c43dc621690f58278582c" CACHE STRING "roar tag") if(NUI_FETCH_ROAR) include(FetchContent) diff --git a/nui/include/nui/backend/backend.hpp b/nui/include/nui/backend/backend.hpp new file mode 100644 index 0000000..4432ccf --- /dev/null +++ b/nui/include/nui/backend/backend.hpp @@ -0,0 +1,6 @@ +#pragma once + +#include +#include +#include +#include \ No newline at end of file diff --git a/nui/include/nui/frontend/attributes/style.hpp b/nui/include/nui/frontend/attributes/style.hpp index e0c8fc1..a229186 100644 --- a/nui/include/nui/frontend/attributes/style.hpp +++ b/nui/include/nui/frontend/attributes/style.hpp @@ -156,24 +156,24 @@ namespace Nui::Attributes auto operator=(char const* value) { return StylePropertyImpl{ - [name = std::string{name}, value = std::string{value}]() { - return name + ":" + value; + [name_ = std::string{name}, value = std::string{value}]() { + return name_ + ":" + value; }, nullptr}; } auto operator=(std::string value) { return StylePropertyImpl{ - [name = std::string{name}, value = std::move(value)]() { - return name + ":" + value; + [name_ = std::string{name}, value = std::move(value)]() { + return name_ + ":" + value; }, nullptr}; } auto operator=(Observed& observedValue) { return StylePropertyImpl{ - [name = std::string{name}, &observedValue]() { - return name + ":" + observedValue.value(); + [name_ = std::string{name}, &observedValue]() { + return name_ + ":" + observedValue.value(); }, observedValue}; } @@ -181,8 +181,8 @@ namespace Nui::Attributes auto operator=(ObservedValueCombinatorWithGenerator&& combinator) { return StylePropertyImpl{ - [name = std::string{name}, gen = combinator.generator()]() { - return name + ":" + gen(); + [name_ = std::string{name}, gen = combinator.generator()]() { + return name_ + ":" + gen(); }, std::move(combinator)}; } diff --git a/nui/include/nui/frontend/elements/impl/materialize.hpp b/nui/include/nui/frontend/elements/impl/materialize.hpp index f93e2f7..b78b710 100644 --- a/nui/include/nui/frontend/elements/impl/materialize.hpp +++ b/nui/include/nui/frontend/elements/impl/materialize.hpp @@ -44,8 +44,8 @@ namespace Nui }; struct Renderer { - RendererType type; - std::size_t metadata; + RendererType type{RendererType::Append}; + std::size_t metadata{0}; }; auto renderElement(Renderer const& gen, auto& element, auto const& htmlElement) {