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

add 1 px so that the popup appears below the item, not overlapping it by 1px

Browse Source 
BUG:210838

svn path=/trunk/KDE/kdelibs/; revision=1036298
This commit is contained in:
Aaron J. Seigo 2009-10-16 23:00:24 +00:00
parent 211a206277
commit 8bf21cc7d7
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
corona.cpp
View File

@ -655,26 +655,25 @@ QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s, Qt::Alig
break;
default:
if (pos.y() - s.height() > 0) {
pos = QPoint(pos.x(), pos.y() - s.height());
pos.ry() = pos.y() - s.height();
} else {
pos = QPoint(pos.x(), pos.y() + (int)item->boundingRect().size().height());
pos.ry() = pos.y() + (int)item->boundingRect().size().height() + 1;
}
}
//are we out of screen?
QRect screenRect =
screenGeometry((pv && pv->containment()) ? pv->containment()->screen() : -1);
QRect screenRect = screenGeometry((pv && pv->containment()) ? pv->containment()->screen() : -1);
//kDebug() << "==> rect for" << (pv ? pv->containment()->screen() : -1) << "is" << screenRect;
if (loc != LeftEdge && pos.rx() + s.width() > screenRect.right()) {
pos.rx() -= ((pos.rx() + s.width()) - screenRect.right());
if (loc != LeftEdge && pos.x() + s.width() > screenRect.right()) {
pos.rx() -= ((pos.x() + s.width()) - screenRect.right());
}
if (loc != TopEdge && pos.ry() + s.height() > screenRect.bottom()) {
pos.ry() -= ((pos.ry() + s.height()) - screenRect.bottom());
if (loc != TopEdge && pos.y() + s.height() > screenRect.bottom()) {
pos.ry() -= ((pos.y() + s.height()) - screenRect.bottom());
}
pos.rx() = qMax(0, pos.rx());
pos.rx() = qMax(0, pos.x());
return pos;
}