Merge pull request #1988 from pupil-labs/remove-user-scale

Remove gui user scale

pupil_src/launchables/eye.py

@@ -298,7 +298,7 @@ def on_resize(window, w, h):
             glfw.glfwMakeContextCurrent(window)
             content_scale = glfw.get_content_scale(window)
             framebuffer_scale = glfw.get_framebuffer_scale(window)
-            g_pool.gui.scale = g_pool.gui_user_scale * content_scale
+            g_pool.gui.scale = content_scale
             window_size = w, h
             g_pool.camera_render_size = w - int(icon_bar_width * g_pool.gui.scale), h
             g_pool.gui.update_window(w, h)
@@ -412,44 +412,13 @@ def toggle_general_settings(collapsed):
         glfw.glfwMakeContextCurrent(main_window)
         cygl.utils.init()
 
-        # UI callback functions
-        def set_scale(new_scale):
-            # Get the current GUI user scale and set the new one
-            old_scale = g_pool.gui_user_scale
-            g_pool.gui_user_scale = new_scale
-
-            # If no change is needed - exit early to avoid recursive calls
-            if old_scale == new_scale:
-                return
-
-            # Get the current frame buffer size, so that it remains the same
-            f_width, f_height = glfw.glfwGetFramebufferSize(main_window)
-
-            # Get the display scales
-            content_scale = glfw.get_content_scale(main_window)
-            framebuffer_scale = glfw.get_framebuffer_scale(main_window)
-
-            # Get the unscaled framebuffer size
-            f_width /= framebuffer_scale
-            f_height /= framebuffer_scale
-
-            # Apply the difference between the previously scaled icon bar width,
-            # and the currently scaled icon bar width
-            f_width -= icon_bar_width * old_scale * content_scale / framebuffer_scale
-            f_width += icon_bar_width * new_scale * content_scale / framebuffer_scale
-
-            # The frame buffer size will remain the same, but the window size will change
-            # because of the icon bar width differences; need to set the window size here
-            glfw.glfwSetWindowSize(main_window, int(f_width), int(f_height))
-
         # gl_state settings
         basic_gl_setup()
         g_pool.image_tex = Named_Texture()
         g_pool.image_tex.update_from_ndarray(np.ones((1, 1), dtype=np.uint8) + 125)
 
         # setup GUI
         g_pool.gui = ui.UI()
-        g_pool.gui_user_scale = session_settings.get("gui_scale", 1.0)
         g_pool.menubar = ui.Scrolling_Menu(
             "Settings", pos=(-500, 0), size=(-icon_bar_width, 0), header_pos="left"
         )
@@ -460,15 +429,6 @@ def set_scale(new_scale):
         g_pool.gui.append(g_pool.iconbar)
 
         general_settings = ui.Growing_Menu("General", header_pos="headline")
-        general_settings.append(
-            ui.Selector(
-                "gui_user_scale",
-                g_pool,
-                setter=set_scale,
-                selection=[0.8, 0.9, 1.0, 1.1, 1.2],
-                label="Interface Size",
-            )
-        )
 
         def set_window_size():
             # Get current capture frame size
@@ -489,7 +449,7 @@ def set_window_size():
             f_height *= display_scale_factor
 
             # Increas the width to account for the added scaled icon bar width
-            f_width += icon_bar_width * g_pool.gui_user_scale * display_scale_factor
+            f_width += icon_bar_width * display_scale_factor
 
             # Set the newly calculated size (scaled capture frame size + scaled icon bar width)
             glfw.glfwSetWindowSize(main_window, int(f_width), int(f_height))
@@ -743,7 +703,6 @@ def window_should_update():
 
         session_settings["loaded_plugins"] = g_pool.plugins.get_initializers()
         # save session persistent settings
-        session_settings["gui_scale"] = g_pool.gui_user_scale
         session_settings["flip"] = g_pool.flip
         session_settings["display_mode"] = g_pool.display_mode
         session_settings["ui_config"] = g_pool.gui.configuration

pupil_src/launchables/player.py

@@ -240,7 +240,7 @@ def on_resize(window, w, h):
 
             content_scale = glfw.get_content_scale(window)
             framebuffer_scale = glfw.get_framebuffer_scale(window)
-            g_pool.gui.scale = g_pool.gui_user_scale * content_scale
+            g_pool.gui.scale = content_scale
             window_size = w, h
             g_pool.camera_render_size = w - int(icon_bar_width * g_pool.gui.scale), h
             g_pool.gui.update_window(*window_size)
@@ -367,35 +367,6 @@ def get_dt():
         cygl.utils.init()
         g_pool.main_window = main_window
 
