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

geometry, not boundingRect. fixes the other remaining cause of looping when arranging multiple containments

Browse Source 
BUG:163477

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=820061
This commit is contained in:
Aaron J. Seigo 2008-06-13 05:23:02 +00:00
parent 795129a4ad
commit 2157ab1356
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
containment.cpp
View File

@ -390,7 +390,7 @@ void Containment::contextMenuEvent(QGraphicsSceneContextMenuEvent* event)
QAction* closeApplet = applet->d->actions.action("remove"); QAction* closeApplet = applet->d->actions.action("remove");
if (!closeApplet) { //unlikely but not impossible if (!closeApplet) { //unlikely but not impossible
kDebug() << "wtf!! no remove action!!!!!!!!"; kDebug() << "no remove action!!!!!!!!";
closeApplet = new QAction(i18n("Remove this %1", applet->name()), &desktopMenu); closeApplet = new QAction(i18n("Remove this %1", applet->name()), &desktopMenu);
closeApplet->setIcon(KIcon("edit-delete")); closeApplet->setIcon(KIcon("edit-delete"));
connect(closeApplet, SIGNAL(triggered(bool)), applet, SLOT(destroy())); connect(closeApplet, SIGNAL(triggered(bool)), applet, SLOT(destroy()));
@ -768,7 +768,7 @@ void Containment::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
void Containment::keyPressEvent(QKeyEvent *event) void Containment::keyPressEvent(QKeyEvent *event)
{ {
kDebug() << "keyPressEvent with" << event->key() << "and hoping and wishing for a" << Qt::Key_Tab; //kDebug() << "keyPressEvent with" << event->key() << "and hoping and wishing for a" << Qt::Key_Tab;
if (event->key() == Qt::Key_Tab) { // && event->modifiers() == 0) { if (event->key() == Qt::Key_Tab) { // && event->modifiers() == 0) {
if (!d->applets.isEmpty()) { if (!d->applets.isEmpty()) {
kDebug() << "let's give focus to...." << (QObject*)d->applets.first(); kDebug() << "let's give focus to...." << (QObject*)d->applets.first();
@ -782,12 +782,12 @@ bool Containment::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
Applet *applet = qgraphicsitem_cast<Applet*>(watched); Applet *applet = qgraphicsitem_cast<Applet*>(watched);
// Otherwise we're watching something we shouldn't be... // Otherwise we're watching something we shouldn't be...
//kDebug() << "got sceneEvent";
Q_ASSERT(applet!=0); Q_ASSERT(applet!=0);
if (!d->applets.contains(applet)) { if (!d->applets.contains(applet)) {
return false; return false;
} }
//kDebug() << "got sceneEvent";
switch (event->type()) { switch (event->type()) {
case QEvent::GraphicsSceneHoverEnter: case QEvent::GraphicsSceneHoverEnter:
//kDebug() << "got hoverenterEvent" << immutability() << " " << applet->immutability(); //kDebug() << "got hoverenterEvent" << immutability() << " " << applet->immutability();
@ -824,7 +824,6 @@ bool Containment::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
QVariant Containment::itemChange(GraphicsItemChange change, const QVariant &value) QVariant Containment::itemChange(GraphicsItemChange change, const QVariant &value)
{ {
Q_UNUSED(value)
//FIXME if the applet is moved to another containment we need to unfocus it //FIXME if the applet is moved to another containment we need to unfocus it
if (isContainment() && if (isContainment() &&
@ -958,7 +957,6 @@ void Containment::Private::focusApplet(Plasma::Applet *applet)
void Containment::focusNextApplet() void Containment::focusNextApplet()
{ {
kDebug();
if (d->applets.isEmpty()) { if (d->applets.isEmpty()) {
return; return;
} }
@ -972,7 +970,6 @@ void Containment::focusNextApplet()
void Containment::focusPreviousApplet() void Containment::focusPreviousApplet()
{ {
kDebug();
if (d->applets.isEmpty()) { if (d->applets.isEmpty()) {
return; return;
} }
@ -1312,7 +1309,9 @@ void Containment::Private::positionContainment()
Containment *containment = it.next(); Containment *containment = it.next();
if (q->collidesWithItem(containment)) { if (q->collidesWithItem(containment)) {
shift = containment->boundingRect().right(); shift = containment->geometry().right();
/*kDebug() << (QObject*)q << "collides with" << (QObject*)containment
<< containment->geometry() << "so shift to: " << shift;*/
//TODO: is it safe to remove a containment once we've //TODO: is it safe to remove a containment once we've
// collided with it? // collided with it?
break; break;
@ -1339,8 +1338,8 @@ void Containment::Private::positionContainment()
topLeft.setX(shift + INTER_CONTAINMENT_MARGIN); topLeft.setX(shift + INTER_CONTAINMENT_MARGIN);
} }
kDebug() << "trying at" << topLeft;
q->setPos(topLeft); q->setPos(topLeft);
//kDebug() << "trying at" << topLeft << q->geometry();
//kDebug() << collidingItems().count() << collidingItems()[0] << (QGraphicsItem*)this; //kDebug() << collidingItems().count() << collidingItems()[0] << (QGraphicsItem*)this;
} }