diff --git a/doc/custom.css b/doc/custom.css index 8d9a6f74f..1629214b8 100644 --- a/doc/custom.css +++ b/doc/custom.css @@ -1,11 +1,11 @@ @media (prefers-color-scheme: dark) { .directory .levels span { - color: #1982d2; + color: #1982d2; } address { - font-style: normal; - color: #2a4d99; + font-style: normal; + color: #2a4d99; } } @@ -18,17 +18,15 @@ body { } #body { - background-color: var(--page-background-color); + background-color: var(--page-background-color); } div { - margin-bottom: 0 + margin-bottom: 0; } #contents { - padding-left: 0; - padding-right: 0; - padding-bottom: 0; + padding: 0; margin-left: 0; margin-right: 0; max-width: 100%; diff --git a/gui-builder/include/WidgetProperties/ListViewProperties.hpp b/gui-builder/include/WidgetProperties/ListViewProperties.hpp index b1451af06..24c819584 100644 --- a/gui-builder/include/WidgetProperties/ListViewProperties.hpp +++ b/gui-builder/include/WidgetProperties/ListViewProperties.hpp @@ -225,4 +225,4 @@ struct ListViewProperties : public WidgetProperties } }; -#endif // TGUI_GUI_BUILDER_LIST_BOX_PROPERTIES_HPP +#endif // TGUI_GUI_BUILDER_LIST_VIEW_PROPERTIES_HPP diff --git a/gui-builder/include/WidgetProperties/WidgetProperties.hpp b/gui-builder/include/WidgetProperties/WidgetProperties.hpp index 3bf05f440..c9505a46d 100644 --- a/gui-builder/include/WidgetProperties/WidgetProperties.hpp +++ b/gui-builder/include/WidgetProperties/WidgetProperties.hpp @@ -130,7 +130,9 @@ struct WidgetProperties if (node->propertyValuePairs["list"]) { std::vector list; - for (const auto& value : node->propertyValuePairs["list"]->valueList) + const auto& valueList = node->propertyValuePairs["list"]->valueList; + list.reserve(valueList.size()); + for (const auto& value : valueList) list.push_back(tgui::Deserializer::deserialize(tgui::ObjectConverter::Type::String, value).getString()); return list; diff --git a/src/Layout.cpp b/src/Layout.cpp index 1e541545b..ae5d8f120 100644 --- a/src/Layout.cpp +++ b/src/Layout.cpp @@ -27,8 +27,6 @@ #include #include -#include - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// namespace @@ -151,7 +149,7 @@ namespace tgui } // The string contains an expression, so split it up in multiple layouts - std::list operands; + std::vector operands; std::vector operators; decltype(searchPos) prevSearchPos = 0; while (searchPos != String::npos)