don't try to set StandardBackground if FormFactor is Horizontal or

Vertical
this fixes the panel layout on the first load when there is no
plasma-appletsrc

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=802089
This commit is contained in:
Marco Martin 2008-04-28 14:18:19 +00:00
parent cdb840d200
commit dfa4623a68

View File

@ -931,13 +931,13 @@ void Applet::flushPendingConstraintsEvents()
// normally doesn't request a background would then get one! // normally doesn't request a background would then get one!
if (f == Planar) { if (f == Planar) {
setBackgroundHints(d->backgroundHints|ShadowedBackground); setBackgroundHints(d->backgroundHints|ShadowedBackground);
} else { } else if (d->backgroundHints&ShadowedBackground) {
setBackgroundHints(d->backgroundHints^ShadowedBackground); setBackgroundHints(d->backgroundHints^ShadowedBackground);
} }
if (!isContainment() && f != Vertical && f != Horizontal) { if (!isContainment() && f != Vertical && f != Horizontal) {
setBackgroundHints(d->backgroundHints|StandardBackground); setBackgroundHints(d->backgroundHints|StandardBackground);
} else { } else if(d->backgroundHints&StandardBackground) {
setBackgroundHints(d->backgroundHints^StandardBackground); setBackgroundHints(d->backgroundHints^StandardBackground);
} }
} }