sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-16 00:05:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix dock widget sizes are not correctly restored

Browse Source 
Because of upstream regression https://bugreports.qt.io/browse/QTBUG-89034
we have to hack around this bug downstream

Fixes #44186
This commit is contained in:
Nyall Dawson 2021-07-18 14:57:57 +10:00
parent 55485d38cf
commit d16d76155e
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/qgisapp.cpp
View File

@ -5159,11 +5159,15 @@ void QgisApp::restoreWindowState()
{ {
// restore the toolbar and dock widgets positions using Qt4 settings API // restore the toolbar and dock widgets positions using Qt4 settings API
QgsSettings settings; QgsSettings settings;
#if 0
// because of Qt regression: https://bugreports.qt.io/browse/QTBUG-89034
// we have to wait till dialog is first shown to try to restore dock geometry or it's not correctly restored
// so this code was moved to showEvent for now...
if ( !restoreState( settings.value( QStringLiteral( "UI/state" ), QByteArray::fromRawData( reinterpret_cast< const char * >( defaultUIstate ), sizeof defaultUIstate ) ).toByteArray() ) ) if ( !restoreState( settings.value( QStringLiteral( "UI/state" ), QByteArray::fromRawData( reinterpret_cast< const char * >( defaultUIstate ), sizeof defaultUIstate ) ).toByteArray() ) )
{ {
QgsDebugMsg( QStringLiteral( "restore of UI state failed" ) ); QgsDebugMsg( QStringLiteral( "restore of UI state failed" ) );
} }
#endif
if ( settings.value( QStringLiteral( "UI/hidebrowser" ), false ).toBool() ) if ( settings.value( QStringLiteral( "UI/hidebrowser" ), false ).toBool() )
{ {
@ -17150,3 +17154,19 @@ QgsAttributeEditorContext QgisApp::createAttributeEditorContext()
context.setMainMessageBar( messageBar() ); context.setMainMessageBar( messageBar() );
return context; return context;
} }
void QgisApp::showEvent( QShowEvent *event )
{
QMainWindow::showEvent( event );
// because of Qt regression: https://bugreports.qt.io/browse/QTBUG-89034
// we have to wait till dialog is first shown to try to restore dock geometry or it's not correctly restored
static std::once_flag firstShow;
std::call_once( firstShow, [this]
{
QgsSettings settings;
if ( !restoreState( settings.value( QStringLiteral( "UI/state" ), QByteArray::fromRawData( reinterpret_cast< const char * >( defaultUIstate ), sizeof defaultUIstate ) ).toByteArray() ) )
{
QgsDebugMsg( QStringLiteral( "restore of UI state failed" ) );
}
} );
}

1
src/app/qgisapp.h
View File

@ -1274,6 +1274,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
QgsAttributeEditorContext createAttributeEditorContext(); QgsAttributeEditorContext createAttributeEditorContext();
protected: protected:
void showEvent( QShowEvent *event ) override;
//! Handle state changes (WindowTitleChange) //! Handle state changes (WindowTitleChange)
void changeEvent( QEvent *event ) override; void changeEvent( QEvent *event ) override;