OuterFrame now contains monitor information for screen scaling

Author: DeadlyApps

Frames/MobTimerController.py

@@ -18,6 +18,12 @@
 from Infrastructure.TipsManager import TipsManager
 
 
+class OuterFrame(ttk.Frame):
+    def __init__(self,monitor, parent):
+        super().__init__(parent)
+        self.monitor = monitor
+
+
 class MobTimerController(Tk):
     def __init__(self, *args, **kwargs):
         Tk.__init__(self, *args, **kwargs)
@@ -36,34 +42,35 @@ def __init__(self, *args, **kwargs):
             self.quit_and_destroy_session()
 
         self.session_manager.create_session()
-        # self.iconbitmap(default='time-bomb.ico')
+        self.iconbitmap(default='time-bomb.ico')
         self.countdown_manager.subscribe_to_time_changes(self.show_screen_blocker_when_session_interupted)
 
         self.theme_manager = ThemeManager()
         theme = self.settings_manager.get_general_theme()
         if not theme == 'none':
             self.theme_manager.set_theme(theme)
-
-        num_monitors = ScreenUtility.get_monitors_or_default(self).__len__()
-        self.containers = [self]
+        monitors = ScreenUtility.get_monitors_or_default()
+        num_monitors = monitors.__len__()
+        self.parent_containers = [self]
+        self.containers = []
         for monitor_index in range(1, num_monitors):
             monitor_screen_blocker = Toplevel(self)
-            self.containers.append(monitor_screen_blocker)
+            self.parent_containers.append(monitor_screen_blocker)
         self.frame_types = (ScreenBlockerFrame, TransparentCountdownFrame, MinimalScreenBlockerFrame)
         self.frames = {}
         for frame_type in self.frame_types:
             self.frames[frame_type] = []
-        for container in self.containers:
+        for parent_container, monitor in zip(self.parent_containers, monitors):
+            parent_container.grid_rowconfigure(0, weight=1)
+            parent_container.grid_columnconfigure(0, weight=1)
+
+            container = OuterFrame(parent=parent_container, monitor=monitor)
+            self.containers.append(container)
+            container.grid(row=0, column=0, sticky=(N, S, E, W))
             container.grid_rowconfigure(0, weight=1)
             container.grid_columnconfigure(0, weight=1)
-
-            container_frame = ttk.Frame(container)
-
-            container_frame.grid(row=0, column=0, sticky=(N, S, E, W))
-            container_frame.grid_rowconfigure(0, weight=1)
-            container_frame.grid_columnconfigure(0, weight=1)
             for frame_type in self.frame_types:
-                frame_instance = frame_type(container_frame, self, self.time_options_manager, self.mobber_manager,
+                frame_instance = frame_type(container, self, self.time_options_manager, self.mobber_manager,
                                             self.countdown_manager, self.settings_manager, self.tips_manager, self.theme_manager)
                 self.frames[frame_type].append(frame_instance)
                 frame_instance.grid(row=0, column=0, sticky=(N, S, E, W))
@@ -146,35 +153,34 @@ def get_current_window_geometry(self):
 
     def disable_resizing(self):
         for container in self.containers:
-            container.resizable(0, 0)
+            container.master.resizable(0, 0)
 
     def remove_title_bar(self):
         if PlatformUtility.platform_is_mac():
             return
         for container in self.containers:
-            container.overrideredirect(1)
+            container.master.overrideredirect(1)
 
     def set_always_on_top(self):
         for container in self.containers:
-            container.wm_attributes("-topmost", True)
+            container.master.wm_attributes("-topmost", True)
             if PlatformUtility.platform_is_mac():
                 os.system('''/usr/bin/osascript -e 'tell app "Finder" to set frontmost of process "Python" to true' ''')
                 self.focus_force()
                 self.focus()
-            container.focus_force()
+            container.master.focus_force()
 
     def set_full_screen_always_on_top(self):
         self.set_always_on_top()
         self.remove_title_bar()
         self.disable_resizing()
-        monitors = ScreenUtility.get_monitors_or_default(self)
-
-        for container, monitor in zip(self.containers, monitors):
+        for container in self.containers:
+            monitor = container.monitor
             monitor_string = "{}x{}+{}+{}".format(monitor.width, monitor.height, monitor.x, monitor.y)
-            container.geometry(monitor_string)
+            container.master.geometry(monitor_string)
             if not PlatformUtility.platform_is_mac():
-                container.wait_visibility(container)  # Mac removing this prevented the issue with the continue screen visibility
-            container.attributes("-alpha", 1)
+                container.master.wait_visibility(container)  # Mac removing this prevented the issue with the continue screen visibility
+            container.master.attributes("-alpha", 1)
 
     def set_partial_screen_transparent(self):
         self.set_always_on_top()
@@ -189,17 +195,17 @@ def set_partial_screen_transparent(self):
             window_width = int(screenwidth * size_percentage)
             window_height = int(screenheight * size_percentage)
             window_size = "{0}x{1}+0+0".format(window_width, window_height)
-            controller.geometry(window_size)
-            controller.attributes("-alpha", alpha)
+            controller.master.geometry(window_size)
+            controller.master.attributes("-alpha", alpha)
         self.toggle_transparent_frame_position()
 
     def fade_app(self):
         for controller in self.containers:
-            controller.attributes("-alpha", self.settings_manager.get_continue_screen_blocker_window_alpha_percent())
+            controller.master.attributes("-alpha", self.settings_manager.get_continue_screen_blocker_window_alpha_percent())
 
     def unfade_app(self):
         for controller in self.containers:
-            controller.attributes("-alpha", 1)
+            controller.master.attributes("-alpha", 1)
 
     def toggle_transparent_frame_position(self, e=None):
         if self.state() == "withdrawn":

Frames/ScreenBlockerFrame.py

@@ -62,6 +62,9 @@ def mouse_wheel_seconds(self, event):
 
     def build_window_content(self):
 
+
+        print("heght", self.master['height'])
+
         center_frame = ttk.Frame(self)
 
         center_frame.grid(row=0, column=0)

Infrastructure/ScreenUtility.py

@@ -13,4 +13,8 @@ def get_monitors_or_default(tkroot=None):
             result = [Monitor(0, 0, tkroot.winfo_screenwidth(), tkroot.winfo_screenheight())]
         else:
             result = get_monitors()
-        return result
+        return result
+
+    @staticmethod
+    def get_num_monitors(tkroot=None):
+        return ScreenUtility.get_monitors_or_default(tkroot).__len__()

MobTimer.py

@@ -1,3 +1,4 @@
 from Frames.MobTimerController import MobTimerController
+
 root = MobTimerController()
-root.mainloop()
+root.mainloop()