From d30876eba47b038cd4fc6d6025f2c77fc8d4776a Mon Sep 17 00:00:00 2001
From: Xinyu Chen <eng@kebugcheck.dev>
Date: Sat, 20 Aug 2022 19:58:48 -0700
Subject: [PATCH] Raise exception when fail to get screen resolution

---
 UVR.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/UVR.py b/UVR.py
index 69c68dc6..4cd51df8 100644
--- a/UVR.py
+++ b/UVR.py
@@ -55,11 +55,11 @@
 from __version__ import VERSION
 from screeninfo import get_monitors
 
-def get_screen_resolution():
+def get_screen_height():
     monitors = get_monitors()
     if len(monitors) == 0:
-        return 800
-    return monitors[0].width
+        raise Exception("Failed to get screen height")
+    return monitors[0].height
 
 try:
     with open(os.path.join(os.getcwd(), 'tmp', 'splash.txt'), 'w') as f:
@@ -469,7 +469,7 @@ class MainWindow(TkinterDnD.Tk):
     # --Constants--
     # Layout
     
-    if get_screen_resolution() >= 900:
+    if get_screen_height() >= 900:
         IMAGE_HEIGHT = 140
         FILEPATHS_HEIGHT = 85
         OPTIONS_HEIGHT = 275
@@ -477,7 +477,7 @@ class MainWindow(TkinterDnD.Tk):
         COMMAND_HEIGHT = 200
         PROGRESS_HEIGHT = 30
         PADDING = 10
-    elif get_screen_resolution() <= 720:
+    elif get_screen_height() <= 720:
         IMAGE_HEIGHT = 135
         FILEPATHS_HEIGHT = 85
         OPTIONS_HEIGHT = 274
@@ -514,7 +514,7 @@ def __init__(self):
             height=height,
             xpad=int(self.winfo_screenwidth()/2 - 635/2),
             ypad=int(self.winfo_screenheight()/2 - height/2 - 30)))
-        if get_screen_resolution() >= 900:
+        if get_screen_height() >= 900:
             pass
         else:
             self.tk.call('tk', 'scaling', 1.1)
@@ -538,7 +538,7 @@ def __init__(self):
                                 size=(30, 30))    
         self.key_img = open_image(path=key_path,
                                 size=(30, 30))     
-        if get_screen_resolution() >= 900:
+        if get_screen_height() >= 900:
             self.gen_opt_img = open_image(path=gen_opt_path,
                                         size=(900, 826))
             self.mdx_opt_img = open_image(path=mdx_opt_path,
@@ -553,7 +553,7 @@ def __init__(self):
                                         size=(900, 826))
             self.credits_img = open_image(path=credits_path,
                                         size=(100, 100))
-        elif get_screen_resolution() <= 720:
+        elif get_screen_height() <= 720:
             self.gen_opt_img = open_image(path=gen_opt_path,
                                         size=(740, 826))
             self.mdx_opt_img = open_image(path=mdx_opt_path,
@@ -3966,10 +3966,10 @@ def help(self):
         Open Help Guide
         """
         top= Toplevel(self)
-        if get_screen_resolution() >= 900:
+        if get_screen_height() >= 900:
             window_height = 810
             window_width = 1080
-        elif get_screen_resolution() <= 720:
+        elif get_screen_height() <= 720:
             window_height = 640
             window_width = 930
         else:
@@ -4060,7 +4060,7 @@ def close_win():
         frame0=Frame(tab7,highlightbackground='red',highlightthicknes=0)
         frame0.grid(row=0,column=0,padx=0,pady=30)  
 
-        if get_screen_resolution() >= 900:
+        if get_screen_height() >= 900:
             l0=tk.Label(frame0,text="Notes",font=("Century Gothic", "16", "bold"), justify="center", fg="#f4f4f4")
             l0.grid(row=1,column=0,padx=20,pady=10)
 
@@ -5998,10 +5998,10 @@ def error_log(self):
         Open Error Log
         """
         top= Toplevel(self)
-        if get_screen_resolution() >= 900:
+        if get_screen_height() >= 900:
             window_height = 810
             window_width = 1080
-        elif get_screen_resolution() <= 720:
+        elif get_screen_height() <= 720:
             window_height = 640
             window_width = 930
         else: