From 1380d66da1a25785082c26009a2b36375a7bc797 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:44:20 +0900 Subject: [PATCH] =?UTF-8?q?[Refactor]=20Main=20Window:=20=E8=B5=B7?= =?UTF-8?q?=E5=8B=95=E6=99=82=E3=81=AF=E3=82=B5=E3=82=A4=E3=83=89=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=81=8C=E9=96=8B=E3=81=84=E3=81=9F=E7=8A=B6=E6=85=8B?= =?UTF-8?q?=E3=81=A7=E3=80=81=E3=82=82=E3=81=97config.IS=5FMAIN=5FWINDOW?= =?UTF-8?q?=5FSIDEBAR=5FCOMPACT=5FMODE=E3=81=8CTrue=E3=81=AA=E3=82=89?= =?UTF-8?q?=E9=96=89=E3=81=98=E3=82=8B=E3=81=A8=E3=81=84=E3=81=86=E5=8B=95?= =?UTF-8?q?=E4=BD=9C=E3=81=AB=E3=80=82(=E3=83=A6=E3=83=BC=E3=82=B6?= =?UTF-8?q?=E3=83=BC=E3=81=AB=E8=A6=8B=E3=81=88=E3=82=8B=E3=81=BE=E3=81=A7?= =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=81=AA=E3=81=AE=E3=81=A7=E8=A6=8B=E3=81=9F=E7=9B=AE=E3=81=AF?= =?UTF-8?q?=E5=A4=89=E3=82=8F=E3=82=89=E3=81=AA=E3=81=84)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view.py | 5 +++++ .../main_window/widgets/create_minimize_sidebar_button.py | 7 +------ vrct_gui/main_window/widgets/create_sidebar.py | 5 ----- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/view.py b/view.py index 76d79047..49f05428 100644 --- a/view.py +++ b/view.py @@ -446,6 +446,11 @@ class View(): self.view_variable.CALLBACK_SET_OSC_PORT = config_window_registers.get("callback_set_osc_port", None) # The initial processing after registration. + + if config.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True: + vrct_gui._enableMainWindowSidebarCompactMode() + + if config.IS_CONFIG_WINDOW_COMPACT_MODE is True: self.enableConfigWindowCompactMode() vrct_gui.config_window.setting_box_compact_mode_switch_box.select() diff --git a/vrct_gui/main_window/widgets/create_minimize_sidebar_button.py b/vrct_gui/main_window/widgets/create_minimize_sidebar_button.py index de15cc89..83585e98 100644 --- a/vrct_gui/main_window/widgets/create_minimize_sidebar_button.py +++ b/vrct_gui/main_window/widgets/create_minimize_sidebar_button.py @@ -67,9 +67,4 @@ def createMinimizeSidebarButton(settings, main_window, view_variable): main_window.minimize_sidebar_button_container__for_opening.grid(row=0, column=0, sticky="nsw") main_window.minimize_sidebar_button_container__for_closing.grid(row=0, column=0, sticky="nsw") - main_window.minimize_sidebar_button_container__for_opening.grid_remove() - main_window.minimize_sidebar_button_container__for_closing.grid_remove() - if view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True: - main_window.minimize_sidebar_button_container__for_opening.grid() - else: - main_window.minimize_sidebar_button_container__for_closing.grid() \ No newline at end of file + main_window.minimize_sidebar_button_container__for_opening.grid_remove() \ No newline at end of file diff --git a/vrct_gui/main_window/widgets/create_sidebar.py b/vrct_gui/main_window/widgets/create_sidebar.py index 09c1a58a..4605bef4 100644 --- a/vrct_gui/main_window/widgets/create_sidebar.py +++ b/vrct_gui/main_window/widgets/create_sidebar.py @@ -26,12 +26,7 @@ def createSidebar(settings, main_window, view_variable): main_window.sidebar_bg_container.grid(row=0, column=0, sticky="nsew") main_window.sidebar_compact_mode_bg_container.grid(row=0, column=0, sticky="nsew") - main_window.sidebar_bg_container.grid_remove() main_window.sidebar_compact_mode_bg_container.grid_remove() - if view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE: - main_window.sidebar_compact_mode_bg_container.grid() - else: - main_window.sidebar_bg_container.grid() # Config Button