-        def set_scale(new_scale):
-            # Get the current GUI user scale and set the new one
-            old_scale = g_pool.gui_user_scale
-            g_pool.gui_user_scale = new_scale
-
-            # If no change is needed - exit early to avoid recursive calls
-            if old_scale == new_scale:
-                return
-
-            # Get the current frame buffer size, so that it remains the same
-            f_width, f_height = glfw.glfwGetFramebufferSize(main_window)
-
-            # Get the display scales
-            content_scale = glfw.get_content_scale(main_window)
-            framebuffer_scale = glfw.get_framebuffer_scale(main_window)
-
-            # Get the unscaled framebuffer size
-            f_width /= framebuffer_scale
-            f_height /= framebuffer_scale
-
-            # Apply the difference between the previously scaled icon bar width,
-            # and the currently scaled icon bar width
-            f_width -= icon_bar_width * old_scale * content_scale / framebuffer_scale
-            f_width += icon_bar_width * new_scale * content_scale / framebuffer_scale
-
-            # The frame buffer size will remain the same, but the window size will change
-            # because of the icon bar width differences; need to set the window size here
-            glfw.glfwSetWindowSize(main_window, int(f_width), int(f_height))
-
         g_pool.version = app_version
         g_pool.timestamps = g_pool.capture.timestamps
         g_pool.get_timestamp = lambda: 0.0
@@ -475,7 +446,6 @@ def toggle_general_settings(collapsed):
             general_settings.collapsed = collapsed
 
         g_pool.gui = ui.UI()
-        g_pool.gui_user_scale = session_settings.get("gui_scale", 1.0)
         g_pool.menubar = ui.Scrolling_Menu(
             "Settings", pos=(-500, 0), size=(-icon_bar_width, 0), header_pos="left"
         )
@@ -508,22 +478,13 @@ def set_window_size():
             f_height *= display_scale_factor
 
             # Increas the width to account for the added scaled icon bar width
-            f_width += icon_bar_width * g_pool.gui_user_scale * display_scale_factor
+            f_width += icon_bar_width * display_scale_factor
 
             # Set the newly calculated size (scaled capture frame size + scaled icon bar width)
             glfw.glfwSetWindowSize(main_window, int(f_width), int(f_height))
 
         general_settings = ui.Growing_Menu("General", header_pos="headline")
         general_settings.append(ui.Button("Reset window size", set_window_size))
-        general_settings.append(
-            ui.Selector(
-                "gui_user_scale",
-                g_pool,
-                setter=set_scale,
-                selection=[0.8, 0.9, 1.0, 1.1, 1.2] + list(np.arange(1.5, 5.1, 0.5)),
-                label="Interface Size",
-            )
-        )
         general_settings.append(
             ui.Info_Text(f"Minimum Player Version: {meta_info.min_player_version}")
         )
@@ -769,7 +730,6 @@ def handle_notifications(n):
         session_settings[
             "min_calibration_confidence"
         ] = g_pool.min_calibration_confidence
-        session_settings["gui_scale"] = g_pool.gui_user_scale
         session_settings["ui_config"] = g_pool.gui.configuration
         session_settings["window_position"] = glfw.glfwGetWindowPos(main_window)
         session_settings["version"] = str(g_pool.version)

pupil_src/launchables/world.py

@@ -381,7 +381,7 @@ def on_resize(window, w, h):
 
             content_scale = glfw.get_content_scale(window)
             framebuffer_scale = glfw.get_framebuffer_scale(window)
-            g_pool.gui.scale = g_pool.gui_user_scale * content_scale
+            g_pool.gui.scale = content_scale
             window_size = w, h
             camera_render_size = w - int(icon_bar_width * g_pool.gui.scale), h
             g_pool.gui.update_window(*window_size)
@@ -520,35 +520,6 @@ def handle_notifications(noti):
         cygl.utils.init()
         g_pool.main_window = main_window
 
-        def set_scale(new_scale):
-            # Get the current GUI user scale and set the new one
-            old_scale = g_pool.gui_user_scale
-            g_pool.gui_user_scale = new_scale
-
-            # If no change is needed - exit early to avoid recursive calls
-            if old_scale == new_scale:
-                return
-
-            # Get the current frame buffer size, so that it remains the same
-            f_width, f_height = glfw.glfwGetFramebufferSize(main_window)
-
-            # Get the display scales
-            content_scale = glfw.get_content_scale(main_window)
-            framebuffer_scale = glfw.get_framebuffer_scale(main_window)
-
-            # Get the unscaled framebuffer size
-            f_width /= framebuffer_scale
-            f_height /= framebuffer_scale
-
-            # Apply the difference between the previously scaled icon bar width,
-            # and the currently scaled icon bar width
-            f_width -= icon_bar_width * old_scale * content_scale / framebuffer_scale
-            f_width += icon_bar_width * new_scale * content_scale / framebuffer_scale
-
-            # The frame buffer size will remain the same, but the window size will change
-            # because of the icon bar width differences; need to set the window size here
-            glfw.glfwSetWindowSize(main_window, int(f_width), int(f_height))
-
         def reset_restart():
             logger.warning("Resetting all settings and restarting Capture.")
             glfw.glfwSetWindowShouldClose(main_window, True)
