birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2359 from aws-lumberyard-dev/cgalvan/ImproveAutoResizingOfDialogs

Browse Source 
Improved auto-resizing when centering dialogs when they are first displayed.
This commit is contained in:
Chris Galvan
2021-07-22 14:49:43 -05:00
committed by GitHub
parent 75b2437a2d 8cf7f8ed7b
commit e6927ffc14
1 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzQtComponents/AzQtComponents/Components/WindowDecorationWrapper.cpp
+38 -2
View File
@@ -240,15 +240,51 @@ namespace AzQtComponents
// Center within the parent
QRect geo = geometry();
// If the base size of the guest widget is larger than the screen,
// then we need to resize it so that it will fit by either using
// the minimum size (if one is set), or fallback to the screen size.
if (m_guestWidget)
{
if (auto screen = m_guestWidget->screen())
{
const QRect screenGeometry = screen->availableGeometry();
if (geo.width() > screenGeometry.width())
{
auto guestMinimumWidth = m_guestWidget->minimumWidth();
if (guestMinimumWidth && guestMinimumWidth <= screenGeometry.width())
{
geo.setWidth(guestMinimumWidth);
}
else
{
geo.setWidth(screenGeometry.width());
}
}
if (geo.height() > screenGeometry.height())
{
auto guestMinimumHeight = m_guestWidget->minimumHeight();
if (guestMinimumHeight && guestMinimumHeight <= screenGeometry.height())
{
geo.setHeight(guestMinimumHeight);
}
else
{
geo.setHeight(screenGeometry.height());
}
}
}
}
geo.moveCenter(parentWindowCenter);
QWindow *w = topLevelWidget->windowHandle();
QWindow* w = topLevelWidget->windowHandle();
if (!w)
{
return;
}
QScreen *screen = w->screen();
QScreen* screen = w->screen();
if (!screen)
{
// defensive, shouldn't happen