From e8ee8891b0067885f005a635099cea20c5009c48 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Fri, 20 Oct 2023 06:19:53 +0900 Subject: [PATCH] [Update] Remove the background color that was for testing. --- vrct_gui/_CreateConfirmationModal.py | 1 - vrct_gui/_CreateDropdownMenuWindow.py | 20 +++++++++---------- vrct_gui/_CreateErrorWindow.py | 17 ++++++++-------- vrct_gui/_CreateSelectableLanguagesWindow.py | 19 +++++++----------- vrct_gui/_CreateWindowCover.py | 17 +++++++--------- vrct_gui/config_window/ConfigWindow.py | 2 +- .../main_window/createMainWindowWidgets.py | 2 +- 7 files changed, 35 insertions(+), 43 deletions(-) diff --git a/vrct_gui/_CreateConfirmationModal.py b/vrct_gui/_CreateConfirmationModal.py index 747e9f9f..1d7a5de4 100644 --- a/vrct_gui/_CreateConfirmationModal.py +++ b/vrct_gui/_CreateConfirmationModal.py @@ -22,7 +22,6 @@ class _CreateConfirmationModal(CTkToplevel): - # self.configure(fg_color="#ff7f50") self.configure(fg_color=self.settings.ctm.FAKE_BORDER_COLOR) self.protocol("WM_DELETE_WINDOW", lambda: callFunctionIfCallable(self._view_variable.CALLBACK_HIDE_CONFIRMATION_MODAL)) diff --git a/vrct_gui/_CreateDropdownMenuWindow.py b/vrct_gui/_CreateDropdownMenuWindow.py index 9688ea4d..948e00e1 100644 --- a/vrct_gui/_CreateDropdownMenuWindow.py +++ b/vrct_gui/_CreateDropdownMenuWindow.py @@ -36,16 +36,6 @@ class _CreateDropdownMenuWindow(CTkToplevel): self.withdraw() self.hide = True - self.title("") - self.overrideredirect(True) - - self.wm_attributes("-alpha", 0) - self.wm_attributes("-toolwindow", True) - - self.configure(fg_color="#ff7f50") - self.resizable(width=False, height=False) - - self.window_additional_y_pos=window_additional_y_pos self.window_border_width=window_border_width self.scrollbar_ipadx=scrollbar_ipadx @@ -89,6 +79,16 @@ class _CreateDropdownMenuWindow(CTkToplevel): self.init_max_display_length = 8 self.max_display_length = self.init_max_display_length + self.title("") + self.overrideredirect(True) + + self.wm_attributes("-alpha", 0) + self.wm_attributes("-toolwindow", True) + + self.configure(fg_color=self.window_bg_color) + self.resizable(width=False, height=False) + + def updateDropdownMenuValues(self, dropdown_menu_widget_id, dropdown_menu_values): self.dropdown_menu_widgets[dropdown_menu_widget_id].widget.destroy() diff --git a/vrct_gui/_CreateErrorWindow.py b/vrct_gui/_CreateErrorWindow.py index f6091453..4b00047a 100644 --- a/vrct_gui/_CreateErrorWindow.py +++ b/vrct_gui/_CreateErrorWindow.py @@ -24,14 +24,6 @@ class _CreateErrorWindow(CTkToplevel): self.withdraw() self.hide = True - self.title("") - self.overrideredirect(True) - - self.wm_attributes("-alpha", 0) - self.wm_attributes("-toolwindow", True) - - self.configure(fg_color="#fff") - self.settings = settings self.attach_widget = None self._view_variable = view_variable @@ -53,6 +45,15 @@ class _CreateErrorWindow(CTkToplevel): self.x_pos = None self.y_pos = None + self.title("") + self.overrideredirect(True) + + self.wm_attributes("-alpha", 0) + self.wm_attributes("-toolwindow", True) + + self.configure(fg_color=self.message_bg_color) + + self.grid_rowconfigure(0,weight=1) diff --git a/vrct_gui/_CreateSelectableLanguagesWindow.py b/vrct_gui/_CreateSelectableLanguagesWindow.py index 850c02cd..daa369c0 100644 --- a/vrct_gui/_CreateSelectableLanguagesWindow.py +++ b/vrct_gui/_CreateSelectableLanguagesWindow.py @@ -10,28 +10,23 @@ class _CreateSelectableLanguagesWindow(CTkToplevel): super().__init__() self.withdraw() - - self.title("_CreateSelectableLanguagesWindow") - self.overrideredirect(True) - self.attach = vrct_gui.main_bg_container self.vrct_gui = vrct_gui - - self.configure(fg_color="#ff7f50") - self.protocol("WM_DELETE_WINDOW", vrct_gui._closeSelectableLanguagesWindow) - self.settings = settings self._view_variable = view_variable + self.is_created = False + self.selectable_language_window_type = None + + self.title("_CreateSelectableLanguagesWindow") + self.overrideredirect(True) + self.configure(fg_color=self.settings.ctm.TOP_BG_COLOR) + self.protocol("WM_DELETE_WINDOW", vrct_gui._closeSelectableLanguagesWindow) self.bind("", self.focusOutFunction) - self.is_created = False - - - self.selectable_language_window_type = None def createContainer(self, selectable_language_window_type): self.selectable_language_window_type = selectable_language_window_type diff --git a/vrct_gui/_CreateWindowCover.py b/vrct_gui/_CreateWindowCover.py index 878ca45b..0ee3b606 100644 --- a/vrct_gui/_CreateWindowCover.py +++ b/vrct_gui/_CreateWindowCover.py @@ -11,20 +11,17 @@ class _CreateWindowCover(CTkToplevel): self.BIND_CONFIGURE_ADJUSTED_GEOMETRY_FUNC_ID=None self.BIND_FOCUS_IN_FUNC_ID=None - self.title("") - self.overrideredirect(True) - - self.wm_attributes("-toolwindow", True) - self.attach_window = attach_window - - - self.configure(fg_color="#ff7f50") - self.protocol("WM_DELETE_WINDOW", lambda: self.withdraw()) - self.settings = settings self._view_variable = view_variable + self.title("") + self.overrideredirect(True) + self.wm_attributes("-toolwindow", True) + self.configure(fg_color="black") + self.protocol("WM_DELETE_WINDOW", lambda: self.withdraw()) + + self.grid_rowconfigure(0,weight=1) self.grid_columnconfigure(0,weight=1) self.cover_container = CTkFrame(self, corner_radius=0, fg_color="black", width=0, height=0) diff --git a/vrct_gui/config_window/ConfigWindow.py b/vrct_gui/config_window/ConfigWindow.py index 1e9d776d..fc56daec 100644 --- a/vrct_gui/config_window/ConfigWindow.py +++ b/vrct_gui/config_window/ConfigWindow.py @@ -19,7 +19,7 @@ class ConfigWindow(CTkToplevel): self.geometry(f"{self.settings.uism.DEFAULT_WIDTH}x{self.settings.uism.DEFAULT_HEIGHT}") - self.configure(fg_color="#ff7f50") + self.configure(fg_color=self.settings.ctm.MAIN_BG_COLOR) self.protocol("WM_DELETE_WINDOW", self._view_variable.CALLBACK_CLICKED_CLOSE_CONFIG_WINDOW_BUTTON) diff --git a/vrct_gui/main_window/createMainWindowWidgets.py b/vrct_gui/main_window/createMainWindowWidgets.py index 94498bfa..2bcea306 100644 --- a/vrct_gui/main_window/createMainWindowWidgets.py +++ b/vrct_gui/main_window/createMainWindowWidgets.py @@ -19,7 +19,7 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable): vrct_gui.grid_rowconfigure(0, weight=1) # vrct_gui.grid_columnconfigure(0, weight=1, minsize=settings.uism.MAIN_AREA_MIN_WIDTH) - vrct_gui.configure(fg_color="#ff7f50") + vrct_gui.configure(fg_color=settings.ctm.MAIN_BG_COLOR) vrct_gui.toplevel_wrapper = CTkFrame(vrct_gui, corner_radius=0, fg_color=settings.ctm.MAIN_BG_COLOR, width=0, height=0) vrct_gui.toplevel_wrapper.grid(row=0, column=0, sticky="nsew")