PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'main' into release-0.30

Browse Source
This commit is contained in:
MihailRis 2025-11-25 22:32:54 +03:00
commit 011774a8ba
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layouts/code_editor.xml
View File

@ -17,7 +17,7 @@
color="#FFFFFF80" size="16" pos="4,6"
hover-color="#1080FF"></image>
<panel orientation="horizontal" gravity="top-right"
size="60,16" padding="8" interval="8" color="0">
size="76,24" padding="8" interval="8" color="0">
<image id="saveIcon" src="gui/save" tooltip="@Save"
enabled="false" interactive="true"
hover-color="#1080FF"

4
src/graphics/ui/elements/Panel.cpp
View File

@ -81,7 +81,9 @@ void Panel::refresh() {
float ex = x + margin.x;
node->setPos(glm::vec2(ex, y));
float width = size.x - padding.x - padding.z - margin.x - margin.z;
int width = glm::floor(
size.x - padding.x - padding.z - margin.x - margin.z
);
if (node->isResizing()) {
node->setMaxSize({width, node->getMaxSize().y});
node->setSize(glm::vec2(width, node->getSize().y));

5
src/graphics/ui/gui_xml.cpp
View File

@ -244,10 +244,7 @@ static void read_base_panel_impl(
if (element.has("padding")) {
glm::vec4 padding = element.attr("padding").asVec4();
panel.setPadding(padding);
glm::vec2 size = panel.getSize();
panel.setSize(glm::vec2(
size.x + padding.x + padding.z, size.y + padding.y + padding.w
));
panel.refresh();
}
if (element.has("orientation")) {
auto& oname = element.attr("orientation").getText();