voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-06 19:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

clang warnings fix

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

12
src/frontend/gui/panels.cpp
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() {