From c3459c1ffe2828e5ab6dc6292e9348d65668ec34 Mon Sep 17 00:00:00 2001
From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com>
Date: Thu, 31 Aug 2023 21:00:30 +0900
Subject: [PATCH] =?UTF-8?q?[Bugfix]=20Config=20Window=E3=82=92Compact=20mo?=
 =?UTF-8?q?de=E3=81=AB=E3=81=99=E3=82=8B=E3=81=8B=E3=81=A9=E3=81=86?=
 =?UTF-8?q?=E3=81=8B=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=82=92config.json?=
 =?UTF-8?q?=E3=81=AB=E4=BF=9D=E5=AD=98=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B?=
 =?UTF-8?q?=E3=81=AB=E3=82=82=E9=96=A2=E3=82=8F=E3=82=89=E3=81=9A=E3=80=81?=
 =?UTF-8?q?GUI=E8=B5=B7=E5=8B=95=E6=99=82=E3=81=AB=E5=8F=8D=E6=98=A0?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 view.py              | 12 +++++++++---
 vrct_gui/vrct_gui.py | 31 +++++++++++++++----------------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/view.py b/view.py
index 905c936f..4fd3d85e 100644
--- a/view.py
+++ b/view.py
@@ -1,3 +1,5 @@
+from types import SimpleNamespace
+
 from customtkinter import StringVar, END as CTK_END
 from vrct_gui import vrct_gui
 
@@ -5,6 +7,11 @@ from config import config
 
 class View():
     def __init__(self):
+        self.settings = SimpleNamespace()
+        self.settings.config_window = SimpleNamespace()
+        self.settings.config_window = SimpleNamespace(
+            is_config_window_compact_mode=config.IS_CONFIG_WINDOW_COMPACT_MODE
+        )
         pass
 
 
@@ -43,8 +50,7 @@ class View():
         vrct_gui.config_window.CALLBACK_DISABLE_CONFIG_WINDOW_COMPACT_MODE = config_window["callback_enable_config_window_compact_mode"]
 
 
-        # Config Window
-        vrct_gui.config_window.settings.IS_CONFIG_WINDOW_COMPACT_MODE = config.IS_CONFIG_WINDOW_COMPACT_MODE
+
 
 
 
@@ -151,7 +157,7 @@ class View():
 
 
     def createGUI(self):
-        vrct_gui.createGUI()
+        vrct_gui.createGUI(settings=self.settings)
 
     def startMainLoop(self):
         vrct_gui.startMainLoop()
diff --git a/vrct_gui/vrct_gui.py b/vrct_gui/vrct_gui.py
index 4f6dbe32..87e0eb9a 100644
--- a/vrct_gui/vrct_gui.py
+++ b/vrct_gui/vrct_gui.py
@@ -18,6 +18,19 @@ from config import config
 class VRCT_GUI(CTk):
     def __init__(self):
         super().__init__()
+        self.YOUR_LANGUAGE = "Japanese\n(Japan)"
+        self.TARGET_LANGUAGE = "English\n(United States)"
+
+        self.CALLBACK_TOGGLE_TRANSLATION = None
+        self.CALLBACK_TOGGLE_TRANSCRIPTION_SEND = None
+        self.CALLBACK_TOGGLE_TRANSCRIPTION_RECEIVE = None
+        self.CALLBACK_TOGGLE_FOREGROUND = None
+        self.CALLBACK_SELECTED_TAB_NO_1 = None
+        self.CALLBACK_SELECTED_TAB_NO_2 = None
+        self.CALLBACK_SELECTED_TAB_NO_3 = None
+
+
+    def createGUI(self, settings):
         self.settings = SimpleNamespace()
         theme = get_appearance_mode() if config.APPEARANCE_THEME == "System" else config.APPEARANCE_THEME
         all_ctm = ColorThemeManager(theme)
@@ -40,28 +53,14 @@ class VRCT_GUI(CTk):
         self.settings.config_window = SimpleNamespace(
             ctm=all_ctm.config_window,
             uism=all_uism.config_window,
-            IS_CONFIG_WINDOW_COMPACT_MODE=False,
+            IS_CONFIG_WINDOW_COMPACT_MODE=settings.config_window.is_config_window_compact_mode,
             **common_args
         )
 
-
-        self.YOUR_LANGUAGE = "Japanese\n(Japan)"
-        self.TARGET_LANGUAGE = "English\n(United States)"
-
-        self.CALLBACK_TOGGLE_TRANSLATION = None
-        self.CALLBACK_TOGGLE_TRANSCRIPTION_SEND = None
-        self.CALLBACK_TOGGLE_TRANSCRIPTION_RECEIVE = None
-        self.CALLBACK_TOGGLE_FOREGROUND = None
-        self.CALLBACK_SELECTED_TAB_NO_1 = None
-        self.CALLBACK_SELECTED_TAB_NO_2 = None
-        self.CALLBACK_SELECTED_TAB_NO_3 = None
-
+        createMainWindowWidgets(vrct_gui=self, settings=self.settings.main)
         self.config_window = ConfigWindow(vrct_gui=self, settings=self.settings.config_window)
         # self.information_window = ToplevelWindowInformation(self)
 
-    def createGUI(self):
-        createMainWindowWidgets(vrct_gui=self, settings=self.settings.main)
-
     def startMainLoop(self):
         self.mainloop()