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

Take into account screen positioning when detecting if out of bounds

Browse Source
This commit is contained in:
David Edmundson 2014-02-05 20:12:22 +01:00
parent aada92247c
commit af82f2f0e7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/declarativeimports/core/dialog.cpp
View File

@ -303,7 +303,7 @@ QPoint DialogProxy::popupPosition(QQuickItem *item, const QSize &size, Qt::Align
const int topMargin = m_frameSvgItem->margins()->top(); const int topMargin = m_frameSvgItem->margins()->top();
const int bottomMargin = m_frameSvgItem->margins()->bottom(); const int bottomMargin = m_frameSvgItem->margins()->bottom();
if (dialogPos.x() < leftMargin) { if (dialogPos.x() < avail.left() + leftMargin) {
// popup hits lhs // popup hits lhs
if (m_location == Plasma::Types::TopEdge || m_location == Plasma::Types::BottomEdge) { if (m_location == Plasma::Types::TopEdge || m_location == Plasma::Types::BottomEdge) {
// move it // move it
@ -313,7 +313,7 @@ QPoint DialogProxy::popupPosition(QQuickItem *item, const QSize &size, Qt::Align
dialogPos.setX(rightPoint.x()); dialogPos.setX(rightPoint.x());
} }
} }
if (dialogPos.x() + size.width() > avail.width() - rightMargin) { if (dialogPos.x() + size.width() > avail.right() - rightMargin) {
// popup hits rhs // popup hits rhs
if (m_location == Plasma::Types::TopEdge || m_location == Plasma::Types::BottomEdge) { if (m_location == Plasma::Types::TopEdge || m_location == Plasma::Types::BottomEdge) {
dialogPos.setX(avail.width() - size.width()); dialogPos.setX(avail.width() - size.width());
@ -321,7 +321,7 @@ QPoint DialogProxy::popupPosition(QQuickItem *item, const QSize &size, Qt::Align
dialogPos.setX(leftPoint.x()); dialogPos.setX(leftPoint.x());
} }
} }
if (dialogPos.y() < topMargin) { if (dialogPos.y() < avail.top() + topMargin) {
// hitting top // hitting top
if (m_location == Plasma::Types::LeftEdge || m_location == Plasma::Types::RightEdge) { if (m_location == Plasma::Types::LeftEdge || m_location == Plasma::Types::RightEdge) {
dialogPos.setY(0); dialogPos.setY(0);
@ -329,7 +329,7 @@ QPoint DialogProxy::popupPosition(QQuickItem *item, const QSize &size, Qt::Align
dialogPos.setY(bottomPoint.y()); dialogPos.setY(bottomPoint.y());
} }
} }
if (dialogPos.y() + size.height() > avail.height() - bottomMargin) { if (dialogPos.y() + size.height() > avail.bottom() - bottomMargin) {
// hitting bottom // hitting bottom
if (m_location == Plasma::Types::TopEdge || m_location == Plasma::Types::BottomEdge) { if (m_location == Plasma::Types::TopEdge || m_location == Plasma::Types::BottomEdge) {
dialogPos.setY(topPoint.y()); dialogPos.setY(topPoint.y());