nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Editor/AnimationWindow.cpp
+4 -7
View File
@@ -1334,21 +1334,19 @@ void AnimationWindow::ResizeLayout()
float jump = 20;
const float margin_left = 80;
const float margin_right = 50;
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;
const float margin_right = 40;
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;
};
@@ -1356,9 +1354,8 @@ void AnimationWindow::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;
};
@@ -1368,7 +1365,7 @@ void AnimationWindow::ResizeLayout()
loopTypeButton.SetPos(XMFLOAT2(margin_left, y));
const float l = loopTypeButton.GetPos().x + loopTypeButton.GetSize().x + padding;
const float r = width - margin_right - padding * 4;
const float r = width - padding - padding * 4;
const float diff = r - l;
backwardsButton.SetSize(XMFLOAT2(diff/5, backwardsButton.GetSize().y));
backwardsFromEndButton.SetSize(backwardsButton.GetSize());
Editor/ArmatureWindow.cpp
+3 -5
View File
@@ -267,20 +267,19 @@ void ArmatureWindow::ResizeLayout()
float jump = 20;
const float margin_left = 110;
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;
};
@@ -288,9 +287,8 @@ void ArmatureWindow::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;
};
Editor/CameraComponentWindow.cpp
+3 -6
View File
@@ -369,17 +369,15 @@ void CameraComponentWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = 140;
const float margin_right = 45;
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;
const float margin_right = 45;
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;
};
@@ -387,9 +385,8 @@ void CameraComponentWindow::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;
};
Editor/CameraWindow.cpp
+3 -6
View File
@@ -348,17 +348,15 @@ void CameraWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = 155;
const float margin_right = 45;
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;
const float margin_right = 45;
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;
};
@@ -366,9 +364,8 @@ void CameraWindow::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;
};
Editor/ColliderWindow.cpp
+3 -5
View File
@@ -241,20 +241,19 @@ void ColliderWindow::ResizeLayout()
float jump = 20;
const float margin_left = 80;
const 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;
};
@@ -262,9 +261,8 @@ void ColliderWindow::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;
};
Editor/ComponentsWindow.cpp
+4 -2
View File
@@ -17,6 +17,8 @@ void ComponentsWindow::Create(EditorComponent* _editor)
filterCombo.Create("");
filterCombo.SetShadowRadius(0);
filterCombo.SetMaxVisibleItemCount(16);
filterCombo.SetDropArrowEnabled(false);
filterCombo.SetFixedDropWidth(40);
filterCombo.AddItem("*", (uint64_t)Filter::All);
filterCombo.AddItem(ICON_TRANSFORM, (uint64_t)Filter::Transform);
filterCombo.AddItem(ICON_MATERIAL, (uint64_t)Filter::Material);
@@ -605,10 +607,10 @@ void ComponentsWindow::ResizeLayout()
{
float x_off = 25;
float filterHeight = filterCombo.GetSize().y;
float filterComboWidth = 30;
float filterComboWidth = 28;
filterInput.SetPos(XMFLOAT2(pos.x + x_off, pos.y));
filterInput.SetSize(XMFLOAT2(width - x_off - filterHeight - 5 - filterComboWidth - filterHeight, filterCombo.GetScale().y));
filterInput.SetSize(XMFLOAT2(width - x_off - filterHeight - 3 - filterComboWidth, filterCombo.GetScale().y));
filterCaseCheckBox.SetPos(XMFLOAT2(filterInput.GetPos().x + filterInput.GetSize().x + 1, pos.y));
filterCaseCheckBox.SetSize(XMFLOAT2(filterHeight, filterHeight));
Editor/ConstraintWindow.cpp
+3 -10
View File
@@ -701,20 +701,19 @@ void ConstraintWindow::ResizeLayout()
float jump = 20;
const float margin_left = 145;
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;
};
@@ -722,9 +721,8 @@ void ConstraintWindow::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;
};
@@ -737,9 +735,7 @@ void ConstraintWindow::ResizeLayout()
add_right(collisionCheckBox);
margin_right = 80;
add(breakSlider);
margin_right = 40;
Scene& scene = editor->GetCurrentScene();
@@ -861,7 +857,6 @@ void ConstraintWindow::ResizeLayout()
add_fullwidth(fixedXRotationButton);
add_fullwidth(fixedYRotationButton);
add_fullwidth(fixedZRotationButton);
margin_right = 80;
add(minTranslationXSlider);
add(minTranslationYSlider);
add(minTranslationZSlider);
@@ -879,8 +874,6 @@ void ConstraintWindow::ResizeLayout()
break;
}
margin_right = 40;
if (normalConeSlider.IsVisible())
{
add(normalConeSlider);
Editor/DecalWindow.cpp
+3 -6
View File
@@ -101,17 +101,15 @@ void DecalWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = 100;
const float margin_right = 40;
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;
const float margin_right = padding;
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;
};
@@ -119,9 +117,8 @@ void DecalWindow::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;
};
Editor/EmitterWindow.cpp
+4 -6
View File
@@ -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));
Editor/EnvProbeWindow.cpp
+3 -5
View File
@@ -251,20 +251,19 @@ void EnvProbeWindow::ResizeLayout()
float jump = 20;
const float margin_left = 80;
const float margin_right = padding;
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;
};
@@ -272,9 +271,8 @@ void EnvProbeWindow::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;
};
Editor/ExpressionWindow.cpp
+3 -5
View File
@@ -286,20 +286,19 @@ void ExpressionWindow::ResizeLayout()
float jump = 20;
const float margin_left = 110;
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;
};
@@ -307,9 +306,8 @@ void ExpressionWindow::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;
};
Editor/FontWindow.cpp
+3 -5
View File
@@ -556,20 +556,19 @@ void FontWindow::ResizeLayout()
float jump = 20;
const float margin_left = 120;
const 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;
};
@@ -577,9 +576,8 @@ void FontWindow::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;
};
Editor/ForceFieldWindow.cpp
+3 -5
View File
@@ -137,20 +137,19 @@ void ForceFieldWindow::ResizeLayout()
float jump = 20;
const float margin_left = 70;
const float margin_right = 50;
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;
};
@@ -158,9 +157,8 @@ void ForceFieldWindow::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;
};
Editor/GeneralWindow.cpp
+9 -29
View File
@@ -1014,17 +1014,15 @@ void GeneralWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = 155;
const float margin_right = 0;
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;
const float margin_right = 0;
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;
};
@@ -1032,50 +1030,32 @@ void GeneralWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = padding * 2;
const float margin_right = 0;
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;
};
otherinfoCheckBox.SetPos(XMFLOAT2(width - otherinfoCheckBox.GetSize().x, y));
otherinfoCheckBox.SetPos(XMFLOAT2(width - otherinfoCheckBox.GetSize().x - padding, y));
fpsCheckBox.SetPos(XMFLOAT2(otherinfoCheckBox.GetPos().x - fpsCheckBox.GetSize().x - 70, y));
versionCheckBox.SetPos(XMFLOAT2(fpsCheckBox.GetPos().x - versionCheckBox.GetSize().x - 70, y));
y += versionCheckBox.GetSize().y;
y += padding;
width -= padding * 6;
add(masterVolumeSlider);
width += padding * 6;
saveModeComboBox.SetPos(XMFLOAT2(x_off, y));
saveModeComboBox.SetSize(XMFLOAT2(width - x_off - saveModeComboBox.GetScale().y - 1, saveModeComboBox.GetScale().y));
y += saveModeComboBox.GetSize().y;
y += padding;
add(saveModeComboBox);
add_right(saveCompressionCheckBox);
themeCombo.SetPos(XMFLOAT2(x_off, y));
themeCombo.SetSize(XMFLOAT2(width - x_off - themeCombo.GetScale().y - 1, themeCombo.GetScale().y));
y += themeCombo.GetSize().y;
y += padding;
add(themeCombo);
languageCombo.SetPos(XMFLOAT2(x_off, y));
languageCombo.SetSize(XMFLOAT2(width - x_off - languageCombo.GetScale().y - 1, languageCombo.GetScale().y));
y += languageCombo.GetSize().y;
y += padding;
add(languageCombo);
add_fullwidth(localizationButton);
physicsDebugCheckBox.SetPos(XMFLOAT2(width - physicsDebugCheckBox.GetSize().x, y));
y += physicsDebugCheckBox.GetSize().y;
y += padding;
nameDebugCheckBox.SetPos(XMFLOAT2(width - nameDebugCheckBox.GetSize().x, y));
y += nameDebugCheckBox.GetSize().y;
y += padding;
add_right(physicsDebugCheckBox);
add_right(nameDebugCheckBox);
add_right(wireFrameCheckBox);
add_right(gridHelperCheckBox);
add_right(aabbDebugCheckBox);
Editor/GraphicsWindow.cpp
+5 -8
View File
@@ -327,7 +327,7 @@ void GraphicsWindow::Create(EditorComponent* _editor)
vxgiDebugCombo.Create("");
vxgiDebugCombo.SetTooltip("Toggle VXGI visualization.");
vxgiDebugCombo.SetPos(XMFLOAT2(x + wid + 1, y));
vxgiDebugCombo.SetSize(XMFLOAT2(80, itemheight));
vxgiDebugCombo.SetSize(XMFLOAT2(wid, itemheight));
vxgiDebugCombo.AddItem("No debug", 0);
vxgiDebugCombo.AddItem("Clipmaps", VXGI_CLIPMAP_COUNT);
for (uint32_t i = 0; i < VXGI_CLIPMAP_COUNT; ++i)
@@ -709,7 +709,7 @@ void GraphicsWindow::Create(EditorComponent* _editor)
x = 110;
float hei = itemheight;
wid = 140;
float mod_wid = 60;
float mod_wid = 100;
hdrcalibrationSlider.Create(0, 8, 1, 100, "HDR calibration: ");
hdrcalibrationSlider.SetTooltip("Set multiplier for HDR output, this only takes effect when swapchain output format is non-SRGB");
@@ -1726,17 +1726,15 @@ void GraphicsWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = 155;
const float margin_right = 50;
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;
const float margin_right = 50;
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;
};
@@ -1744,9 +1742,8 @@ void GraphicsWindow::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;
};
Editor/HairParticleWindow.cpp
+3 -5
View File
@@ -514,20 +514,19 @@ void HairParticleWindow::ResizeLayout()
float jump = 20;
const float margin_left = 100;
const 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;
};
@@ -535,9 +534,8 @@ void HairParticleWindow::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;
};
Editor/HumanoidWindow.cpp
+3 -5
View File
@@ -532,20 +532,19 @@ void HumanoidWindow::ResizeLayout()
float jump = 20;
const float margin_left = 110;
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;
};
@@ -553,9 +552,8 @@ void HumanoidWindow::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;
};
Editor/IKWindow.cpp
+3 -5
View File
@@ -153,20 +153,19 @@ void IKWindow::ResizeLayout()
float jump = 20;
const float margin_left = 110;
const float margin_right = 30;
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;
};
@@ -174,9 +173,8 @@ void IKWindow::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;
};
Editor/LayerWindow.cpp
+3 -6
View File
@@ -150,17 +150,15 @@ void LayerWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = 80;
const float margin_right = 40;
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;
const float margin_right = 40;
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;
};
@@ -168,9 +166,8 @@ void LayerWindow::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;
};
Editor/LightWindow.cpp
+3 -6
View File
@@ -535,17 +535,15 @@ void LightWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = 140;
const float margin_right = 40;
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;
const float margin_right = 40;
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;
};
@@ -553,9 +551,8 @@ void LightWindow::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;
};
Editor/MaterialPickerWindow.cpp
+17 -2
View File
@@ -87,8 +87,23 @@ void MaterialPickerWindow::ResizeLayout()
return;
}
zoomSlider.SetPos(XMFLOAT2(55, 0));
zoomSlider.SetSize(XMFLOAT2(GetWidgetAreaSize().x - 100 - 5, 20));
const float padding = 4;
float width = GetWidgetAreaSize().x - padding * 2;
float y = padding;
float jump = 20;
float x_off = 100;
auto add = [&](wi::gui::Widget& widget) {
if (!widget.IsVisible())
return;
const float margin_left = 55;
widget.SetPos(XMFLOAT2(margin_left, y));
widget.SetSize(XMFLOAT2(width - margin_left - padding, widget.GetScale().y));
y += widget.GetSize().y;
y += padding;
};
add(zoomSlider);
wi::gui::Theme theme;
theme.image.CopyFrom(sprites[wi::gui::IDLE].params);
Editor/MaterialWindow.cpp
+3 -6
View File
@@ -1390,17 +1390,15 @@ void MaterialWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = 150;
const float margin_right = 40;
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;
const float margin_right = 40;
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;
};
@@ -1408,9 +1406,8 @@ void MaterialWindow::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;
};
Editor/MeshWindow.cpp
+3 -6
View File
@@ -1148,17 +1148,15 @@ void MeshWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = 100;
const float margin_right = 40;
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;
const float margin_right = 40;
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;
};
@@ -1166,9 +1164,8 @@ void MeshWindow::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;
};
Editor/MetadataWindow.cpp
+3 -6
View File
@@ -429,17 +429,15 @@ void MetadataWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = 100;
const float margin_right = 25;
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;
const float margin_right = padding;
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;
};
@@ -447,9 +445,8 @@ void MetadataWindow::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;
};
Editor/ObjectWindow.cpp
+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;
};
Editor/PaintToolWindow.cpp
+3 -6
View File
@@ -1845,17 +1845,15 @@ void PaintToolWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = 110;
const float margin_right = 30;
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;
const float margin_right = 30;
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;
};
@@ -1863,9 +1861,8 @@ void PaintToolWindow::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;
};
Editor/RigidBodyWindow.cpp
+3 -5
View File
@@ -1068,20 +1068,19 @@ void RigidBodyWindow::ResizeLayout()
float jump = 20;
const float margin_left = 145;
const 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;
};
@@ -1089,9 +1088,8 @@ void RigidBodyWindow::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;
};
Editor/SoftBodyWindow.cpp
+3 -5
View File
@@ -272,20 +272,19 @@ void SoftBodyWindow::ResizeLayout()
float jump = 20;
const float margin_left = 120;
const 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;
};
@@ -293,9 +292,8 @@ void SoftBodyWindow::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;
};
Editor/SoundWindow.cpp
+3 -6
View File
@@ -531,17 +531,15 @@ void SoundWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = 100;
const float margin_right = 40;
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;
const float margin_right = 40;
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;
};
@@ -549,9 +547,8 @@ void SoundWindow::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;
};
Editor/SplineWindow.cpp
+3 -5
View File
@@ -369,20 +369,19 @@ void SplineWindow::ResizeLayout()
float jump = 20;
const float margin_left = 145;
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;
};
@@ -390,9 +389,8 @@ void SplineWindow::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;
};
Editor/SpringWindow.cpp
+3 -5
View File
@@ -195,20 +195,19 @@ void SpringWindow::ResizeLayout()
float jump = 20;
const float margin_left = 120;
const 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;
};
@@ -216,9 +215,8 @@ void SpringWindow::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;
};
Editor/SpriteWindow.cpp
+3 -5
View File
@@ -654,20 +654,19 @@ void SpriteWindow::ResizeLayout()
float jump = 20;
const float margin_left = 118;
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;
};
@@ -675,9 +674,8 @@ void SpriteWindow::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;
};
Editor/TerrainWindow.cpp
+10 -20
View File
@@ -78,9 +78,8 @@ void PerlinModifierWindow::ResizeLayout()
auto add = [&](wi::gui::Widget& widget) {
const float margin_left = 100;
const float margin_right = 50;
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;
};
@@ -152,9 +151,8 @@ void VoronoiModifierWindow::ResizeLayout()
auto add = [&](wi::gui::Widget& widget) {
const float margin_left = 100;
const float margin_right = 50;
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;
};
@@ -266,9 +264,8 @@ void HeightmapModifierWindow::ResizeLayout()
auto add = [&](wi::gui::Widget& widget) {
const float margin_left = 100;
const float margin_right = 50;
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;
};
@@ -500,9 +497,8 @@ void PropWindow::ResizeLayout()
auto add = [&](wi::gui::Widget& widget) {
constexpr float margin_left = 150;
constexpr float margin_right = 50;
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;
};
@@ -627,9 +623,8 @@ void PropsWindow::ResizeLayout()
auto add = [&](wi::gui::Widget& widget) {
constexpr float margin_left = 150;
constexpr float margin_right = 50;
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;
};
@@ -638,18 +633,16 @@ void PropsWindow::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;
};
auto add_window = [&](wi::gui::Window& widget) {
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;
widget.SetEnabled(true);
@@ -1886,23 +1879,20 @@ void TerrainWindow::ResizeLayout()
auto add = [&](wi::gui::Widget& widget) {
const float margin_left = 150;
const float margin_right = 45;
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_checkbox = [&](wi::gui::CheckBox& widget) {
const float margin_right = 45;
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;
};
auto add_window = [&](wi::gui::Window& widget) {
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;
widget.SetEnabled(true);
Editor/TransformWindow.cpp
+3 -6
View File
@@ -442,17 +442,15 @@ void TransformWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = 80;
const float margin_right = 4;
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;
const float margin_right = 4;
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;
};
@@ -460,9 +458,8 @@ void TransformWindow::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;
};
Editor/VideoWindow.cpp
+4 -6
View File
@@ -246,17 +246,15 @@ void VideoWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = 80;
const float margin_right = 40;
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;
const float margin_right = 40;
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;
};
@@ -264,9 +262,8 @@ void VideoWindow::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;
};
@@ -284,6 +281,7 @@ void VideoWindow::ResizeLayout()
preview.SetSize(XMFLOAT2(preview.GetSize().x, preview.GetSize().x * h_aspect));
add(playpauseButton);
playpauseButton.SetSize(XMFLOAT2(width - 140, playpauseButton.GetSize().y));
loopedCheckbox.SetPos(XMFLOAT2(playpauseButton.GetPos().x - loopedCheckbox.GetSize().x - 2, playpauseButton.GetPos().y));
stopButton.SetPos(XMFLOAT2(playpauseButton.GetPos().x + playpauseButton.GetSize().x + 2, playpauseButton.GetPos().y));
stopButton.SetSize(XMFLOAT2(width - stopButton.GetPos().x - padding, playpauseButton.GetSize().y));
Editor/VoxelGridWindow.cpp
+3 -6
View File
@@ -250,21 +250,19 @@ void VoxelGridWindow::ResizeLayout()
float jump = 20;
const float margin_left = 90;
const 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;
const float margin_right = padding;
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;
};
@@ -272,9 +270,8 @@ void VoxelGridWindow::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;
};
Editor/WeatherWindow.cpp
+3 -6
View File
@@ -1273,17 +1273,15 @@ void WeatherWindow::ResizeLayout()
if (!widget.IsVisible())
return;
const float margin_left = 150;
const float margin_right = 50;
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;
const float margin_right = 50;
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;
};
@@ -1291,9 +1289,8 @@ void WeatherWindow::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;
};
WickedEngine/wiGUI.cpp
+39 -19
View File
@@ -1996,13 +1996,19 @@ namespace wi::gui
Widget::Update(canvas, dt);
valueInputField.Detach();
valueInputField.SetSize(XMFLOAT2(std::max(scale.y, wi::font::TextWidth(valueInputField.GetText(), valueInputField.font.params) + 4), scale.y));
valueInputField.SetPos(XMFLOAT2(translation.x + scale.x + 1, translation.y));
if (state != ACTIVE)
{
// only set input field size when slider is not dragged because now it will modify slider active size too!
valueInputField.SetSize(XMFLOAT2(std::max(scale.y, wi::font::TextWidth(valueInputField.GetText(), valueInputField.font.params) + 4), scale.y));
valueInputField.SetPos(XMFLOAT2(translation.x + scale.x - valueInputField.GetSize().x, translation.y));
}
valueInputField.AttachTo(this);
hitBox.siz.x = scale.x - valueInputField.GetSize().x - 1;
scissorRect.bottom = (int32_t)std::ceil(translation.y + scale.y);
scissorRect.left = (int32_t)std::floor(translation.x);
scissorRect.right = (int32_t)std::ceil(translation.x + scale.x + 1 + valueInputField.GetSize().x);
scissorRect.right = (int32_t)std::ceil(translation.x + scale.x);
scissorRect.top = (int32_t)std::floor(translation.y);
for (int i = 0; i < WIDGETSTATE_COUNT; ++i)
@@ -2031,7 +2037,7 @@ namespace wi::gui
{
if (state == ACTIVE)
{
// continue drag if already grabbed wheter it is intersecting or not
// continue drag if already grabbed whether it is intersecting or not
dragged = true;
}
}
@@ -2066,7 +2072,7 @@ namespace wi::gui
{
EventArgs args;
args.clickPos = pointerHitbox.pos;
value = wi::math::InverseLerp(translation.x, translation.x + scale.x, args.clickPos.x);
value = wi::math::InverseLerp(translation.x, translation.x + hitBox.siz.x, args.clickPos.x);
value = wi::math::Clamp(value, 0, 1);
value *= step;
value = std::floor(value);
@@ -2085,11 +2091,13 @@ namespace wi::gui
const float knobWidth = sprites_knob[state].params.siz.x;
const float knobWidthHalf = knobWidth * 0.5f;
sprites_knob[state].params.pos.x = wi::math::Lerp(translation.x + knobWidthHalf + 2, translation.x + scale.x - knobWidthHalf - 2, wi::math::Clamp(wi::math::InverseLerp(start, end, value), 0, 1));
sprites_knob[state].params.pos.x = wi::math::Lerp(translation.x + knobWidthHalf + 2, translation.x + hitBox.siz.x - knobWidthHalf - 2, wi::math::Clamp(wi::math::InverseLerp(start, end, value), 0, 1));
sprites_knob[state].params.pos.y = translation.y + 2;
sprites_knob[state].params.siz.y = scale.y - 4;
sprites_knob[state].params.pivot = XMFLOAT2(0.5f, 0);
sprites_knob[state].params.fade = sprites[state].params.fade;
sprites[state].params.siz.x = hitBox.siz.x;
}
void Slider::Render(const wi::Canvas& canvas, CommandList cmd) const
{
@@ -2105,7 +2113,8 @@ namespace wi::gui
wi::image::Params fx = sprites[state].params;
fx.pos.x -= shadow;
fx.pos.y -= shadow;
fx.siz.x += shadow * 2 + 1 + valueInputField.GetSize().x;
fx.siz.x = scale.x;
fx.siz.x += shadow * 2;
fx.siz.y += shadow * 2;
fx.color = shadow_color;
if (fx.isCornerRoundingEnabled())
@@ -2466,7 +2475,7 @@ namespace wi::gui
Widget::Update(canvas, dt);
const float drop_width = fixed_drop_width > 0 ? fixed_drop_width : (IsDropArrowEnabled() ? scale.x : (scale.x - 1 - scale.y));
const float drop_width = fixed_drop_width > 0 ? fixed_drop_width : (scale.x - 1 - scale.y);
const float drop_x = GetDropX(canvas);
if (IsEnabled() && dt > 0)
@@ -2614,6 +2623,13 @@ namespace wi::gui
}
}
}
sprites[state].params.siz.x = scale.x;
if (IsDropArrowEnabled())
{
sprites[state].params.siz.x -= scale.y + 1;
}
font.params.posY = translation.y + sprites[state].params.siz.y * 0.5f;
selected = std::min((int)items.size(), selected);
@@ -2626,9 +2642,14 @@ namespace wi::gui
{
selected_font.SetText(invalid_selection_text);
}
selected_font.params.posX = translation.x + scale.x * 0.5f;
selected_font.params.posX = translation.x + sprites[state].params.siz.x * 0.5f;
selected_font.params.posY = translation.y + scale.y * 0.5f;
selected_font.Update(dt);
scissorRect.bottom = (int32_t)std::ceil(translation.y + scale.y);
scissorRect.left = (int32_t)std::floor(translation.x);
scissorRect.right = (int32_t)std::ceil(translation.x + sprites[state].params.siz.x);
scissorRect.top = (int32_t)std::floor(translation.y);
}
void ComboBox::Render(const wi::Canvas& canvas, CommandList cmd) const
{
@@ -2639,7 +2660,7 @@ namespace wi::gui
}
GraphicsDevice* device = wi::graphics::GetDevice();
const float drop_width = fixed_drop_width > 0 ? fixed_drop_width : (IsDropArrowEnabled() ? scale.x : (scale.x - 1 - scale.y));
const float drop_width = fixed_drop_width > 0 ? fixed_drop_width : (scale.x - 1 - scale.y);
const float drop_x = GetDropX(canvas);
// shadow:
@@ -2648,11 +2669,8 @@ namespace wi::gui
wi::image::Params fx = sprites[state].params;
fx.pos.x -= shadow;
fx.pos.y -= shadow;
fx.siz.x = scale.x;
fx.siz.x += shadow * 2;
if (drop_arrow)
{
fx.siz.x += 1 + scale.y;
}
fx.siz.y += shadow * 2;
fx.color = shadow_color;
if (fx.isCornerRoundingEnabled())
@@ -2715,7 +2733,7 @@ namespace wi::gui
// control-arrow-background
wi::image::Params fx = sprites[state].params;
fx.disableCornerRounding();
fx.pos = XMFLOAT3(translation.x + scale.x + 1, translation.y, 0);
fx.pos = XMFLOAT3(translation.x + scale.x - scale.y, translation.y, 0);
fx.siz = XMFLOAT2(scale.y, scale.y);
wi::image::Draw(nullptr, fx, cmd);
@@ -2727,7 +2745,7 @@ namespace wi::gui
cb.g_xColor = font.params.color;
XMStoreFloat4x4(&cb.g_xTransform, XMMatrixScaling(scale.y * 0.25f, scale.y * 0.25f, 1) *
XMMatrixRotationZ(drop_offset < 0 ? -XM_PIDIV2 : XM_PIDIV2) *
XMMatrixTranslation(translation.x + scale.x + 1 + scale.y * 0.5f, translation.y + scale.y * 0.5f, 0) *
XMMatrixTranslation(translation.x + scale.x - scale.y * 0.5f, translation.y + scale.y * 0.5f, 0) *
Projection
);
device->BindDynamicConstantBuffer(cb, CBSLOT_RENDERER_MISC, cmd);
@@ -4880,12 +4898,12 @@ namespace wi::gui
if (!widget.IsVisible())
return;
const float margin_left = 20;
const float margin_right = 120;
const float margin_right = 80;
y -= widget.GetSize().y;
y -= padding;
widget.SetPos(XMFLOAT2(margin_left, y));
widget.SetSize(XMFLOAT2(width - margin_left - margin_right, widget.GetScale().y));
};
};
auto add_right = [&](wi::gui::Widget& widget) {
if (!widget.IsVisible())
return;
@@ -4893,7 +4911,7 @@ namespace wi::gui
y -= widget.GetSize().y;
y -= padding;
widget.SetPos(XMFLOAT2(width - margin_right - widget.GetSize().x, y));
};
};
add(alphaSlider);
y += alphaSlider.GetSize().y;
@@ -4978,6 +4996,8 @@ namespace wi::gui
scrollbar.sprites_knob[ScrollBar::SCROLLBAR_HOVER].params.color = wi::Color(180, 180, 180, 180);
scrollbar.sprites_knob[ScrollBar::SCROLLBAR_GRABBED].params.color = wi::Color::White();
scrollbar.SetOverScroll(0.25f);
SetSize(XMFLOAT2(100, 200));
}
bool TreeList::DoesItemHaveChildren(int index) const
{