yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not calculate window mask from svg when compositing is active as it's not needed and speeds up resizing.

Browse source 
And correctly paint themes not providing an opaque element (which they should provide for the window mask) when compositing is not active.

svn path=/trunk/KDE/kdebase/workspace/; revision=994961
This commit is contained in:
Martin Gräßlin 2009-07-11 16:33:51 +00:00
parent 9f43aaa1e1
commit 70a4878fbb
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
clients/aurorae/src/aurorae.cpp
View file

@ -661,10 +661,16 @@ void AuroraeClient::paintEvent(QPaintEvent *event)
}
QRectF sourceRect = rect;
if (!compositingActive()) {
rect = QRectF(conf.paddingLeft(), conf.paddingTop(),
widget()->width()-conf.paddingRight()-conf.paddingLeft(),
widget()->height()-conf.paddingBottom()-conf.paddingTop());
sourceRect = QRectF(0.0, 0.0, rect.width(), rect.height());
if (frame->hasElementPrefix("decoration-opaque")) {
rect = QRectF(conf.paddingLeft(), conf.paddingTop(),
widget()->width()-conf.paddingRight()-conf.paddingLeft(),
widget()->height()-conf.paddingBottom()-conf.paddingTop());
sourceRect = QRectF(0.0, 0.0, rect.width(), rect.height());
}
else {
rect = QRectF(conf.paddingLeft(), conf.paddingTop(), widget()->width(), widget()->height());
sourceRect = rect;
}
}
frame->resizeFrame(rect.size());
frame->paintFrame(&painter, rect, sourceRect);
@ -685,7 +691,7 @@ void AuroraeClient::updateWindowShape()
int w=widget()->width();
int h=widget()->height();
if (maximized) {
if (maximized || compositingActive()) {
QRegion mask(0,0,w,h);
setMask(mask);
return;
@ -695,7 +701,9 @@ void AuroraeClient::updateWindowShape()
Plasma::FrameSvg *deco = AuroraeFactory::instance()->frame();
if (!deco->hasElementPrefix("decoration-opaque")) {
// opaque element is missing: set generic mask
QRegion mask(0,0,w,h);
w = w - conf.paddingLeft() - conf.paddingRight();
h = h - conf.paddingTop() - conf.paddingBottom();
QRegion mask(conf.paddingLeft(),conf.paddingTop(),w,h);
setMask(mask);
return;
}