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

fix panel extra interval at end

Browse source
This commit is contained in:
MihailRis 2026-08-20 20:44:10 +03:00
parent 4111da1230
commit bd4d5f0e4b
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/graphics/ui/elements/Panel.cpp
View file

@ -78,9 +78,10 @@ void Panel::refresh() {
glm::vec2 size = getSize(); glm::vec2 size = getSize();
if (orientation == Orientation::VERTICAL) { if (orientation == Orientation::VERTICAL) {
float maxw = size.x; float maxw = size.x;
for (auto& node : nodes) { for (size_t i = 0; i < nodes.size(); i++) {
const auto& node = nodes[i];
const glm::vec4 margin = node->getMargin(); const glm::vec4 margin = node->getMargin();
y += margin.y; y += margin.y + (i > 0 ? interval : 0);
float ex = x + margin.x; float ex = x + margin.x;
node->setPos(glm::vec2(ex, y)); node->setPos(glm::vec2(ex, y));
@ -94,16 +95,17 @@ void Panel::refresh() {
} }
node->refresh(); node->refresh();
glm::vec2 nodeSize = node->getSize(); glm::vec2 nodeSize = node->getSize();
y += nodeSize.y + margin.w + interval; y += nodeSize.y + margin.w;
maxw = fmax(maxw, ex + nodeSize.x + margin.z + padding.z); maxw = fmax(maxw, ex + nodeSize.x + margin.z + padding.z);
} }
actualLengthX = size.x; actualLengthX = size.x;
actualLengthY = y + padding.w; actualLengthY = y + padding.w;
} else { } else {
float maxh = size.y; float maxh = size.y;
for (auto& node : nodes) { for (size_t i = 0; i < nodes.size(); i++) {
const auto& node = nodes[i];
const glm::vec4 margin = node->getMargin(); const glm::vec4 margin = node->getMargin();
x += margin.x; x += margin.x + (i > 0 ? interval : 0);
float ey = y + margin.y; float ey = y + margin.y;
node->setPos(glm::vec2(x, ey)); node->setPos(glm::vec2(x, ey));
@ -117,7 +119,7 @@ void Panel::refresh() {
} }
node->refresh(); node->refresh();
glm::vec2 nodesize = node->getSize(); glm::vec2 nodesize = node->getSize();
x += nodesize.x + margin.z + interval; x += nodesize.x + margin.z;
maxh = fmax(maxh, ey + nodesize.y + margin.w + padding.w); maxh = fmax(maxh, ey + nodesize.y + margin.w + padding.w);
} }
actualLengthY = size.y; actualLengthY = size.y;