From 99c221c8549c131afc7526bf8391ecab46a82276 Mon Sep 17 00:00:00 2001 From: YiFang Xiao Date: Fri, 14 Jun 2024 19:54:46 +0800 Subject: [PATCH] opt: remove wasMaximized logic of mainwindow --- src/ui/mainwindow.cc | 17 ----------------- src/ui/mainwindow.hh | 2 -- 2 files changed, 19 deletions(-) diff --git a/src/ui/mainwindow.cc b/src/ui/mainwindow.cc index ed884441..0e615f5b 100644 --- a/src/ui/mainwindow.cc +++ b/src/ui/mainwindow.cc @@ -165,7 +165,6 @@ MainWindow::MainWindow( Config::Class & cfg_ ): audioPlayerFactory( cfg.preferences ), wordFinder( this ), wordListSelChanged( false ), - wasMaximized( false ), headwordsDlg( nullptr ), ftsIndexing( dictionaries ), ftsDlg( nullptr ), @@ -872,8 +871,6 @@ MainWindow::MainWindow( Config::Class & cfg_ ): mainStatusBar->showMessage( tr( "Accessibility API is not enabled" ), 10000, QPixmap( ":/icons/error.svg" ) ); #endif - wasMaximized = isMaximized(); - history.setSaveInterval( cfg.preferences.historyStoreInterval ); #ifndef Q_OS_MACOS ui.centralWidget->grabGesture( Gestures::GDPinchGestureType ); @@ -2482,11 +2479,6 @@ bool MainWindow::eventFilter( QObject * obj, QEvent * ev ) } } - if ( obj == this && ev->type() == QEvent::WindowStateChange ) { - auto stev = dynamic_cast< QWindowStateChangeEvent * >( ev ); - wasMaximized = ( stev->oldState() == Qt::WindowMaximized && isMinimized() ); - } - if ( ev->type() == QEvent::MouseButtonPress ) { auto event = dynamic_cast< QMouseEvent * >( ev ); @@ -2744,15 +2736,6 @@ void MainWindow::toggleMainWindow( bool onlyShow ) raise(); shown = true; } - else if ( isMinimized() ) { - if ( wasMaximized ) - showMaximized(); - else - showNormal(); - activateWindow(); - raise(); - shown = true; - } else if ( !isActiveWindow() ) { activateWindow(); if ( cfg.preferences.raiseWindowOnSearch ) { diff --git a/src/ui/mainwindow.hh b/src/ui/mainwindow.hh index c9994215..1af063c8 100644 --- a/src/ui/mainwindow.hh +++ b/src/ui/mainwindow.hh @@ -158,8 +158,6 @@ private: bool wordListSelChanged; - bool wasMaximized; // Window state before minimization - QPrinter & getPrinter(); // Creates a printer if it's not there and returns it DictHeadwords * headwordsDlg;