From 90b595db23c5c764b9bc301a53ffaa51de3ff574 Mon Sep 17 00:00:00 2001 From: kumattau Date: Fri, 26 Nov 2021 00:13:01 +0900 Subject: [PATCH] Try calling newer Qt methods first before falling back to deprecated/removed ones --- qtawesome/icon_browser.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qtawesome/icon_browser.py b/qtawesome/icon_browser.py index 01a95b91..7d4e2331 100644 --- a/qtawesome/icon_browser.py +++ b/qtawesome/icon_browser.py @@ -121,12 +121,12 @@ def __init__(self): # Instead, QGuiApplication.screenAt(QPoint) is supported # in Qt 5.10 or later. try: + screen = QtGui.QGuiApplication.screenAt(QtGui.QCursor.pos()) + centerPoint = screen.geometry().center() + except AttributeError: desktop = QtWidgets.QApplication.desktop() screen = desktop.screenNumber(desktop.cursor().pos()) centerPoint = desktop.screenGeometry(screen).center() - except AttributeError: - screen = QtGui.QGuiApplication.screenAt(QtGui.QCursor.pos()) - centerPoint = screen.geometry().center() geo.moveCenter(centerPoint) self.setGeometry(geo) @@ -159,9 +159,9 @@ def _updateFilter(self): # Instead, QSortFilterProxyModel.setFilterRegularExpression is # supported in Qt 5.12 or later. try: - self._proxyModel.setFilterRegExp(reString) - except AttributeError: self._proxyModel.setFilterRegularExpression(reString) + except AttributeError: + self._proxyModel.setFilterRegExp(reString) def _triggerDelayedUpdate(self): """