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

* initConstraints -> loadConstraints, since that's actually what it does

Browse Source 
* turn off the background right away in containments to avoid getting size hints with the boundaries!

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=737709
This commit is contained in:
Aaron J. Seigo 2007-11-17 03:31:25 +00:00
parent d239ceb342
commit 47130fbba5
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
containment.cpp
View File

@ -86,6 +86,7 @@ Containment::Containment(QObject* parent, const QVariantList& args)
: Applet(parent, args),
d(new Private)
{
setDrawStandardBackground(false);
}
Containment::~Containment()
@ -100,14 +101,13 @@ void Containment::init()
setFlag(QGraphicsItem::ItemClipsChildrenToShape, false);
setAcceptDrops(true);
setAcceptsHoverEvents(true);
setDrawStandardBackground(false);
//TODO: would be nice to not do this on init, as it causes Phase to init
connect(Phase::self(), SIGNAL(animationComplete(QGraphicsItem*,Plasma::Phase::Animation)),
this, SLOT(appletAnimationComplete(QGraphicsItem*,Plasma::Phase::Animation)));
}
void Containment::initConstraints(KConfigGroup* group)
void Containment::loadConstraints(KConfigGroup* group)
{
/* kDebug() << "!!!!!!!!!!!!initConstraints" << group->name() << type();
kDebug() << " location:" << group->readEntry("location", (int)d->location);
@ -308,10 +308,6 @@ Applet* Containment::addApplet(const QString& name, const QVariantList& args, ui
applet->setGeometry(QRectF(QPointF((width / 2) - (appletWidth / 2), (height / 2) - (appletHeight / 2)), size));
}
if (layout()) {
layout()->addItem(applet);
}
kDebug() << applet->name() << "sizehint:" << applet->sizeHint()
<< "geometry:" << applet->geometry();
@ -353,7 +349,7 @@ void Containment::appletAnimationComplete(QGraphicsItem *item, Plasma::Phase::An
}
}
} else if (anim == Phase::Appear) {
if (type()==DesktopContainment) {
if (type() == DesktopContainment) {
item->installSceneEventFilter(this);
}
}

2
containment.h
View File

@ -193,7 +193,7 @@ class PLASMA_EXPORT Containment : public Applet
/**
* @internal
*/
void initConstraints(KConfigGroup* group);
void loadConstraints(KConfigGroup* group);
/**
* Emits the launchActivated() signal

2
corona.cpp
View File

@ -157,7 +157,7 @@ void Corona::loadApplets(const QString& configname)
if (c) {
addItem(c);
containments.insert(c->id(), c);
c->initConstraints(&appletConfig);
c->loadConstraints(&appletConfig);
//kDebug() << "Containment" << c->id() << "geometry is" << c->geometry().toRect() << "config'd with" << appletConfig.name();
}
} else {