qt/details_dialog.py

@@ -9,7 +9,6 @@
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QDockWidget, QWidget
 
-from qtlib.util import move_to_screen_center
 from .details_table import DetailsModel
 from hscommon.plat import ISLINUX
 
@@ -74,9 +73,3 @@ class DetailsDialog(QDockWidget):
     def refresh(self):
         self.tableModel.beginResetModel()
         self.tableModel.endResetModel()
-
-    def showEvent(self, event):
-        if self._wasDocked is False:
-            # have to do this here as the frameGeometry is not correct until shown
-            move_to_screen_center(self)
-        super().showEvent(event)

qt/preferences_dialog.py

@@ -32,7 +32,7 @@ from PyQt5.QtGui import QPixmap, QIcon
 
 from hscommon.trans import trget
 from hscommon.plat import ISLINUX
-from qtlib.util import horizontal_wrap, move_to_screen_center
+from qtlib.util import horizontal_wrap
 from qtlib.preferences import get_langnames
 from enum import Flag, auto
 
@@ -369,11 +369,6 @@ use the modifier key to drag the floating window around"
                 section_to_update = Sections.DISPLAY
             self.resetToDefaults(section_to_update)
 
-    def showEvent(self, event):
-        # have to do this here as the frameGeometry is not correct until shown
-        move_to_screen_center(self)
-        super().showEvent(event)
-
 
 class ColorPickerButton(QPushButton):
     def __init__(self, parent):

qt/problem_dialog.py

@@ -19,7 +19,6 @@ from PyQt5.QtWidgets import (
     QAbstractItemView,
 )
 
-from qtlib.util import move_to_screen_center
 from hscommon.trans import trget
 from .problem_table import ProblemTable
 
@@ -71,8 +70,3 @@ class ProblemDialog(QDialog):
         self.closeButton.setDefault(True)
         self.horizontalLayout.addWidget(self.closeButton)
         self.verticalLayout.addLayout(self.horizontalLayout)
-
-    def showEvent(self, event):
-        # have to do this here as the frameGeometry is not correct until shown
-        move_to_screen_center(self)
-        super().showEvent(event)

qt/se/preferences_dialog.py

@@ -55,7 +55,7 @@ class PreferencesDialog(PreferencesDialogBase):
         size_policy.setVerticalStretch(0)
         size_policy.setHeightForWidth(self.sizeThresholdSpinBox.sizePolicy().hasHeightForWidth())
         self.sizeThresholdSpinBox.setSizePolicy(size_policy)
-        self.sizeThresholdSpinBox.setMaximumSize(QSize(300, 16777215))
+        self.sizeThresholdSpinBox.setMaximumSize(QSize(100, 16777215))
         self.sizeThresholdSpinBox.setRange(0, 1000000)
         self.horizontalLayout_2.addWidget(self.sizeThresholdSpinBox)
         self.label_6 = QLabel(self.widget)
@@ -70,7 +70,7 @@ class PreferencesDialog(PreferencesDialogBase):
         self.sizeSaturationSpinBox = QSpinBox(self.widget)
         size_policy = QSizePolicy(QSizePolicy.Maximum, QSizePolicy.Fixed)
         self.sizeSaturationSpinBox.setSizePolicy(size_policy)
-        self.sizeSaturationSpinBox.setMaximumSize(QSize(300, 16777215))
+        self.sizeSaturationSpinBox.setMaximumSize(QSize(100, 16777215))
         self.sizeSaturationSpinBox.setRange(0, 1000000)
         self.horizontalLayout_2a.addWidget(self.sizeSaturationSpinBox)
         self.label_6a = QLabel(self.widget)
@@ -88,7 +88,7 @@ class PreferencesDialog(PreferencesDialogBase):
         self.horizontalLayout_2b.addWidget(self.bigFilePartialHashesBox)
         self.bigSizeThresholdSpinBox = QSpinBox(self.widget)
         self.bigSizeThresholdSpinBox.setSizePolicy(size_policy)
