Merge remote-tracking branch 'origin/pr/338'

* origin/pr/338: Fix log_dialog Enforce using int sizes in global settings
QubesOS · Feb 17, 2023 · 2823b2c · 2823b2c
2 parents a79b3d1 + 325a9e6
commit 2823b2c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/qubesmanager/global_settings.py b/qubesmanager/global_settings.py
@@ -120,10 +120,11 @@ def __init_ux(self):
         # The magical constants of 60 here are derived from margins set
         # in the .ui file
         req_width = self.scrollAreaWidgetContents_2.sizeHint().width() + 60
-        avail_width = self.app.desktop().availableGeometry().width() * 0.95
+        avail_width = int(self.app.desktop().availableGeometry().width() * 0.95)
 
         req_height = self.scrollAreaWidgetContents_2.sizeHint().height() + 60
-        avail_height = self.app.desktop().availableGeometry().height() * 0.95
+        avail_height = int(
+            self.app.desktop().availableGeometry().height() * 0.95)
 
         self.resize(min(req_width, avail_width), min(req_height, avail_height))
 

diff --git a/qubesmanager/log_dialog.py b/qubesmanager/log_dialog.py
@@ -58,7 +58,7 @@ def __init_log_text__(self):
             button = QtWidgets.QPushButton(log_path)
             button.clicked.connect(partial(self.set_current_log, log_path))
             self.buttonsLayout.addWidget(button,
-                    count / btns_in_row, count % btns_in_row)
+                    count // btns_in_row, count % btns_in_row)
             count += 1
 
         self.buttonsLayout.itemAt(0).widget().click()