TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-08 13:14:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1716 from Azaezel/alpha41/controlCrunchCorrection

Browse source 
correct element gui resizing drift
This commit is contained in:
Brian Roberts 2026-04-19 08:05:04 -05:00 • committed by GitHub
commit fd1434bc16
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 27 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Engine/source/gui/core/guiControl.cpp
View file

@ -1382,6 +1382,8 @@ void GuiControl::parentResized(const RectI &oldParentRect, const RectI &newParen
S32 deltaX = newParentRect.extent.x - oldParentRect.extent.x;
S32 deltaY = newParentRect.extent.y - oldParentRect.extent.y;
F32 nudgeX = (deltaX > 0) ? -0.001f : 0.001f;
F32 nudgeY = (deltaY > 0) ? -0.001f : 0.001f;
if (mHorizSizing == horizResizeCenter)
newPosition.x = (newParentRect.extent.x - getWidth()) >> 1;
@ -1391,40 +1393,34 @@ void GuiControl::parentResized(const RectI &oldParentRect, const RectI &newParen
newPosition.x += deltaX;
else if (mHorizSizing == horizResizeRelative && oldParentRect.extent.x != 0)
{
S32 newLeft = mRoundToNearest( ( F32( newPosition.x ) / F32( oldParentRect.extent.x ) ) * F32( newParentRect.extent.x ) );
S32 newWidth = mRoundToNearest( ( F32( newExtent.x ) / F32( oldParentRect.extent.x ) ) * F32( newParentRect.extent.x ) );
S32 newLeft = mRoundToNearest( ( F32( newPosition.x ) / F32( oldParentRect.extent.x ) ) * F32( newParentRect.extent.x ) + nudgeX);
S32 newWidth = mRoundToNearest( ( F32( newExtent.x ) / F32( oldParentRect.extent.x ) ) * F32( newParentRect.extent.x ) + nudgeX);
newPosition.x = newLeft;
newExtent.x = newWidth;
}
else if (mHorizSizing == horizResizeAspectLeft && oldParentRect.extent.x != 0)
{
S32 newLeft = mRoundToNearest((F32(newPosition.x) / F32(oldParentRect.extent.x)) * F32(newParentRect.extent.x));
S32 newWidth = mRoundToNearest((F32(newExtent.x) / F32(oldParentRect.extent.y)) * F32(newParentRect.extent.y));
F32 heightRatio = F32(newParentRect.extent.y) / F32(oldParentRect.extent.y);
S32 newWidth = mRoundToNearest(F32(newExtent.x) * heightRatio + nudgeX);
newPosition.x = newLeft;
S32 newRight = newPosition.x + newExtent.x + deltaX;
newPosition.x = newRight - newWidth;
newExtent.x = newWidth;
}
else if (mHorizSizing == horizResizeAspectRight && oldParentRect.extent.x != 0)
{
S32 newLeft = mRoundToNearest((F32(newPosition.x) / F32(oldParentRect.extent.x)) * F32(newParentRect.extent.x));
S32 newWidth = mRoundToNearest((F32(newExtent.x) / F32(oldParentRect.extent.y)) * F32(newParentRect.extent.y)); //origional aspect ratio corrected width
S32 rWidth = mRoundToNearest((F32(newExtent.x) / F32(oldParentRect.extent.x)) * F32(newParentRect.extent.x)); //parent aspect ratio relative width
S32 offset = rWidth - newWidth; // account for change in relative width
newLeft += offset;
newPosition.x = newLeft;
F32 heightRatio = F32(newParentRect.extent.y) / F32(oldParentRect.extent.y);
S32 newWidth = mRoundToNearest(F32(newExtent.x) * heightRatio + nudgeX);
newExtent.x = newWidth;
}
else if (mHorizSizing == horizResizeAspectCenter && oldParentRect.extent.x != 0)
{
S32 newLeft = mRoundToNearest((F32(newPosition.x) / F32(oldParentRect.extent.x)) * F32(newParentRect.extent.x));
S32 newWidth = mRoundToNearest((F32(newExtent.x) / F32(oldParentRect.extent.y)) * F32(newParentRect.extent.y)); //origional aspect ratio corrected width
S32 rWidth = mRoundToNearest((F32(newExtent.x) / F32(oldParentRect.extent.x)) * F32(newParentRect.extent.x)); //parent aspect ratio relative width
S32 offset = rWidth - newWidth; // account for change in relative width
newLeft += offset/2;
newPosition.x = newLeft;
F32 heightRatio = F32(newParentRect.extent.y) / F32(oldParentRect.extent.y);
S32 newWidth = mRoundToNearest(F32(newExtent.x) * heightRatio + nudgeX);
S32 center = newPosition.x + (newExtent.x >> 1);
center += deltaX >> 1;
newPosition.x = center - (newWidth >> 1);
newExtent.x = newWidth;
}
@ -1436,40 +1432,32 @@ void GuiControl::parentResized(const RectI &oldParentRect, const RectI &newParen
newPosition.y += deltaY;
else if(mVertSizing == vertResizeRelative && oldParentRect.extent.y != 0)
{
S32 newTop = mRoundToNearest( ( F32( newPosition.y ) / F32( oldParentRect.extent.y ) ) * F32( newParentRect.extent.y ) );
S32 newHeight = mRoundToNearest( ( F32( newExtent.y ) / F32( oldParentRect.extent.y ) ) * F32( newParentRect.extent.y ) );
S32 newHeight = mRoundToNearest( ( F32( newExtent.y ) / F32( oldParentRect.extent.y ) ) * F32( newParentRect.extent.y ) + nudgeY );
S32 newTop = mRoundToNearest( ( F32( newPosition.y ) / F32( oldParentRect.extent.y ) ) * F32( newParentRect.extent.y ) + nudgeY );
newPosition.y = newTop;
newExtent.y = newHeight;
}
else if (mVertSizing == vertResizeAspectTop && oldParentRect.extent.y != 0)
{
S32 newTop = mRoundToNearest((F32(newPosition.y) / F32(oldParentRect.extent.y)) * F32(newParentRect.extent.y));
S32 newHeight = mRoundToNearest((F32(newExtent.y) / F32(oldParentRect.extent.x)) * F32(newParentRect.extent.x));
newPosition.y = newTop;
F32 widthRatio = F32(newParentRect.extent.x) / F32(oldParentRect.extent.x);
S32 newHeight = mRoundToNearest(F32(newExtent.y) * widthRatio + nudgeY);
newPosition.y += deltaY;
newExtent.y = newHeight;
}
else if (mVertSizing == vertResizeAspectBottom && oldParentRect.extent.y != 0)
{
S32 newTop = mRoundToNearest((F32(newPosition.y) / F32(oldParentRect.extent.y)) * F32(newParentRect.extent.y));
S32 newHeight = mRoundToNearest((F32(newExtent.y) / F32(oldParentRect.extent.x)) * F32(newParentRect.extent.x)); //origional aspect ratio corrected hieght
S32 rHeight = mRoundToNearest((F32(newExtent.y) / F32(oldParentRect.extent.y)) * F32(newParentRect.extent.y)); //parent aspect ratio relative hieght
S32 offset = rHeight - newHeight; // account for change in relative hieght
newTop += offset;
newPosition.y = newTop;
F32 widthRatio = F32(newParentRect.extent.x) / F32(oldParentRect.extent.x);
S32 newHeight = mRoundToNearest(F32(newExtent.y) * widthRatio + nudgeY);
newExtent.y = newHeight;
}
else if (mVertSizing == vertResizeAspectCenter && oldParentRect.extent.y != 0)
{
S32 newTop = mRoundToNearest((F32(newPosition.y) / F32(oldParentRect.extent.y)) * F32(newParentRect.extent.y));
S32 newHeight = mRoundToNearest((F32(newExtent.y) / F32(oldParentRect.extent.x)) * F32(newParentRect.extent.x)); //origional aspect ratio corrected hieght
S32 rHeight = mRoundToNearest((F32(newExtent.y) / F32(oldParentRect.extent.y)) * F32(newParentRect.extent.y)); //parent aspect ratio relative hieght
S32 offset = rHeight - newHeight; // account for change in relative hieght
newTop += offset / 2;
newPosition.y = newTop;
F32 widthRatio = F32(newParentRect.extent.x) / F32(oldParentRect.extent.x);
S32 newHeight = mRoundToNearest(F32(newExtent.y) * widthRatio + nudgeY);
S32 center = newPosition.y + (newExtent.y >> 1);
center += deltaY >> 1;
newPosition.y = center - (newHeight >> 1);
newExtent.y = newHeight;
}