From b0b31dee60defe4d7e9de8abc1dbbadfbced2783 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Mon, 30 Jan 2017 12:07:06 +0100 Subject: [PATCH] [KRunner] In doubt use primary screen for view position Seems this logic of screen with cursor may break with XRandR scaling. BUG: 375574 FIXED-IN: 5.8.6 --- krunner/view.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/krunner/view.cpp b/krunner/view.cpp index 5c2567a46..1d8c04e7a 100644 --- a/krunner/view.cpp +++ b/krunner/view.cpp @@ -286,18 +286,14 @@ void View::resetScreenPos() void View::positionOnScreen() { - QScreen* shownOnScreen = 0; - if (QGuiApplication::screens().count() <= 1) { - shownOnScreen = QGuiApplication::primaryScreen(); - } else { - Q_FOREACH (QScreen* screen, QGuiApplication::screens()) { - if (screen->geometry().contains(QCursor::pos(screen))) { - shownOnScreen = screen; - break; - } + QScreen *shownOnScreen = QGuiApplication::primaryScreen(); + + Q_FOREACH (QScreen* screen, QGuiApplication::screens()) { + if (screen->geometry().contains(QCursor::pos(screen))) { + shownOnScreen = screen; + break; } } - Q_ASSERT(shownOnScreen); setScreen(shownOnScreen); const QRect r = shownOnScreen->availableGeometry();