peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workaround for a Qt 6.5 regression ( see

Browse Source 
https://bugreports.qt.io/browse/QTBUG-110493 )
This commit is contained in:
Uwe Rathmann 2023-01-23 15:51:21 +01:00
parent 7d1e394b43
commit 84156b138e
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/controls/QskWindow.cpp
View File

@ -143,6 +143,7 @@ class QskWindowPrivate : public QQuickWindowPrivate
, explicitLocale( false )
, deleteOnClose( false )
, autoLayoutChildren( true )
, showedOnce( false )
{
}
@ -163,6 +164,7 @@ class QskWindowPrivate : public QQuickWindowPrivate
bool explicitLocale : 1;
bool deleteOnClose : 1;
bool autoLayoutChildren : 1;
bool showedOnce : 1;
};
QskWindow::QskWindow( QWindow* parent )
@ -303,15 +305,33 @@ bool QskWindow::event( QEvent* event )
{
case QEvent::Show:
{
if ( size().isEmpty() )
if ( !d->showedOnce )
{
QSize sz = sizeConstraint();
if ( !sz.isEmpty() )
{
sz = sz.expandedTo( minimumSize() );
sz = sz.boundedTo( maximumSize() );
d->showedOnce = true;
resize( sz );
/*
When a window has a platform window its size is taken
from the platform window - otherwise from d->geometry.
A top level window that has not been shown does not have
a platform window yet and therefore any size set before calling
QWindow::show() is stored there.
Starting with Qt 6.5 an initial default size is set to the platform
window ( at least QXcbWindow ) before the Show event is sent
and we can't rely on QWindow::size() anymore. But even if d->geometry
is not used anymore we can initialize depending on it.
*/
if ( d->geometry.size().isEmpty() )
{
QSize sz = sizeConstraint();
if ( !sz.isEmpty() )
{
sz = sz.expandedTo( minimumSize() );
sz = sz.boundedTo( maximumSize() );
resize( sz );
}
}
}