From 703a458160aa8a71877e65795e8ffaffdb76a75b Mon Sep 17 00:00:00 2001 From: cidoku Date: Sun, 26 Oct 2025 18:12:25 -0300 Subject: [PATCH] themes: temporary fix for timer positions --- gameview.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/gameview.py b/gameview.py index 5016359..6aacaaf 100644 --- a/gameview.py +++ b/gameview.py @@ -537,8 +537,7 @@ class AOCharMovie(QtGui.QLabel): return QtCore.Qt.FastTransformation def getAspect(self, size): - ratio = size.width() / float(size.height()) - if ratio >= self.gameview.viewportRatio: + if size.width() / float(size.height()) >= self.gameview.viewportRatio: return QtCore.Qt.KeepAspectRatioByExpanding else: return QtCore.Qt.KeepAspectRatio @@ -1190,17 +1189,14 @@ class GUI(QtGui.QWidget): self.onscreenTimerTick = 1000 for i in range(len(self.onscreenTimerTimes)): - label = QtGui.QLabel(self) + label = QtGui.QLabel(self.viewport) label.hide() label.setText("00:00:00") - label.setStyleSheet('color: white;') self.onscreenTimerLabels.append(label) - self.onscreenTimerLabels[0].setAlignment(QtCore.Qt.AlignCenter) - self.onscreenTimerLabels[3].setAlignment(QtCore.Qt.AlignRight) - self.onscreenTimerLabels[4].setAlignment(QtCore.Qt.AlignRight) - self.onscreenTimerLabels[2].move(self.onscreenTimerLabels[1].x(), self.onscreenTimerLabels[1].y() + self.onscreenTimerLabels[1].size().height() + 4) - self.onscreenTimerLabels[4].move(self.onscreenTimerLabels[3].x(), self.onscreenTimerLabels[3].y() + self.onscreenTimerLabels[3].size().height() + 4) + self.onscreenTimerLabels[0].setAlignment(QtCore.Qt.AlignHCenter | QtCore.Qt.AlignTop) + self.onscreenTimerLabels[3].setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTop) + self.onscreenTimerLabels[4].setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTop) # GUI start self.gameTabs = QtGui.QTabWidget(self) @@ -1770,7 +1766,6 @@ class GUI(QtGui.QWidget): stylesheet = "" self.emotePageGeometry = [] self.viewportScale = 0 - self.viewportRatio = 0 self.gamewindow.setStyleSheet("") self.chatbox.resetGeometry() self.btnReloadTheme.setVisible(False) @@ -2028,8 +2023,14 @@ class GUI(QtGui.QWidget): self.name.setFont(fonts["showname"]["QFont"]) for label in self.onscreenTimerLabels: - label.resize(self.viewport.width(), label.sizeHint().height()) + label.resize(self.viewport.width(), self.viewport.height()) label.setFont(self.name.font()) + label.setStyleSheet(self.name.styleSheet()) + + # TODO: Figure out proper height + px = fonts["showname"]["pointSize"] * 72 / 96 + self.onscreenTimerLabels[2].move(self.onscreenTimerLabels[1].x(), self.onscreenTimerLabels[1].y() + px + 4) + self.onscreenTimerLabels[4].move(self.onscreenTimerLabels[3].x(), self.onscreenTimerLabels[3].y() + px + 4) # Load emote buttons # TODO: Buggy on theme switch / reload