Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

another take on popups

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2016-11-06 18:34:31 +00:00
parent 8556ac72f3
commit 8c3c3c0aed
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/kernel/qapplication.cpp
View file

@ -861,7 +861,7 @@ QApplication::Type QApplication::type()
QWidget *QApplication::activePopupWidget() QWidget *QApplication::activePopupWidget()
{ {
if (QApplicationPrivate::popupWidgets && !QApplicationPrivate::popupWidgets->isEmpty()) if (QApplicationPrivate::popupWidgets)
QApplicationPrivate::popupWidgets->last(); QApplicationPrivate::popupWidgets->last();
return Q_NULLPTR; return Q_NULLPTR;
} }

6
src/gui/kernel/qapplication_x11.cpp
View file

@ -4097,9 +4097,9 @@ bool QETWidget::translateMouseEvent(const XEvent *event)
if (type == 0) // don't send event if (type == 0) // don't send event
return false; return false;
QWidget *popup = qApp->activePopupWidget(); if (QApplicationPrivate::popupWidgets) { // in popup mode
if (popup) { // in popup mode QWidget *popup = QApplicationPrivate::popupWidgets->last();
QWidget *activePopupWidget = qApp->activePopupWidget(); QWidget *activePopupWidget = QApplicationPrivate::popupWidgets->last();
if (popup != this) { if (popup != this) {
if (event->type == LeaveNotify) if (event->type == LeaveNotify)
return false; return false;