load and restore correct windows postion

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14103 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt3/QtView.C b/src/frontends/qt3/QtView.C
index 843f609c1a552046d1484291a722cf5c9e5214f0..69c43f95d7d034639541bcb1e744f4301dbe4237 100644 (file)
--- a/src/frontends/qt3/QtView.C
+++ b/src/frontends/qt3/QtView.C
@@ -55,14 +55,9 @@ int const statusbar_timer_value = 3000;
 
 
 
-QtView::QtView(unsigned int width, unsigned int height, bool maximize)
+QtView::QtView(unsigned int width, unsigned int height)
        : QMainWindow(), LyXView(), commandbuffer_(0)
 {
-       resize(width, height);
-       
-       if (maximize)
-               this->setWindowState(WindowMaximized);
-
        qApp->setMainWidget(this);
 
        bufferview_.reset(new BufferView(this, width, height));
@@ -163,15 +158,16 @@ bool QtView::hasFocus() const
 
 void QtView::closeEvent(QCloseEvent *)
 {
-       LyX::ref().session().saveSessionInfo("WindowIsMaximized", (this->isMaximized() ? "yes" : "no"));
+       Session & session = LyX::ref().session();
+       session.saveSessionInfo("WindowIsMaximized", (isMaximized() ? "yes" : "no"));
        // don't save maximized values
-       this->showNormal();
+       showNormal();
        // save windows size and position
-       LyX::ref().session().saveSessionInfo("WindowWidth", convert<string>(width()));
-       LyX::ref().session().saveSessionInfo("WindowHeight", convert<string>(height()));
+       session.saveSessionInfo("WindowWidth", convert<string>(width()));
+       session.saveSessionInfo("WindowHeight", convert<string>(height()));
        if (lyxrc.geometry_xysaved) {
-               LyX::ref().session().saveSessionInfo("WindowPosX", convert<string>(x()));
-               LyX::ref().session().saveSessionInfo("WindowPosY", convert<string>(y()));
+               session.saveSessionInfo("WindowPosX", convert<string>(x()));
+               session.saveSessionInfo("WindowPosY", convert<string>(y()));
        }
        // trigger LFUN_LYX_QUIT instead of quit directly
        // since LFUN_LYX_QUIT may have more cleanup stuff

diff --git a/src/frontends/qt3/QtView.h b/src/frontends/qt3/QtView.h
index eab76c803f0fc78e0ad8a0498775c060606ae942..35737fa4752ea9807272d7c05769d44d32418328 100644 (file)
--- a/src/frontends/qt3/QtView.h
+++ b/src/frontends/qt3/QtView.h
@@ -37,7 +37,7 @@ class QtView : public QMainWindow, public LyXView {
        Q_OBJECT
 public:
        /// create a main window of the given dimensions
-       QtView(unsigned int w, unsigned int h, bool maximize);
+       QtView(unsigned int w, unsigned int h);
 
        ~QtView();