From fa170a25575cf15c766f44820c422d90ec5a9735 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 7 Jun 2017 10:28:26 -0400 Subject: Deactivate the auto-resize functionality (for now) with a comment about the Fluxbox issue. This can get reactivated when Fluxbox is deactivated with Lumina 2.0. Instead, just increase the default size of the main window a bit. --- src-qt5/core-utils/lumina-config/mainWindow.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src-qt5/core-utils/lumina-config/mainWindow.cpp') diff --git a/src-qt5/core-utils/lumina-config/mainWindow.cpp b/src-qt5/core-utils/lumina-config/mainWindow.cpp index 8b021d35..3e843354 100644 --- a/src-qt5/core-utils/lumina-config/mainWindow.cpp +++ b/src-qt5/core-utils/lumina-config/mainWindow.cpp @@ -26,7 +26,7 @@ mainWindow::mainWindow() : QMainWindow(), ui(new Ui::mainWindow()){ backShortcut = new QShortcut(Qt::Key_Escape, this); connect(backShortcut, SIGNAL(activated()), this, SLOT(on_actionBack_triggered()) ); quitShortcut = new QShortcut(Qt::CTRL + Qt::Key_Q, this); - connect(quitShortcut, SIGNAL(activated()), this, SLOT(on_quitShortcut_Triggered()) ); + connect(quitShortcut, SIGNAL(activated()), this, SLOT(quitShortcut_Triggered()) ); setupIcons(); loadMonitors(); //changePage(""); //load the default main page @@ -109,7 +109,6 @@ void mainWindow::changePage(QString id){ page->setPreviousPage(oldpage); //Now update this UI a bit based on page settings ui->actionMonitor->setVisible( page->needsScreenSelector() && ui->actionMonitor->menu()->actions().length()>1 ); - this->showNormal(); } //================ @@ -147,7 +146,7 @@ void mainWindow::on_actionBack_triggered(){ else{ page_change(""); } //Use the interactive wrapper (check for save state, etc). } -void mainWindow::on_quitShortcut_Triggered(){ +void mainWindow::quitShortcut_Triggered(){ QApplication::quit(); } -- cgit