gui changes: slider size now includes the textbox, combobox size now includes the droparrow, editor gui rearrangement
This commit is contained in:
@@ -993,20 +993,19 @@ void EmitterWindow::ResizeLayout()
|
||||
float jump = 20;
|
||||
|
||||
const float margin_left = 130;
|
||||
const float margin_right = 45;
|
||||
|
||||
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;
|
||||
};
|
||||
@@ -1014,9 +1013,8 @@ void EmitterWindow::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;
|
||||
};
|
||||
@@ -1057,7 +1055,7 @@ void EmitterWindow::ResizeLayout()
|
||||
add(restitutionSlider);
|
||||
|
||||
const float l = margin_left;
|
||||
const float r = width - margin_right;
|
||||
const float r = width - padding;
|
||||
float w = ((r - l) - padding * 2) / 3.0f;
|
||||
VelocityXInput.SetSize(XMFLOAT2(w, VelocityXInput.GetSize().y));
|
||||
VelocityYInput.SetSize(XMFLOAT2(w, VelocityYInput.GetSize().y));
|
||||
|
||||
Reference in New Issue
Block a user