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

* unify the code that positions the message overlay

Browse Source 
* always use contentsRect(), never geometry or boundingRect; this prevents how it sometimes overlaps the borders of applets
* always make sure that the zOrder is set, not just in the non-popup case

svn path=/trunk/KDE/kdelibs/; revision=1015154
This commit is contained in:
Aaron J. Seigo 2009-08-24 17:27:24 +00:00
parent 54f76aa0ea
commit 7890d0c816
3 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
applet.cpp
View File

@ -507,38 +507,57 @@ void AppletPrivate::createMessageOverlay(bool usePopup)
PopupApplet *popup = qobject_cast<Plasma::PopupApplet*>(q);
if (!messageOverlay) {
if (usePopup && popup && popup->widget()) {
messageOverlayProxy = new QGraphicsProxyWidget(q);
messageOverlayProxy->setWidget(popup->widget());
messageOverlay = new AppletOverlayWidget(messageOverlayProxy);
} else if (usePopup && popup && popup->graphicsWidget() &&
popup->graphicsWidget() != extender) {
messageOverlay = new AppletOverlayWidget(popup->graphicsWidget());
} else {
if (usePopup && popup) {
if (popup->widget()) {
messageOverlayProxy = new QGraphicsProxyWidget(q);
messageOverlayProxy->setWidget(popup->widget());
messageOverlay = new AppletOverlayWidget(messageOverlayProxy);
} else if (popup->graphicsWidget() &&
popup->graphicsWidget() != extender) {
messageOverlay = new AppletOverlayWidget(popup->graphicsWidget());
}
}
if (!messageOverlay) {
messageOverlay = new AppletOverlayWidget(q);
}
}
if (usePopup && popup && popup->widget()) {
positionMessageOverlay();
}
void AppletPrivate::positionMessageOverlay()
{
if (!messageOverlay) {
return;
}
PopupApplet *popup = qobject_cast<Plasma::PopupApplet*>(q);
const bool usePopup = popup && messageOverlay->parentItem() == q;
QGraphicsItem *topItem = q;
if (usePopup && popup->widget()) {
// popupapplet with widget()
topItem = popup->d->proxy;
messageOverlay->setGeometry(popup->widget()->contentsRect());
} else if (usePopup && popup && popup->graphicsWidget() &&
popup->graphicsWidget() != extender) {
} else if (usePopup && popup->graphicsWidget() && popup->graphicsWidget() != extender) {
// popupapplet with graphicsWidget()
messageOverlay->setGeometry(popup->graphicsWidget()->boundingRect());
topItem = popup->graphicsWidget();
QGraphicsWidget *w = dynamic_cast<QGraphicsWidget *>(topItem);
messageOverlay->setGeometry(w ? w->contentsRect() : topItem->boundingRect());
} else {
// normal applet
messageOverlay->setGeometry(q->contentsRect());
// raise the overlay above all the other children!
int zValue = 100;
foreach (QGraphicsItem *child, q->QGraphicsItem::children()) {
if (child->zValue() > zValue) {
zValue = child->zValue() + 1;
}
}
messageOverlay->setZValue(zValue);
}
// raise the overlay above all the other children!
int zValue = 100;
foreach (QGraphicsItem *child, topItem->children()) {
if (child->zValue() > zValue) {
zValue = child->zValue() + 1;
}
}
messageOverlay->setZValue(zValue);
}
void AppletPrivate::destroyMessageOverlay()
@ -1101,22 +1120,7 @@ void Applet::flushPendingConstraintsEvents()
}
if (c & Plasma::SizeConstraint) {
if (d->messageOverlay) {
d->messageOverlay->setGeometry(QRectF(QPointF(0, 0), geometry().size()));
/*
QGraphicsItem *button = 0;
QList<QGraphicsItem*> children = d->messageOverlay->QGraphicsItem::children();
if (!children.isEmpty()) {
button = children.first();
}
if (button) {
QSizeF s = button->boundingRect().size();
button->setPos(d->messageOverlay->boundingRect().width() / 2 - s.width() / 2,
d->messageOverlay->boundingRect().height() / 2 - s.height() / 2);
}*/
}
d->positionMessageOverlay();
if (d->started && layout()) {
layout()->updateGeometry();

1
popupapplet.h
View File

@ -160,6 +160,7 @@ private:
Q_PRIVATE_SLOT(d, void updateDialogPosition())
friend class Applet;
friend class AppletPrivate;
friend class PopupAppletPrivate;
PopupAppletPrivate * const d;
};

1
private/applet_p.h
View File

@ -88,6 +88,7 @@ public:
void setFocus();
void cleanUpAndDelete();
void createMessageOverlay(bool usePopup = true);
void positionMessageOverlay();
void destroyMessageOverlay();
void addGlobalShortcutsPage(KConfigDialog *dialog);
void clearShortcutEditorPtr();