From aad2d8fcbcd7a5376c1b457e49771347512a9209 Mon Sep 17 00:00:00 2001
From: cidoku <git@cidoku.net>
Date: Thu, 20 Feb 2025 19:35:28 -0300
Subject: [PATCH] better theme loading and window handling

---
 AO2XPbase/ao2xp_themes/default/theme.py |  3 ++-
 gameview.py                             | 22 ++++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/AO2XPbase/ao2xp_themes/default/theme.py b/AO2XPbase/ao2xp_themes/default/theme.py
index 6daf05c..1ef39ed 100644
--- a/AO2XPbase/ao2xp_themes/default/theme.py
+++ b/AO2XPbase/ao2xp_themes/default/theme.py
@@ -1,4 +1,5 @@
-self.gamewindow.setFixedSize(820, 730)
+self.width = 820
+self.height = 730
 
 self.ao2text.setGeometry(16, 32, VIEWPORT_W - 32, 112)
 self.ao2text.setStyleSheet("background-color: rgba(0, 0, 0, 0); color: white;")
diff --git a/gameview.py b/gameview.py
index aa54b34..ba175a4 100644
--- a/gameview.py
+++ b/gameview.py
@@ -1182,6 +1182,16 @@ class gui(QtGui.QWidget):
         self.stream = 0
         self.specialstream = 0
         self.download_thread = None
+        
+        # Finally, load the theme
+        self.width = 820
+        self.height = 730
+        theme = get_option("General", "theme", "default")
+        try:
+            exec open(AO2XPpath+"ao2xp_themes/"+theme+"/theme.py")
+        except Exception as e:
+            QtGui.QMessageBox.critical(None, "Unable to load theme", "There was a problem loading the current theme \"%s\":\n\n%s." % (theme, e))
+            os._exit(-2)
 
     def resetOffsets(self):
         self.pairoffset.setValue(0)
@@ -1393,7 +1403,7 @@ class gui(QtGui.QWidget):
     def setWhiteFlash(self, on, realizationtype=0, msec=0):
         self.whiteflashlab.setVisible(on)
         if realizationtype == 1:
-            self.playRealization()
+            self.playRealization(f)
         if msec:
             self.whiteflash.start(msec)
 
@@ -1408,12 +1418,8 @@ class gui(QtGui.QWidget):
             self.tcp.send("RT#judgeruling#" +str(variant)+ "#%")
 
     def onPVPacket(self, charname):
-        theme = get_option("General", "theme", "default")
-        try:
-            exec open(AO2XPpath+"ao2xp_themes/"+theme+"/theme.py")
-        except Exception as e:
-            QtGui.QMessageBox.critical(None, "Unable to load theme", "There was a problem loading the current theme \"%s\":\n\n%s." % (theme, e))
-            os._exit(-2)
+        self.gamewindow.setFixedSize(self.width, self.height)
+        self.gamewindow.center()
         if not self.swapping:
             self.loadCharacter(charname)
     
@@ -2959,7 +2965,7 @@ class gui(QtGui.QWidget):
             if char[0].lower() == autopick and char[1] == 0:
                 coincidence = i
                 break
-        
+
         if coincidence > -1:
             self.tcp.send("CC#0#"+str(coincidence)+"#ur mom gay#%")
         else: