Skip to content

Some random patches #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
texus merged 5 commits into from
May 29, 2026
Merged

Some random patches #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d39771
Reserve correct size for container when the size is known in advance
jjuhl May 29, 2026
6dbe656
Replace std::list with std::vector in Layout constructor
jjuhl May 29, 2026
fdbf307
Fix incorrect comment for header guard
jjuhl May 29, 2026
e0fe95a
Fix indentation issues in CSS files
jjuhl May 29, 2026
286e1d0
Simplify CSS
jjuhl May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions doc/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}

Expand All @@ -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%;
Expand Down
2 changes: 1 addition & 1 deletion gui-builder/include/WidgetProperties/ListViewProperties.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,4 +225,4 @@ struct ListViewProperties : public WidgetProperties
}
};

#endif // TGUI_GUI_BUILDER_LIST_BOX_PROPERTIES_HPP
#endif // TGUI_GUI_BUILDER_LIST_VIEW_PROPERTIES_HPP
4 changes: 3 additions & 1 deletion gui-builder/include/WidgetProperties/WidgetProperties.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,9 @@ struct WidgetProperties
if (node->propertyValuePairs["list"])
{
std::vector<tgui::String> 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;
Expand Down
4 changes: 1 addition & 3 deletions src/Layout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
#include <TGUI/Layout.hpp>
#include <TGUI/Widget.hpp>

#include <list>

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

namespace
Expand Down Expand Up @@ -151,7 +149,7 @@ namespace tgui
}

// The string contains an expression, so split it up in multiple layouts
std::list<Layout> operands;
std::vector<Layout> operands;
std::vector<Operation> operators;
decltype(searchPos) prevSearchPos = 0;
while (searchPos != String::npos)
Expand Down
Loading