-        self.bigSizeThresholdSpinBox.setMaximumSize(QSize(300, 16777215))
+        self.bigSizeThresholdSpinBox.setMaximumSize(QSize(100, 16777215))
         self.bigSizeThresholdSpinBox.setRange(0, 1000000)
         self.horizontalLayout_2b.addWidget(self.bigSizeThresholdSpinBox)
         self.label_6b = QLabel(self.widget)

qt/tabbed_window.py

@@ -2,7 +2,7 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from PyQt5.QtCore import QRect, pyqtSlot, Qt, QEvent
+from PyQt5.QtCore import QRect, pyqtSlot, Qt
 from PyQt5.QtWidgets import (
     QWidget,
     QVBoxLayout,
@@ -77,8 +77,8 @@ class TabWindow(QMainWindow):
     def restoreGeometry(self):
         if self.app.prefs.mainWindowRect is not None:
             self.setGeometry(self.app.prefs.mainWindowRect)
-        if self.app.prefs.mainWindowIsMaximized:
-            self.showMaximized()
+        else:
+            move_to_screen_center(self)
 
     def _setupMenu(self):
         """Setup the menubar boiler plates which will be filled by the underlying
@@ -211,20 +211,8 @@ class TabWindow(QMainWindow):
         # QTabWidget will assign its geometry after restoring it
         prefs = self.app.prefs
         prefs.mainWindowIsMaximized = self.isMaximized()
-        if not self.isMaximized():
         prefs.mainWindowRect = self.geometry()
 
-    def showEvent(self, event):
-        if not self.isMaximized():
-            # have to do this here as the frameGeometry is not correct until shown
-            move_to_screen_center(self)
-        super().showEvent(event)
-
-    def changeEvent(self, event):
-        if event.type() == QEvent.Type.WindowStateChange and not self.isMaximized():
-            move_to_screen_center(self)
-        super().changeEvent(event)
-
     def closeEvent(self, close_event):
         # Force closing of our tabbed widgets in reverse order so that the
         # directories dialog (which usually is at index 0) will be called last

qtlib/about_box.py

@@ -18,7 +18,6 @@ from PyQt5.QtWidgets import (
     QApplication,
 )
 
-from qtlib.util import move_to_screen_center
 from hscommon.trans import trget
 
 tr = trget("qtlib")
@@ -72,11 +71,6 @@ class AboutBox(QDialog):
         self.verticalLayout.addWidget(self.buttonBox)
         self.horizontalLayout.addLayout(self.verticalLayout)
 
-    def showEvent(self, event):
-        # have to do this here as the frameGeometry is not correct until shown
-        move_to_screen_center(self)
-        super().showEvent(event)
-
 
 if __name__ == "__main__":
     import sys

qtlib/util.py

@@ -16,8 +16,9 @@ from core.util import executable_folder
 from hscommon.util import first
 
 from PyQt5.QtCore import QStandardPaths
-from PyQt5.QtGui import QPixmap, QIcon, QGuiApplication
+from PyQt5.QtGui import QPixmap, QIcon
 from PyQt5.QtWidgets import (
+    QDesktopWidget,
     QSpacerItem,
     QSizePolicy,
     QAction,
@@ -27,18 +28,7 @@ from PyQt5.QtWidgets import (
 
 def move_to_screen_center(widget):
     frame = widget.frameGeometry()
-    if QGuiApplication.screenAt(frame.center()) is None:
-        # if center not on any screen use default screen
-        screen = QGuiApplication.screens()[0].availableGeometry()
-    else:
-        screen = QGuiApplication.screenAt(frame.center()).availableGeometry()
-    # moves to center of screen if partially off screen
-    if screen.contains(frame) is False:
-        # make sure the frame is not larger than screen
-        # resize does not seem to take frame size into account (move does)
-        widget.resize(frame.size().boundedTo(screen.size() - (frame.size() - widget.size())))
-        frame = widget.frameGeometry()
-        frame.moveCenter(screen.center())
+    frame.moveCenter(QDesktopWidget().availableGeometry().center())
     widget.move(frame.topLeft())