SVN_SILENT: tidying
svn path=/trunk/KDE/kdelibs/; revision=1123295
This commit is contained in:
parent
e6e20afd70
commit
2c1d53204d
@ -740,6 +740,7 @@ QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s, Qt::Alig
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (loc) {
|
switch (loc) {
|
||||||
case BottomEdge:
|
case BottomEdge:
|
||||||
pos.setY(v->geometry().y() - s.height());
|
pos.setY(v->geometry().y() - s.height());
|
||||||
@ -770,7 +771,6 @@ QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s, Qt::Alig
|
|||||||
QRect screenRect = screenGeometry(screen);
|
QRect screenRect = screenGeometry(screen);
|
||||||
//kDebug() << "==> rect for" << screen << "is" << screenRect;
|
//kDebug() << "==> rect for" << screen << "is" << screenRect;
|
||||||
|
|
||||||
|
|
||||||
if (loc != LeftEdge && pos.x() + s.width() > screenRect.right()) {
|
if (loc != LeftEdge && pos.x() + s.width() > screenRect.right()) {
|
||||||
pos.rx() -= ((pos.x() + s.width()) - screenRect.right());
|
pos.rx() -= ((pos.x() + s.width()) - screenRect.right());
|
||||||
}
|
}
|
||||||
@ -780,7 +780,6 @@ QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s, Qt::Alig
|
|||||||
}
|
}
|
||||||
|
|
||||||
pos.rx() = qMax(0, pos.x());
|
pos.rx() = qMax(0, pos.x());
|
||||||
|
|
||||||
return pos;
|
return pos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user