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

* call containmentConstraintsChanged appropriately

Browse Source 
* don't use another bool to maintain the state of stretched borders

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=738504
This commit is contained in:
Aaron J. Seigo 2007-11-19 01:21:41 +00:00
parent 4b8f4092a0
commit 67b7161912
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
applet.cpp
View File

@ -233,7 +233,7 @@ public:
background->paint(&p, QRect(leftOffset, bottomOffset, leftWidth, bottomHeight), "bottomleft");
background->paint(&p, QRect(rightOffset, bottomOffset, rightWidth, bottomHeight), "bottomright");
if (stretchBackgroundBorders) {
if (background->elementExists("hint-stretch-borders")) {
background->paint(&p, QRect(leftOffset, contentTop, leftWidth, contentHeight), "left");
background->paint(&p, QRect(rightOffset, contentTop, rightWidth, contentHeight), "right");
background->paint(&p, QRect(contentLeft, topOffset, contentWidth, topHeight), "top");
@ -354,7 +354,6 @@ public:
QStringList loadedEngines;
static uint s_maxAppletId;
Plasma::Svg *background;
bool stretchBackgroundBorders;
Plasma::LineEdit *failureText;
ScriptEngine* scriptEngine;
ConfigXml* configXml;
@ -585,7 +584,6 @@ void Applet::setDrawStandardBackground(bool drawBackground)
if (drawBackground) {
if (!d->background) {
d->background = new Plasma::Svg("widgets/background");
d->stretchBackgroundBorders = d->background->elementExists("hint-stretch-borders");
updateGeometry();
}
} else if (d->background) {
@ -693,10 +691,15 @@ void Applet::flushUpdatedConstraints()
Plasma::Constraints c = d->pendingConstraints;
d->pendingConstraints = NoConstraint;
Containment* containment = qobject_cast<Plasma::Containment*>(this);
if (c & Plasma::FormFactorConstraint) {
FormFactor f = formFactor();
setShadowShown(f == Planar);
setDrawStandardBackground(qobject_cast<Containment*>(this) == 0 && f != Vertical && f != Horizontal);
setDrawStandardBackground(!containment && f != Vertical && f != Horizontal);
}
if (isContainment() && containment) {
containment->containmentConstraintsUpdated(c);
}
constraintsUpdated(c);