From 229241d7d19b48360df88fd30afff62fdc508580 Mon Sep 17 00:00:00 2001 From: Jukka Helle Date: Thu, 16 Apr 2009 13:31:08 +0300 Subject: [PATCH] Maximized window state is now handled properly. --- src/qtui/mainwin.cpp | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 258a9c0..0d14f5a 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -179,6 +179,8 @@ void MainWin::init() { // restore mainwin state restoreState(s.value("MainWinState").toByteArray()); + if(s.value("MainWinMaximized", false).toBool()) + showMaximized(); // restore locked state of docks QtUi::actionCollection("General")->action("LockLayout")->setChecked(s.value("LockLayout", false).toBool()); @@ -196,9 +198,12 @@ void MainWin::init() { MainWin::~MainWin() { QtUiSettings s; - s.setValue("MainWinSize", size()); - s.setValue("MainWinPos", pos()); + if(!isMaximized()) { + s.setValue("MainWinSize", size()); + s.setValue("MainWinPos", pos()); + } s.setValue("MainWinState", saveState()); + s.setValue("MainWinMaximized", isMaximized()); } void MainWin::updateIcon() { @@ -965,17 +970,16 @@ void MainWin::on_actionDebugLog_triggered() { void MainWin::saveStateToSession(const QString &sessionId) { return; SessionSettings s(sessionId); - - s.setValue("MainWinSize", size()); - s.setValue("MainWinPos", pos()); - s.setValue("MainWinState", saveState()); + saveStateToSessionSettings(s); } -void MainWin::saveStateToSessionSettings(SessionSettings & s) -{ - s.setValue("MainWinSize", size()); - s.setValue("MainWinPos", pos()); +void MainWin::saveStateToSessionSettings(SessionSettings & s) { + if(!isMaximized()) { + s.setValue("MainWinSize", size()); + s.setValue("MainWinPos", pos()); + } s.setValue("MainWinState", saveState()); + s.setValue("MainWinMaximized", isMaximized()); } void MainWin::showStatusBarMessage(const QString &message) { -- 1.6.1.9.g97c34