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

Dialog: Use the correct screen for repositioning when overflowing

Browse Source
This commit is contained in:
Vishesh Handa 2014-08-28 17:35:05 +02:00
parent b403343be5
commit e0ea93cb7e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/plasmaquick/dialog.cpp
View File

@ -99,6 +99,8 @@ public:
*/ */
void updateLayoutParameters(); void updateLayoutParameters();
QRect availableScreenGeometryForPosition(const QPoint& pos) const;
/** /**
* This function checks the current position of the dialog and repositions * This function checks the current position of the dialog and repositions
* it so that no part of it is not on the screen * it so that no part of it is not on the screen
@ -129,7 +131,7 @@ public:
QPointer <QObject> mainItemLayout; QPointer <QObject> mainItemLayout;
}; };
void DialogPrivate::syncBorders() QRect DialogPrivate::availableScreenGeometryForPosition(const QPoint& pos) const
{ {
// FIXME: QWindow::screen() never ever changes if the window is moved across // FIXME: QWindow::screen() never ever changes if the window is moved across
// virtual screens (normal two screens with X), this seems to be intentional // virtual screens (normal two screens with X), this seems to be intentional
@ -138,7 +140,6 @@ void DialogPrivate::syncBorders()
// we simply iterate over the virtual screens and pick the one our QWindow // we simply iterate over the virtual screens and pick the one our QWindow
// says it's at. // says it's at.
QRect avail; QRect avail;
QPoint pos = q->position();
Q_FOREACH (QScreen *screen, q->screen()->virtualSiblings()) { Q_FOREACH (QScreen *screen, q->screen()->virtualSiblings()) {
if (screen->availableGeometry().contains(pos)) { if (screen->availableGeometry().contains(pos)) {
avail = screen->availableGeometry(); avail = screen->availableGeometry();
@ -146,6 +147,12 @@ void DialogPrivate::syncBorders()
} }
} }
return avail;
}
void DialogPrivate::syncBorders()
{
QRect avail = availableScreenGeometryForPosition(q->position());
int borders = Plasma::FrameSvg::AllBorders; int borders = Plasma::FrameSvg::AllBorders;
//Tooltips always have all the borders //Tooltips always have all the borders
@ -462,7 +469,7 @@ void DialogPrivate::repositionIfOffScreen()
if (!componentComplete) { if (!componentComplete) {
return; return;
} }
const QRect avail = q->screen()->availableGeometry(); const QRect avail = availableScreenGeometryForPosition(q->position());
int x = q->x(); int x = q->x();
int y = q->y(); int y = q->y();