cidoku/AO2XP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

themes: temporary fix for timer positions

Browse Source
This commit is contained in:
cidoku 2025-10-26 18:12:25 -03:00
parent c4a98bcc50
commit 703a458160
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gameview.py
View File

@ -537,8 +537,7 @@ class AOCharMovie(QtGui.QLabel):
return QtCore.Qt.FastTransformation return QtCore.Qt.FastTransformation
def getAspect(self, size): def getAspect(self, size):
ratio = size.width() / float(size.height()) if size.width() / float(size.height()) >= self.gameview.viewportRatio:
if ratio >= self.gameview.viewportRatio:
return QtCore.Qt.KeepAspectRatioByExpanding return QtCore.Qt.KeepAspectRatioByExpanding
else: else:
return QtCore.Qt.KeepAspectRatio return QtCore.Qt.KeepAspectRatio
@ -1190,17 +1189,14 @@ class GUI(QtGui.QWidget):
self.onscreenTimerTick = 1000 self.onscreenTimerTick = 1000
for i in range(len(self.onscreenTimerTimes)): for i in range(len(self.onscreenTimerTimes)):
label = QtGui.QLabel(self) label = QtGui.QLabel(self.viewport)
label.hide() label.hide()
label.setText("00:00:00") label.setText("00:00:00")
label.setStyleSheet('color: white;')
self.onscreenTimerLabels.append(label) self.onscreenTimerLabels.append(label)
self.onscreenTimerLabels[0].setAlignment(QtCore.Qt.AlignCenter) self.onscreenTimerLabels[0].setAlignment(QtCore.Qt.AlignHCenter | QtCore.Qt.AlignTop)
self.onscreenTimerLabels[3].setAlignment(QtCore.Qt.AlignRight) self.onscreenTimerLabels[3].setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTop)
self.onscreenTimerLabels[4].setAlignment(QtCore.Qt.AlignRight) self.onscreenTimerLabels[4].setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTop)
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)
# GUI start # GUI start
self.gameTabs = QtGui.QTabWidget(self) self.gameTabs = QtGui.QTabWidget(self)
@ -1770,7 +1766,6 @@ class GUI(QtGui.QWidget):
stylesheet = "" stylesheet = ""
self.emotePageGeometry = [] self.emotePageGeometry = []
self.viewportScale = 0 self.viewportScale = 0
self.viewportRatio = 0
self.gamewindow.setStyleSheet("") self.gamewindow.setStyleSheet("")
self.chatbox.resetGeometry() self.chatbox.resetGeometry()
self.btnReloadTheme.setVisible(False) self.btnReloadTheme.setVisible(False)
@ -2028,8 +2023,14 @@ class GUI(QtGui.QWidget):
self.name.setFont(fonts["showname"]["QFont"]) self.name.setFont(fonts["showname"]["QFont"])
for label in self.onscreenTimerLabels: 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.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 # Load emote buttons
# TODO: Buggy on theme switch / reload # TODO: Buggy on theme switch / reload