gui changes: slider size now includes the textbox, combobox size now includes the droparrow, editor gui rearrangement

This commit is contained in:
Turánszki János
2025-05-30 08:50:26 +02:00
parent 0c514a1937
commit 1be929aa8a
38 changed files with 184 additions and 264 deletions
+4 -7
View File
@@ -1167,20 +1167,19 @@ void ObjectWindow::ResizeLayout()
float jump = 20;
float margin_left = 140;
float margin_right = 40;
auto add = [&](wi::gui::Widget& widget) {
if (!widget.IsVisible())
return;
widget.SetPos(XMFLOAT2(margin_left, y));
widget.SetSize(XMFLOAT2(width - margin_left - margin_right, widget.GetScale().y));
widget.SetSize(XMFLOAT2(width - margin_left - padding, widget.GetScale().y));
y += widget.GetSize().y;
y += padding;
};
auto add_right = [&](wi::gui::Widget& widget) {
if (!widget.IsVisible())
return;
widget.SetPos(XMFLOAT2(width - margin_right - widget.GetSize().x, y));
widget.SetPos(XMFLOAT2(width - padding - widget.GetSize().x, y));
y += widget.GetSize().y;
y += padding;
};
@@ -1188,9 +1187,8 @@ void ObjectWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = padding;
const float margin_right = padding;
widget.SetPos(XMFLOAT2(margin_left, y));
widget.SetSize(XMFLOAT2(width - margin_left - margin_right, widget.GetScale().y));
widget.SetSize(XMFLOAT2(width - margin_left - padding, widget.GetScale().y));
y += widget.GetSize().y;
y += padding;
};
@@ -1198,9 +1196,8 @@ void ObjectWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = padding;
const float margin_right = padding;
widget.SetPos(XMFLOAT2(margin_left, y));
widget.SetSize(XMFLOAT2(width - margin_left - margin_right, width - margin_left - margin_right));
widget.SetSize(XMFLOAT2(width - margin_left - padding, width - margin_left - padding));
y += widget.GetSize().y;
y += padding;
};