Project

General

Profile

0001-Maximized-window-state-is-now-handled-properly.patch

Squider, 04/16/2009 01:47 PM

View differences:

src/qtui/mainwin.cpp
179 179

  
180 180
  // restore mainwin state
181 181
  restoreState(s.value("MainWinState").toByteArray());
182
  if(s.value("MainWinMaximized", false).toBool())
183
    showMaximized();
182 184

  
183 185
  // restore locked state of docks
184 186
  QtUi::actionCollection("General")->action("LockLayout")->setChecked(s.value("LockLayout", false).toBool());
......
196 198

  
197 199
MainWin::~MainWin() {
198 200
  QtUiSettings s;
199
  s.setValue("MainWinSize", size());
200
  s.setValue("MainWinPos", pos());
201
  if(!isMaximized()) {
202
    s.setValue("MainWinSize", size());
203
    s.setValue("MainWinPos", pos());
204
  }
201 205
  s.setValue("MainWinState", saveState());
206
  s.setValue("MainWinMaximized", isMaximized());
202 207
}
203 208

  
204 209
void MainWin::updateIcon() {
......
965 970
void MainWin::saveStateToSession(const QString &sessionId) {
966 971
  return;
967 972
  SessionSettings s(sessionId);
968

  
969
  s.setValue("MainWinSize", size());
970
  s.setValue("MainWinPos", pos());
971
  s.setValue("MainWinState", saveState());
973
  saveStateToSessionSettings(s);
972 974
}
973 975

  
974
void MainWin::saveStateToSessionSettings(SessionSettings & s)
975
{
976
  s.setValue("MainWinSize", size());
977
  s.setValue("MainWinPos", pos());
976
void MainWin::saveStateToSessionSettings(SessionSettings & s) {
977
  if(!isMaximized()) {
978
    s.setValue("MainWinSize", size());
979
    s.setValue("MainWinPos", pos());
980
  }
978 981
  s.setValue("MainWinState", saveState());
982
  s.setValue("MainWinMaximized", isMaximized());
979 983
}
980 984

  
981 985
void MainWin::showStatusBarMessage(const QString &message) {
982
-