Hopefully fix the ignored -geometry option under X11.

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

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 2ae1a13d6e7744ceb890c595616fb47f391efaba..ebd6ad54fb3cbc4871aa30b1eef9cefa9e34a3b2 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -71,6 +71,7 @@
 #include <QMenu>
 #include <QPainter>
 #include <QPixmap>
+#include <QPoint>
 #include <QPushButton>
 #include <QSettings>
 #include <QShowEvent>
@@ -367,26 +368,31 @@ void GuiView::init()
                this, SLOT(clearMessage()));
 
        d.setBackground();
-}
 
+       if (!lyxrc.allow_geometry_session)
+               setGeometry(50, 50, 690, 510);
 
-void GuiView::showEvent(QShowEvent * e)
-{
-       if (lyxrc.allow_geometry_session) {
-               QSettings settings;
-               QString const key = "view-" + QString::number(id());
+       // Now take care of session management.
+       QSettings settings;
+       QString const key = "view-" + QString::number(id());
 #ifdef Q_WS_X11
-               QPoint pos = settings.value(key + "/pos", QPoint(50, 50)).toPoint();
-               QSize size = settings.value(key + "/size", QSize(690, 510)).toSize();
-               resize(size);
-               move(pos);
+       QPoint pos = settings.value(key + "/pos", QPoint(50, 50)).toPoint();
+       QSize size = settings.value(key + "/size", QSize(690, 510)).toSize();
+       resize(size);
+       move(pos);
 #else
-               if (!restoreGeometry(settings.value(key + "/geometry").toByteArray()))
-                       setGeometry(50, 50, 690, 510);
-#endif
-               setIconSize(settings.value(key + "/icon_size").toSize());
-       } else
+       if (!restoreGeometry(settings.value(key + "/geometry").toByteArray()))
                setGeometry(50, 50, 690, 510);
+#endif
+       setIconSize(settings.value(key + "/icon_size").toSize());
+}
+
+
+void GuiView::showEvent(QShowEvent * e)
+{
+       LYXERR(Debug::GUI, "Passed Geometry "
+               << size().height() << "x" << size().width()
+               << "+" << pos().x() << "+" << pos().y());
 
        if (d.splitter_->count() == 0)
                // No work area, switch to the background widget.