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

this one had me scratching my head for a while: applets that are also containments, but which are not currently being *used* as containments need to have the containment they are in's form factor returned from formFactor, not their own (which probably not set at that point anyways =)

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=747861
This commit is contained in:
Aaron J. Seigo 2007-12-13 06:27:23 +00:00
parent 593ae4a10e
commit cdceb6531a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
containment.cpp
View File

@ -345,9 +345,13 @@ void Containment::setFormFactor(FormFactor formFactor)
FormFactor Containment::formFactor() const FormFactor Containment::formFactor() const
{ {
if (isContainment()) {
return d->formFactor; return d->formFactor;
} }
return Applet::formFactor();
}
void Containment::setLocation(Location location) void Containment::setLocation(Location location)
{ {
if (d->location == location) { if (d->location == location) {
@ -663,6 +667,8 @@ bool Containment::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
//kDebug() << "got hoverenterEvent" << d->immutable << " " << applet->isImmutable(); //kDebug() << "got hoverenterEvent" << d->immutable << " " << applet->isImmutable();
if (!d->immutable && !applet->isImmutable() && !corona()->isImmutable() && !d->handles.contains(applet)) { if (!d->immutable && !applet->isImmutable() && !corona()->isImmutable() && !d->handles.contains(applet)) {
//kDebug() << "generated applet handle"; //kDebug() << "generated applet handle";
//TODO: there should be a small delay on showing these. they pop up too quickly/easily
// right now
AppletHandle *handle = new AppletHandle(this, applet); AppletHandle *handle = new AppletHandle(this, applet);
d->handles[applet] = handle; d->handles[applet] = handle;
connect(handle, SIGNAL(disappearDone(AppletHandle*)), connect(handle, SIGNAL(disappearDone(AppletHandle*)),