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

set window mask when composite is off

Browse Source
This commit is contained in:
Marco Martin 2014-06-10 15:22:12 +02:00
parent 15280e336f
commit 71cf5a3e9a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plasmaquick/dialog.cpp
View File

@ -75,7 +75,7 @@ public:
//SLOTS
void syncBorders();
void updateContrast();
void updateTheme();
void updateVisibility(bool visible);
void updateMinimumWidth();
@ -170,13 +170,19 @@ void DialogPrivate::syncBorders()
}
}
void DialogPrivate::updateContrast()
void DialogPrivate::updateTheme()
{
KWindowEffects::enableBackgroundContrast(q->winId(), theme.backgroundContrastEnabled(),
theme.backgroundContrast(),
theme.backgroundIntensity(),
theme.backgroundSaturation(),
frameSvgItem->frameSvg()->mask());
if (KWindowSystem::compositingActive()) {
q->setMask(QRegion());
} else {
q->setMask(frameSvgItem->frameSvg()->mask());
}
}
void DialogPrivate::updateVisibility(bool visible)
@ -355,7 +361,7 @@ void DialogPrivate::syncMainItemToSize()
syncBorders();
KWindowEffects::enableBlurBehind(q->winId(), true, frameSvgItem->frameSvg()->mask());
updateContrast();
updateTheme();
if (mainItem) {
mainItem.data()->setX(frameSvgItem->margins()->left());
@ -402,7 +408,7 @@ void DialogPrivate::syncToMainItemSize()
mainItem.data()->setX(frameSvgItem->margins()->left());
mainItem.data()->setY(frameSvgItem->margins()->top());
KWindowEffects::enableBlurBehind(q->winId(), true, frameSvgItem->frameSvg()->mask());
updateContrast();
updateTheme();
}
void DialogPrivate::requestSizeSync(bool delayed)
@ -469,7 +475,7 @@ Dialog::Dialog(QQuickItem *parent)
d->frameSvgItem->setImagePath("dialogs/background");
connect(&d->theme, SIGNAL(themeChanged()),
this, SLOT(updateContrast()));
this, SLOT(updateTheme()));
}

2
src/plasmaquick/dialog.h
View File

@ -196,7 +196,7 @@ private:
DialogPrivate *const d;
Q_PRIVATE_SLOT(d, void syncBorders())
Q_PRIVATE_SLOT(d, void updateContrast())
Q_PRIVATE_SLOT(d, void updateTheme())
Q_PRIVATE_SLOT(d, void updateVisibility(bool visible))
Q_PRIVATE_SLOT(d, void updateInputShape())