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

move the popup before adjusting borders, makes it a bit less jumpy

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1109701
This commit is contained in:
Marco Martin 2010-03-31 19:48:22 +00:00
parent 8269a5055e
commit 6fc15a4687
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dialog.cpp
View File

@ -86,6 +86,7 @@ public:
void checkBorders(bool updateMaskIfNeeded);
void updateResizeCorners();
int calculateWidthForHeightAndRatio(int height, qreal ratio);
Plasma::Applet *applet();
Plasma::Dialog *q;
@ -161,6 +162,25 @@ void DialogPrivate::checkBorders()
checkBorders(true);
}
Plasma::Applet *DialogPrivate::applet()
{
Extender *extender = qobject_cast<Extender*>(graphicsWidgetPtr.data());
Plasma::Applet *applet = 0;
if (extender) {
applet = extender->d->applet;
} else if (graphicsWidgetPtr) {
QObject *pw = graphicsWidgetPtr.data();
while ((pw = pw->parent())) {
applet = dynamic_cast<Plasma::Applet *>(pw);
if (applet) {
break;
}
}
}
return applet;
}
void DialogPrivate::checkBorders(bool updateMaskIfNeeded)
{
if (resizeChecksWithBorderCheck) {
@ -172,19 +192,7 @@ void DialogPrivate::checkBorders(bool updateMaskIfNeeded)
FrameSvg::EnabledBorders borders = FrameSvg::AllBorders;
Extender *extender = qobject_cast<Extender*>(graphicsWidget);
Plasma::Applet *applet = 0;
if (extender) {
applet = extender->d->applet;
} else if (graphicsWidget) {
QObject *pw = graphicsWidget;
while ((pw = pw->parent())) {
applet = dynamic_cast<Plasma::Applet *>(pw);
if (applet) {
break;
}
}
}
Plasma::Applet *applet = this->applet();
//used to remove borders at the edge of the desktop
QDesktopWidget *desktop = QApplication::desktop();
@ -199,10 +207,6 @@ void DialogPrivate::checkBorders(bool updateMaskIfNeeded)
//decide about disabling the border attached to the panel
if (applet) {
Plasma::Corona *corona = qobject_cast<Plasma::Corona *>(applet->scene());
if (corona) {
q->move(corona->popupPosition(applet, q->size()));
}
background->getMargins(leftWidth, topHeight, rightWidth, bottomHeight);
switch (applet->location()) {
@ -561,6 +565,14 @@ void Dialog::resizeEvent(QResizeEvent *event)
d->view->setSceneRect(sceneRect);
d->view->centerOn(graphicsWidget);
}
Plasma::Applet *applet = d->applet();
if (applet) {
Plasma::Corona *corona = qobject_cast<Plasma::Corona *>(applet->scene());
if (corona) {
move(corona->popupPosition(applet, size()));
}
}
}
void DialogPrivate::updateResizeCorners()