load and restore correct windows postion

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

diff --git a/src/frontends/qt4/QtView.C b/src/frontends/qt4/QtView.C
index b242d65444a74729a843c1089f5a119602f162fc..302f8137390bdb65d35857bd8388ffe1637e4dea 100644 (file)
--- a/src/frontends/qt4/QtView.C
+++ b/src/frontends/qt4/QtView.C
@@ -70,14 +70,9 @@ int const statusbar_timer_value = 3000;
 } // namespace anon
 
 
-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(Qt::WindowMaximized);
-
        mainWidget_ = this;
 
 //     setToolButtonStyle(Qt::ToolButtonIconOnly);
@@ -184,13 +179,15 @@ bool QtView::hasFocus() const
 
 void QtView::closeEvent(QCloseEvent *)
 {
+       QRect geometry = normalGeometry();
+       Session & session = LyX::ref().session();
        // save windows size and position
-       LyX::ref().session().saveSessionInfo("WindowWidth", convert<string>(this->normalGeometry().width()));
-       LyX::ref().session().saveSessionInfo("WindowHeight", convert<string>(this->normalGeometry().height()));
-       LyX::ref().session().saveSessionInfo("WindowIsMaximized", (this->isMaximized() ? "yes" : "no"));
+       session.saveSessionInfo("WindowWidth", convert<string>(geometry.width()));
+       session.saveSessionInfo("WindowHeight", convert<string>(geometry.height()));
+       session.saveSessionInfo("WindowIsMaximized", (isMaximized() ? "yes" : "no"));
        if (lyxrc.geometry_xysaved) {
-               LyX::ref().session().saveSessionInfo("WindowPosX", convert<string>(this->normalGeometry().x()));
-               LyX::ref().session().saveSessionInfo("WindowPosY", convert<string>(this->normalGeometry().y()));
+               session.saveSessionInfo("WindowPosX", convert<string>(geometry.x()));
+               session.saveSessionInfo("WindowPosY", convert<string>(geometry.y()));
        }
        // trigger LFUN_LYX_QUIT instead of quit directly
        // since LFUN_LYX_QUIT may have more cleanup stuff

diff --git a/src/frontends/qt4/QtView.h b/src/frontends/qt4/QtView.h
index e74d41fa3e2e0e7c94e40e9ec2c71922d4269ac1..937629dd7e77122031b73dbc0ea28c81af13486a 100644 (file)
--- a/src/frontends/qt4/QtView.h
+++ b/src/frontends/qt4/QtView.h
@@ -47,7 +47,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();