From 4aedf74b287fd57989bdf162f623f98893c7ff92 Mon Sep 17 00:00:00 2001 From: ripose Date: Wed, 3 Feb 2021 23:02:14 -0800 Subject: [PATCH] Fixed bug where window would not be maximized when returning from fullscreen if it was maximized before --- src/gui/mainwindow.cpp | 9 +++++++-- src/gui/mainwindow.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 0d15da97..f828839f 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -33,7 +33,8 @@ #include MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), - m_ui(new Ui::MainWindow) + m_ui(new Ui::MainWindow), + m_maximized(false) { m_ui->setupUi(this); @@ -205,6 +206,7 @@ void MainWindow::setFullscreen(bool value) { if (value) { + m_maximized = isMaximized(); showFullScreen(); m_ui->m_menubar->hide(); QApplication::processEvents(); @@ -214,7 +216,10 @@ void MainWindow::setFullscreen(bool value) } else { - showNormal(); + if (m_maximized) + showMaximized(); + else + showNormal(); m_ui->m_menubar->show(); m_ui->m_controls->show(); m_ui->m_centralwidget->layout()->addWidget(m_ui->m_controls); diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 0647b4ce..1f1c996b 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -84,6 +84,7 @@ private Q_SLOTS: DefinitionWidget *m_definition; AnkiSettings *m_ankiSettings; AnkiClient *m_ankiClient; + bool m_maximized; void clearTracks(); void clearTrack(