From 9cc715c3311c47105eded6997c5ba720b14c370e Mon Sep 17 00:00:00 2001 From: cidoku Date: Mon, 26 Jan 2026 16:29:44 -0300 Subject: [PATCH] align def and pro to the sides when using widescreen viewports --- gameview.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/gameview.py b/gameview.py index bd9fbe0..0e282a1 100644 --- a/gameview.py +++ b/gameview.py @@ -108,12 +108,12 @@ def mockString(text): upper = not upper return "".join(l) -class MusicDownloadThread(QtCore.QThread): +class XPMusicDownloadThread(QtCore.QThread): # Part of the evil HTTPS music download hack for XP systems finished_signal = QtCore.pyqtSignal(int, str) def __init__(self, caller, url): - super(MusicDownloadThread, self).__init__() + super(XPMusicDownloadThread, self).__init__() self.caller = caller self.url = url self.exiting = False @@ -261,13 +261,14 @@ class AOCharMovie(QtGui.QLabel): self.showOnPlay = True self.mMovie = QtGui.QMovie() + self.setAlignment(QtCore.Qt.AlignCenter) self.preanimTimer = QtCore.QTimer(self) self.preanimTimer.setSingleShot(True) self.pillowTimer = QtCore.QTimer(self) self.pillowTimer.setSingleShot(True) - self.preanimTimer.timeout.connect(self.timer_done) + self.preanimTimer.timeout.connect(self.timerDone) self.pillowTimer.timeout.connect(self.pillowFrameChange) self.mMovie.frameChanged.connect(self.frameChange) @@ -287,6 +288,14 @@ class AOCharMovie(QtGui.QLabel): def setFlipped(self, flip): self.mFlipped = flip + + def setAlignPos(self, pos): + if pos == "def": + self.setAlignment(QtCore.Qt.AlignLeft) + elif pos == "pro": + self.setAlignment(QtCore.Qt.AlignRight) + else: + self.setAlignment(QtCore.Qt.AlignCenter) def play(self, pChar, pEmote, emotePrefix, scaling = SCALING_AUTO, singleFrameDuration = -1): if not len(pEmote): @@ -582,7 +591,7 @@ class AOCharMovie(QtGui.QLabel): self.setPixmap(fPixmap) @QtCore.pyqtSlot() - def timer_done(self): + def timerDone(self): self.done.emit() class AOMovie(QtGui.QLabel): @@ -3799,6 +3808,7 @@ class GUI(QtGui.QWidget): if not self.animIsEmpty: self.char.move(self.viewport.width() * hor_offset / 100, self.viewport.height() * vert_offset / 100) + self.char.setAlignPos(side) # check if paired if not self.mChatMessage[OTHER_CHARID] and not self.animIsEmpty: @@ -3812,6 +3822,7 @@ class GUI(QtGui.QWidget): if got_otherCharId > -1: # user is paired self.sideChar.show() + self.sideChar.setAlignPos(side) boxPairOrder = self.mChatMessage[OTHER_CHARID].split("^") if "effects" in self.features and len(boxPairOrder) > 1: @@ -4426,7 +4437,7 @@ class GUI(QtGui.QWidget): self.specialStream = True if (musl.startswith("https") and error == 2) or self.specialStream: print "[audio] Downloading music with urllib2" - self.downloadThread = MusicDownloadThread(self, mus.replace(" ", "%20")) + self.downloadThread = XPMusicDownloadThread(self, mus.replace(" ", "%20")) self.downloadThread.finished_signal.connect(self.playDownloadedMusic) self.downloadThread.start() else: