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

Erase white frame in fullscreen mode.

Browse Source 
Since Qt 5.9.4 one can't set negative margins unless explicitely
allowed by a new flag. This brought back the white frame in
fullscreen mode.

https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg214002.html
This commit is contained in:
Pavel Sanda 2020-11-21 15:34:26 +01:00
parent 916ceeba12
commit 4eb791ff18
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/qt/GuiView.cpp
View File

@ -1399,6 +1399,10 @@ bool GuiView::event(QEvent * e)
} }
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 > 0x050903
//Qt's 5.9.4 ba44cdae38406c safe area measures won't allow us to go negative in margins
setAttribute(Qt::WA_ContentsMarginsRespectsSafeArea, false);
#endif
setContentsMargins(-2, -2, -2, -2); setContentsMargins(-2, -2, -2, -2);
// bug 5274 // bug 5274
hideDialogs("prefs", nullptr); hideDialogs("prefs", nullptr);
@ -1417,6 +1421,9 @@ bool GuiView::event(QEvent * e)
} }
for (int i = 0; i != d.splitter_->count(); ++i) for (int i = 0; i != d.splitter_->count(); ++i)
d.tabWorkArea(i)->setFullScreen(false); d.tabWorkArea(i)->setFullScreen(false);
#if QT_VERSION > 0x050903
setAttribute(Qt::WA_ContentsMarginsRespectsSafeArea, true);
#endif
setContentsMargins(0, 0, 0, 0); setContentsMargins(0, 0, 0, 0);
} }
return result; return result;
@ -4652,8 +4659,14 @@ bool GuiView::lfunUiToggle(string const & ui_component)
//are the frames in default state? //are the frames in default state?
d.current_work_area_->setFrameStyle(QFrame::NoFrame); d.current_work_area_->setFrameStyle(QFrame::NoFrame);
if (l == 0) { if (l == 0) {
#if QT_VERSION > 0x050903
setAttribute(Qt::WA_ContentsMarginsRespectsSafeArea, false);
#endif
setContentsMargins(-2, -2, -2, -2); setContentsMargins(-2, -2, -2, -2);
} else { } else {
#if QT_VERSION > 0x050903
setAttribute(Qt::WA_ContentsMarginsRespectsSafeArea, true);
#endif
setContentsMargins(0, 0, 0, 0); setContentsMargins(0, 0, 0, 0);
} }
} else } else