]> git.lyx.org Git - features.git/commitdiff
Amend 635a7d77
authorEnrico Forestieri <forenr@lyx.org>
Mon, 15 Mar 2021 17:35:58 +0000 (18:35 +0100)
committerEnrico Forestieri <forenr@lyx.org>
Mon, 15 Mar 2021 17:35:58 +0000 (18:35 +0100)
With a multiscreen setup and Qt6, make sure to get the geometry
of the screen containing the widget.

src/frontends/qt/IconPalette.cpp

index 3c5eb7a546357627317efe6e8c27beef3efde888..8956a48c96fbf42cd22ec8dc046d2374458217c3 100644 (file)
@@ -27,6 +27,7 @@
 #include <QStyleOptionFrame>
 #include <QMouseEvent>
 #include <QVBoxLayout>
+#include <QWindow>
 
 namespace lyx {
 namespace frontend {
@@ -181,7 +182,7 @@ void IconPalette::showEvent(QShowEvent * /*event*/)
 #if QT_VERSION < 0x060000
        QRect const screen = qApp->desktop()->availableGeometry(this);
 #else
-       QRect const screen = qApp->primaryScreen()->availableGeometry();
+       QRect const screen = window()->windowHandle()->screen()->availableGeometry();
 #endif
        QPoint const gpos = parentWidget()->mapToGlobal(
                parentWidget()->geometry().bottomLeft());