anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Work around X11 Windows manager limitations.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21643 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2007-11-16 17:19:46 +00:00
parent 70a25df0ee
commit ce84d0b6fc
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/frontends/qt4/GuiView.cpp
View File

@ -352,6 +352,7 @@ QMenu* GuiView::createPopupMenu()
void GuiView::init() void GuiView::init()
{ {
setMinimumSize(300, 200);
// GuiToolbars *must* be initialised before GuiMenubar. // GuiToolbars *must* be initialised before GuiMenubar.
d.toolbars_ = new GuiToolbars(*this); d.toolbars_ = new GuiToolbars(*this);
// FIXME: GuiToolbars::init() cannot be integrated in the ctor // FIXME: GuiToolbars::init() cannot be integrated in the ctor
@ -374,8 +375,15 @@ void GuiView::showEvent(QShowEvent * e)
if (lyxrc.allow_geometry_session) { if (lyxrc.allow_geometry_session) {
QSettings settings; QSettings settings;
QString const key = "view-" + QString::number(id()); 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())) if (!restoreGeometry(settings.value(key + "/geometry").toByteArray()))
setGeometry(50, 50, 690, 510); setGeometry(50, 50, 690, 510);
#endif
setIconSize(settings.value(key + "/icon_size").toSize()); setIconSize(settings.value(key + "/icon_size").toSize());
} else } else
setGeometry(50, 50, 690, 510); setGeometry(50, 50, 690, 510);
@ -407,7 +415,12 @@ void GuiView::closeEvent(QCloseEvent * close_event)
if (lyxrc.allow_geometry_session) { if (lyxrc.allow_geometry_session) {
QSettings settings; QSettings settings;
QString const key = "view-" + QString::number(id()); QString const key = "view-" + QString::number(id());
#ifdef Q_WS_X11
settings.setValue(key + "/pos", pos());
settings.setValue(key + "/size", size());
#else
settings.setValue(key + "/geometry", saveGeometry()); settings.setValue(key + "/geometry", saveGeometry());
#endif
settings.setValue(key + "/icon_size", iconSize()); settings.setValue(key + "/icon_size", iconSize());
d.toolbars_->saveToolbarInfo(); d.toolbars_->saveToolbarInfo();
} }