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

SVN_SILENT: get rid of some dead code; with all the api changing happening, no point in keeping stuff around that isn't compiled

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=801808
This commit is contained in:
Aaron J. Seigo 2008-04-27 20:09:20 +00:00
parent 26a01ffb64
commit 85f7ded2b4
1 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
applet.cpp
View File

@ -926,6 +926,9 @@ void Applet::flushPendingConstraintsEvents()
if (c & Plasma::FormFactorConstraint) { if (c & Plasma::FormFactorConstraint) {
FormFactor f = formFactor(); FormFactor f = formFactor();
//FIXME: this is a bit of a mess: calling setBackgroundHints twice,
// and moving an item to a non-vert/horiz containment that
// 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 {
@ -937,34 +940,6 @@ void Applet::flushPendingConstraintsEvents()
} else { } else {
setBackgroundHints(d->backgroundHints^StandardBackground); setBackgroundHints(d->backgroundHints^StandardBackground);
} }
/**
FIXME: what follows was an attempt to constrain the size of applets. it is, however,
broken for the following reasons:
* it constrains to the size of an icon, when clearly this is not valid for
any non-single-icon applet
* it is far too pessimistic for horizontal constraints
QSizeF newMax;
const QSizeF infSize(std::numeric_limits<qreal>::infinity(),
std::numeric_limits<qreal>::infinity());
if (f == Plasma::Vertical && !(expandingDirections() & Qt::Vertical)) {
newMax = QSizeF(maximumContentSize().width(), IconSize(KIconLoader::Panel));
} else if (f == Plasma::Horizontal && !(expandingDirections() & Qt::Horizontal)) {
newMax = QSizeF(IconSize(KIconLoader::Panel), maximumContentSize().height());
} else if (maximumContentSize() != infSize) {
newMax = infSize;
}
if (newMax.isValid()) {
setMaximumContentSize(newMax);
if (newMax.width() < contentSize().width() ||
newMax.height() < contentSize().height()) {
updateGeometry();
}
}
*/
} }
Containment* containment = qobject_cast<Plasma::Containment*>(this); Containment* containment = qobject_cast<Plasma::Containment*>(this);
@ -1012,12 +987,14 @@ void Applet::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QW
painter->setRenderHint(QPainter::SmoothPixmapTransform); painter->setRenderHint(QPainter::SmoothPixmapTransform);
painter->setRenderHint(QPainter::Antialiasing); painter->setRenderHint(QPainter::Antialiasing);
} }
if (d->background && if (d->background &&
formFactor() != Plasma::Vertical && formFactor() != Plasma::Vertical &&
formFactor() != Plasma::Horizontal) { formFactor() != Plasma::Horizontal) {
//kDebug() << "option rect is" << option->rect; //kDebug() << "option rect is" << option->rect;
d->background->paintPanel(painter, option->rect, QPointF(0,0)); d->background->paintPanel(painter, option->rect, QPointF(0,0));
} }
if (!d->failed) { if (!d->failed) {
if (widget && isContainment()) { if (widget && isContainment()) {
// note that the widget we get is actually the viewport of the view, not the view itself // note that the widget we get is actually the viewport of the view, not the view itself