mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-27 19:24:08 +00:00
Merge pull request #1019 from shenlebantongying/temp_max_fix
fix: Qt6.4/5's maximum bug https://bugreports.qt.io/browse/QTBUG-115074
This commit is contained in:
commit
365899ce7f
|
@ -741,10 +741,6 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
|
||||||
// Create tab list menu
|
// Create tab list menu
|
||||||
createTabList();
|
createTabList();
|
||||||
|
|
||||||
if ( cfg.mainWindowState.size() && !cfg.resetState )
|
|
||||||
restoreState( cfg.mainWindowState );
|
|
||||||
if ( cfg.mainWindowGeometry.size() )
|
|
||||||
restoreGeometry( cfg.mainWindowGeometry );
|
|
||||||
|
|
||||||
#if defined( Q_OS_LINUX )
|
#if defined( Q_OS_LINUX )
|
||||||
#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
|
#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
|
||||||
|
@ -915,6 +911,12 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
|
||||||
urlRegistry.endGroup();
|
urlRegistry.endGroup();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// restore should be called after all UI initialized.
|
||||||
|
if ( cfg.mainWindowState.size() && !cfg.resetState )
|
||||||
|
restoreState( cfg.mainWindowState );
|
||||||
|
if ( cfg.mainWindowGeometry.size() )
|
||||||
|
restoreGeometry( cfg.mainWindowGeometry );
|
||||||
|
|
||||||
useSmallIconsInToolbarsTriggered();
|
useSmallIconsInToolbarsTriggered();
|
||||||
|
|
||||||
if ( cfg.preferences.checkForNewReleases ) {
|
if ( cfg.preferences.checkForNewReleases ) {
|
||||||
|
|
Loading…
Reference in a new issue