Enrico Forestieri wrote:
On Fri, Nov 16, 2007 at 07:24:18PM +0100, Abdelrazak Younes wrote:
AARRGHH! Here is the correct patch.
Uhm, seems to work like the previous one. However, there's a problem
with both of them. When not using -geometry, lyx comes up with a tiny
size. xwininfo tells me that it is 694x200 with the first patch, and
694x109 with the third one.
OK, I think I've solved this issue now.
Sorry, but have to leave now.
Thanks for the testing.
Abdel.
Author: younes
Date: Fri Nov 16 22:52:04 2007
New Revision: 21645
URL: http://www.lyx.org/trac/changeset/21645
Log:
Hopefully fix the ignored -geometry option under X11.
Modified:
lyx-devel/trunk/src/frontends/qt4/GuiView.cpp
Modified: lyx-devel/trunk/src/frontends/qt4/GuiView.cpp
URL:
http://www.lyx.org/trac/file/lyx-devel/trunk/src/frontends/qt4/GuiView.cpp?rev=21645
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiView.cpp (original)
+++ lyx-devel/trunk/src/frontends/qt4/GuiView.cpp Fri Nov 16 22:52:04 2007
@@ -71,6 +71,7 @@
#include <QMenu>
#include <QPainter>
#include <QPixmap>
+#include <QPoint>
#include <QPushButton>
#include <QSettings>
#include <QShowEvent>
@@ -367,26 +368,31 @@
this, SLOT(clearMessage()));
d.setBackground();
+
+ if (!lyxrc.allow_geometry_session)
+ setGeometry(50, 50, 690, 510);
+
+ // 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);
+#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)
{
- if (lyxrc.allow_geometry_session) {
- 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);
-#else
- if (!restoreGeometry(settings.value(key +
"/geometry").toByteArray()))
- setGeometry(50, 50, 690, 510);
-#endif
- setIconSize(settings.value(key + "/icon_size").toSize());
- } else
- setGeometry(50, 50, 690, 510);
+ 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.
