mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-14 17:39:58 +00:00
backport bugfix for 5274
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@27464 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
4ece71f68d
commit
4c973bb8d4
@ -1974,6 +1974,11 @@ bool GuiView::dispatch(FuncRequest const & cmd)
|
|||||||
data = bv->cursor().getEncoding()->name();
|
data = bv->cursor().getEncoding()->name();
|
||||||
if (!data.empty())
|
if (!data.empty())
|
||||||
showDialog("symbols", data);
|
showDialog("symbols", data);
|
||||||
|
// bug 5274
|
||||||
|
} else if (name == "prefs" && isFullScreen()) {
|
||||||
|
FuncRequest fr(LFUN_INSET_INSERT, "fullscreen");
|
||||||
|
lfunUiToggle(fr);
|
||||||
|
showDialog("prefs", data);
|
||||||
} else
|
} else
|
||||||
showDialog(name, data);
|
showDialog(name, data);
|
||||||
break;
|
break;
|
||||||
@ -2142,6 +2147,8 @@ void GuiView::toggleFullScreen()
|
|||||||
menuBar()->show();
|
menuBar()->show();
|
||||||
statusBar()->show();
|
statusBar()->show();
|
||||||
} else {
|
} else {
|
||||||
|
// bug 5274
|
||||||
|
hideDialogs("prefs", 0);
|
||||||
for (int i = 0; i != d.splitter_->count(); ++i)
|
for (int i = 0; i != d.splitter_->count(); ++i)
|
||||||
d.tabWorkArea(i)->setFullScreen(true);
|
d.tabWorkArea(i)->setFullScreen(true);
|
||||||
#if QT_VERSION >= 0x040300
|
#if QT_VERSION >= 0x040300
|
||||||
|
@ -35,6 +35,7 @@ What's new
|
|||||||
|
|
||||||
* USER INTERFACE
|
* USER INTERFACE
|
||||||
|
|
||||||
|
- Fix Preferences dialog in fullscreen mode (bug 5274).
|
||||||
|
|
||||||
|
|
||||||
* WINDOWS INSTALLER
|
* WINDOWS INSTALLER
|
||||||
|
Loading…
Reference in New Issue
Block a user