From 0b478a22bfd5134dd6f43b5e4ade3ebacd8777f1 Mon Sep 17 00:00:00 2001 From: Guillaume Melquiond Date: Sun, 21 Oct 2007 19:05:56 +0000 Subject: Changed to use default values when restoring missing settings. --- src/gui/window.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/gui/window.cpp') diff --git a/src/gui/window.cpp b/src/gui/window.cpp index f8d4a503..1509ac92 100644 --- a/src/gui/window.cpp +++ b/src/gui/window.cpp @@ -525,13 +525,17 @@ void Window::loadWindowState(std::string const &name) { mConfigName = name; - setPosition((int) config.getValue(name + "WinX", getX()), - (int) config.getValue(name + "WinY", getY())); + setPosition((int) config.getValue(name + "WinX", mDefaultX), + (int) config.getValue(name + "WinY", mDefaultY)); if (mGrip) { - setSize((int) config.getValue(name + "WinWidth", getWidth()), - (int) config.getValue(name + "WinHeight", getHeight())); + setSize((int) config.getValue(name + "WinWidth", mDefaultWidth), + (int) config.getValue(name + "WinHeight", mDefaultHeight)); + } + else + { + setSize(mDefaultWidth, mDefaultHeight); } } @@ -542,9 +546,6 @@ void Window::setDefaultSize(int defaultX, int defaultY, mDefaultY = defaultY; mDefaultWidth = defaultWidth; mDefaultHeight = defaultHeight; - - setPosition(mDefaultX, mDefaultY); - setContentSize(mDefaultWidth, mDefaultHeight); } void Window::resetToDefaultSize() -- cgit v1.2.3-70-g09d2