clang warnings fix

This commit is contained in:
MihailRis
2024-02-02 23:19:06 +03:00
parent 0e2fc14dc8
commit 537a0ca358
7 changed files with 21 additions and 28 deletions
+6 -6
View File
@@ -26,13 +26,13 @@ std::shared_ptr<Button> guiutil::gotoButton(
) {
text = langs::get(text, L"menu");
return std::make_shared<Button>(text, vec4(10.f), [=](GUI* gui) {
menu->set(page);
menu->setPage(page);
});
}
void guiutil::alert(GUI* gui, const std::wstring& text, runnable on_hidden) {
auto menu = gui->getMenu();
Panel* panel = new Panel(vec2(500, 200), vec4(8.0f), 8.0f);
auto panel = std::make_shared<Panel>(vec2(500, 200), vec4(8.0f), 8.0f);
panel->setColor(vec4(0.0f, 0.0f, 0.0f, 0.5f));
// TODO: implement built-in text wrapping
@@ -63,8 +63,8 @@ void guiutil::alert(GUI* gui, const std::wstring& text, runnable on_hidden) {
}
));
panel->refresh();
menu->add("<alert>", panel);
menu->set("<alert>");
menu->addPage("<alert>", panel);
menu->setPage("<alert>");
}
void guiutil::confirm(
@@ -96,6 +96,6 @@ void guiutil::confirm(
panel->add(subpanel);
panel->refresh();
menu->add("<confirm>", panel);
menu->set("<confirm>");
menu->addPage("<confirm>", panel);
menu->setPage("<confirm>");
}
+3 -9
View File
@@ -213,8 +213,6 @@ void Panel::refresh() {
node->setCoord(vec2(x, y+margin.y));
x += nodesize.x + margin.z + interval;
float height = size.y - padding.y - padding.w - margin.y - margin.w;
//node->setSize(vec2(nodesize.x, height));
node->refresh();
maxh = fmax(maxh, y+margin.y+node->getSize().y+margin.w+padding.w);
}
@@ -243,15 +241,11 @@ bool PagesControl::has(std::string name) {
return pages.find(name) != pages.end();
}
void PagesControl::add(std::string name, std::shared_ptr<UINode> panel) {
void PagesControl::addPage(std::string name, std::shared_ptr<UINode> panel) {
pages[name] = Page{panel};
}
void PagesControl::add(std::string name, UINode* panel) {
add(name, std::shared_ptr<UINode>(panel));
}
void PagesControl::set(std::string name, bool history) {
void PagesControl::setPage(std::string name, bool history) {
auto found = pages.find(name);
if (found == pages.end()) {
throw std::runtime_error("no page found");
@@ -273,7 +267,7 @@ void PagesControl::back() {
return;
std::string name = pageStack.top();
pageStack.pop();
set(name, false);
setPage(name, false);
}
Page& PagesControl::current() {
+2 -3
View File
@@ -93,9 +93,8 @@ namespace gui {
PagesControl();
bool has(std::string name);
void set(std::string name, bool history=true);
void add(std::string name, std::shared_ptr<UINode> panel);
void add(std::string name, UINode* panel);
void setPage(std::string name, bool history=true);
void addPage(std::string name, std::shared_ptr<UINode> panel);
void back();
void clearHistory();
void reset();