@@ -566,7 +537,6 @@ def toggle_general_settings(collapsed):
 
         # setup GUI
         g_pool.gui = ui.UI()
-        g_pool.gui_user_scale = session_settings.get("gui_scale", 1.0)
         g_pool.menubar = ui.Scrolling_Menu(
             "Settings", pos=(-400, 0), size=(-icon_bar_width, 0), header_pos="left"
         )
@@ -579,15 +549,6 @@ def toggle_general_settings(collapsed):
         g_pool.gui.append(g_pool.quickbar)
 
         general_settings = ui.Growing_Menu("General", header_pos="headline")
-        general_settings.append(
-            ui.Selector(
-                "gui_user_scale",
-                g_pool,
-                setter=set_scale,
-                selection=[0.6, 0.8, 1.0, 1.2, 1.4],
-                label="Interface size",
-            )
-        )
 
         def set_window_size():
             # Get current capture frame size
@@ -603,7 +564,7 @@ def set_window_size():
             f_height *= display_scale_factor
 
             # Increas the width to account for the added scaled icon bar width
-            f_width += icon_bar_width * g_pool.gui_user_scale * display_scale_factor
+            f_width += icon_bar_width * display_scale_factor
 
             # Set the newly calculated size (scaled capture frame size + scaled icon bar width)
             glfw.glfwSetWindowSize(main_window, int(f_width), int(f_height))
@@ -822,7 +783,6 @@ def window_should_update():
                 glfw.glfwSwapBuffers(main_window)
 
         session_settings["loaded_plugins"] = g_pool.plugins.get_initializers()
-        session_settings["gui_scale"] = g_pool.gui_user_scale
         session_settings["ui_config"] = g_pool.gui.configuration
         session_settings["version"] = str(g_pool.version)
         session_settings["eye0_process_alive"] = eye_procs_alive[0].value

pupil_src/shared_modules/service_ui.py

@@ -59,7 +59,6 @@ def __init__(
         g_pool.main_window = main_window
 
         g_pool.gui = ui.UI()
-        g_pool.gui_user_scale = gui_scale
         g_pool.menubar = ui.Scrolling_Menu(
             "Settings", pos=(0, 0), size=(0, 0), header_pos="headline"
         )
@@ -74,7 +73,7 @@ def on_resize(window, w, h):
 
             self.window_size = w, h
             self.content_scale = glfw.get_content_scale(window)
-            g_pool.gui.scale = g_pool.gui_user_scale * self.content_scale
+            g_pool.gui.scale = self.content_scale
             g_pool.gui.update_window(w, h)
             g_pool.gui.collect_menus()
 
@@ -99,17 +98,6 @@ def on_pos(window, x, y):
         def on_scroll(window, x, y):
             g_pool.gui.update_scroll(x, y * scroll_factor)
 
-        def set_scale(new_scale):
-            # Get the current GUI user scale and set the new one
-            old_scale = g_pool.gui_user_scale
-            g_pool.gui_user_scale = new_scale
-
-            # If no change is needed - exit early to avoid recursive calls
-            if old_scale == new_scale:
-                return
-
-            on_resize(main_window, *self.window_size)
-
         def set_window_size():
             # Get default window size
             f_width, f_height = window_size_default
@@ -132,16 +120,6 @@ def reset_restart():
             self.notify_all({"subject": "clear_settings_process.should_start"})
             self.notify_all({"subject": "service_process.should_start", "delay": 2.0})
 
-        g_pool.menubar.append(
-            ui.Selector(
-                "gui_user_scale",
-                g_pool,
-                setter=set_scale,
-                selection=[0.6, 0.8, 1.0, 1.2, 1.4],
-                label="Interface size",
-            )
-        )
-
         g_pool.menubar.append(ui.Button("Reset window size", set_window_size))
 
         pupil_remote_addr = "{}:{}".format(
@@ -245,7 +223,6 @@ def cleanup(self):
     def get_init_dict(self):
         sess = {
             "window_position": glfw.glfwGetWindowPos(self.g_pool.main_window),
-            "gui_scale": self.g_pool.gui_user_scale,
             "ui_config": self.g_pool.gui.configuration,
         }