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

Revert "Fix taskbar flicking when opening Plasma popups"

Browse Source 
Causes a problem I missed.
This commit is contained in:
David Edmundson 2016-03-15 16:07:13 +00:00
parent 917b2768a8
commit a9c1427eb1
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/plasmaquick/dialog.cpp
View File

@ -1071,7 +1071,9 @@ void Dialog::showEvent(QShowEvent *event)
bool Dialog::event(QEvent *event)
{
if (event->type() == QEvent::Show) {
if (event->type() == QEvent::Expose) {
KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager);
} else if (event->type() == QEvent::Show) {
d->updateVisibility(true);
} else if (event->type() == QEvent::Hide) {
d->updateVisibility(false);
@ -1169,18 +1171,7 @@ bool Dialog::event(QEvent *event)
}
}
bool rc = QQuickWindow::event(event);
/*
* qxcbwindow resets WM_STATE to only the flags that Qt supports
* disacarding all other atoms just before it maps the window. We need to set additional flags afterwards.
* Can be moved to the constructor after https://codereview.qt-project.org/#/c/149013/ is merged.
*/
if (event->type() == QEvent::Show) {
KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager);
}
return rc;
return QQuickWindow::event(event);
}
void Dialog::hideEvent(QHideEvent *event)