alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set type to Dialog in flags if type is Dialog::Normal

Browse Source
This commit is contained in:
Niccolò Venerandi 2020-08-02 10:24:36 +00:00
parent 74de953ce6
commit 3caaaae585
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plasmaquick/dialog.cpp
View File

@ -1095,6 +1095,8 @@ QObject *Dialog::margins() const
void Dialog::setFramelessFlags(Qt::WindowFlags flags) void Dialog::setFramelessFlags(Qt::WindowFlags flags)
{ {
if (d->type == Dialog::Normal)
flags |= Qt::Dialog;
setFlags(Qt::FramelessWindowHint | flags); setFlags(Qt::FramelessWindowHint | flags);
d->applyType(); d->applyType();
emit flagsChanged(); emit flagsChanged();
@ -1179,7 +1181,7 @@ void Dialog::focusOutEvent(QFocusEvent *ev)
} }
const QWindow *focusWindow = QGuiApplication::focusWindow(); const QWindow *focusWindow = QGuiApplication::focusWindow();
bool childHasFocus = focusWindow && ((focusWindow->isActive() && isAncestorOf(focusWindow)) || focusWindow->type() & Qt::Popup); bool childHasFocus = focusWindow && ((focusWindow->isActive() && isAncestorOf(focusWindow)) || (focusWindow->type() & Qt::Popup) == Qt::Popup);
const bool viewClicked = qobject_cast<const KQuickAddons::QuickViewSharedEngine *>(focusWindow) || qobject_cast<const View *>(focusWindow) || qobject_cast<const ConfigView *>(focusWindow); const bool viewClicked = qobject_cast<const KQuickAddons::QuickViewSharedEngine *>(focusWindow) || qobject_cast<const View *>(focusWindow) || qobject_cast<const ConfigView *>(focusWindow);