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

harmonize this code a bit

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1022541
This commit is contained in:
Aaron J. Seigo 2009-09-12 00:18:57 +00:00
parent b5d5a9a924
commit 6297027cba
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
popupapplet.cpp
View File

@ -623,8 +623,8 @@ void PopupAppletPrivate::updateDialogPosition()
KConfigGroup *mainGroup = static_cast<Applet*>(q)->d->mainConfigGroup(); KConfigGroup *mainGroup = static_cast<Applet*>(q)->d->mainConfigGroup();
KConfigGroup sizeGroup(mainGroup, "PopupApplet"); KConfigGroup sizeGroup(mainGroup, "PopupApplet");
Q_ASSERT(q->containment()); Corona *corona = qobject_cast<Corona *>(q->scene());
Q_ASSERT(q->containment()->corona()); Q_ASSERT(corona);
int preferredWidth = 0; int preferredWidth = 0;
int preferredHeight = 0; int preferredHeight = 0;
@ -634,9 +634,9 @@ void PopupAppletPrivate::updateDialogPosition()
} }
const int width = qMin(sizeGroup.readEntry("DialogWidth", preferredWidth), const int width = qMin(sizeGroup.readEntry("DialogWidth", preferredWidth),
q->containment()->corona()->screenGeometry(-1).width() - 50); corona->screenGeometry(-1).width() - 50);
const int height = qMin(sizeGroup.readEntry("DialogHeight", preferredHeight), const int height = qMin(sizeGroup.readEntry("DialogHeight", preferredHeight),
q->containment()->corona()->screenGeometry(-1).height() - 50); corona->screenGeometry(-1).height() - 50);
QSize saved(width, height); QSize saved(width, height);
@ -653,11 +653,7 @@ void PopupAppletPrivate::updateDialogPosition()
QSize s = dialog->size(); QSize s = dialog->size();
QPoint pos = view->mapFromScene(q->scenePos()); QPoint pos = view->mapFromScene(q->scenePos());
//try to access a corona
Corona *corona = qobject_cast<Corona *>(q->scene());
if (corona) {
pos = corona->popupPosition(q, s); pos = corona->popupPosition(q, s);
}
bool reverse = false; bool reverse = false;
if (q->formFactor() == Plasma::Vertical) { if (q->formFactor() == Plasma::Vertical) {