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

if is a dock, is on all desktops

Browse Source
This commit is contained in:
Marco Martin 2012-09-20 14:22:15 +02:00
parent f4638e3438
commit 0e1021feb1
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
declarativeimports/core/dialog.cpp
View File

@ -28,6 +28,8 @@
#include <QTimer> #include <QTimer>
#include <QLayout> #include <QLayout>
#include <KWindowSystem>
#include <Plasma/Corona> #include <Plasma/Corona>
#include <Plasma/Dialog> #include <Plasma/Dialog>
#include <Plasma/WindowEffects> #include <Plasma/WindowEffects>
@ -409,6 +411,11 @@ bool DialogProxy::eventFilter(QObject *watched, QEvent *event)
} }
} else if (watched == m_dialog && event->type() == QEvent::Show) { } else if (watched == m_dialog && event->type() == QEvent::Show) {
Plasma::WindowEffects::slideWindow(m_dialog, m_location); Plasma::WindowEffects::slideWindow(m_dialog, m_location);
if (m_dialog->testAttribute(Qt::WA_X11NetWmWindowTypeDock)) {
KWindowSystem::setOnAllDesktops(m_dialog->winId(), true);
} else {
KWindowSystem::setOnAllDesktops(m_dialog->winId(), false);
}
emit visibleChanged(); emit visibleChanged();
} else if (watched == m_dialog && event->type() == QEvent::Hide) { } else if (watched == m_dialog && event->type() == QEvent::Hide) {
Plasma::WindowEffects::slideWindow(m_dialog, m_location); Plasma::WindowEffects::slideWindow(m_dialog, m_location);
@ -426,6 +433,12 @@ bool DialogProxy::eventFilter(QObject *watched, QEvent *event)
void DialogProxy::setAttribute(int attribute, bool on) void DialogProxy::setAttribute(int attribute, bool on)
{ {
m_dialog->setAttribute((Qt::WidgetAttribute)attribute, on); m_dialog->setAttribute((Qt::WidgetAttribute)attribute, on);
if (attribute == Qt::WA_X11NetWmWindowTypeDock) {
KWindowSystem::setOnAllDesktops(m_dialog->winId(), true);
} else {
KWindowSystem::setOnAllDesktops(m_dialog->winId(), false);
}
} }
#include "dialog.moc" #include "dialog.moc"