From 1e220281ba5839e426cc3e2aae608264e6bec8b0 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Sun, 8 Oct 2023 20:24:32 +0900 Subject: [PATCH] [Update] Dropdown Window and Selectable Language WIndow: add cursor=hand2. and the color when it is hovered and clicked. [Chore] remove the CTkFrame widget that was meaningless. --- vrct_gui/_CreateDropdownMenuWindow.py | 2 +- vrct_gui/_CreateSelectableLanguagesWindow.py | 17 +++++++++-------- vrct_gui/ui_managers/ColorThemeManager.py | 4 +++- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/vrct_gui/_CreateDropdownMenuWindow.py b/vrct_gui/_CreateDropdownMenuWindow.py index ccbfda32..73342d5f 100644 --- a/vrct_gui/_CreateDropdownMenuWindow.py +++ b/vrct_gui/_CreateDropdownMenuWindow.py @@ -156,7 +156,7 @@ class _CreateDropdownMenuWindow(CTkToplevel): row=0 for dropdown_menu_value in dropdown_menu_values: - dropdown_menu_value_wrapper = CTkFrame(self.dropdown_menu_values_wrapper, corner_radius=0, fg_color=self.settings.ctm.SB__DROPDOWN_MENU_BG_COLOR, width=0, height=0) + dropdown_menu_value_wrapper = CTkFrame(self.dropdown_menu_values_wrapper, corner_radius=0, fg_color=self.settings.ctm.SB__DROPDOWN_MENU_BG_COLOR, width=0, height=0, cursor="hand2") dropdown_menu_value_wrapper.grid(row=row, column=0, ipadx=6, ipady=6, sticky="nsew") setattr(self, f"{dropdown_menu_widget_id}__{row}", dropdown_menu_value_wrapper) diff --git a/vrct_gui/_CreateSelectableLanguagesWindow.py b/vrct_gui/_CreateSelectableLanguagesWindow.py index 5892f7d1..44b48555 100644 --- a/vrct_gui/_CreateSelectableLanguagesWindow.py +++ b/vrct_gui/_CreateSelectableLanguagesWindow.py @@ -80,15 +80,11 @@ class _CreateSelectableLanguagesWindow(CTkToplevel): self.top_container.rowconfigure((0,2), weight=1) self.top_container.columnconfigure(1, weight=1) - self.go_back_button_container = CTkFrame(self.top_container, corner_radius=0, fg_color=self.settings.ctm.GO_BACK_BUTTON_BG_COLOR, width=0, height=0) + self.go_back_button_container = CTkFrame(self.top_container, corner_radius=0, fg_color=self.settings.ctm.GO_BACK_BUTTON_BG_COLOR, width=0, height=0, cursor="hand2") self.go_back_button_container.grid(row=1, column=0) - self.go_back_button_label_wrapper = CTkFrame(self.go_back_button_container, corner_radius=0, fg_color=self.settings.ctm.GO_BACK_BUTTON_BG_COLOR, width=0, height=0) - self.go_back_button_label_wrapper.grid(row=0, column=0) - - self.go_back_button_label = CTkLabel( - self.go_back_button_label_wrapper, + self.go_back_button_container, textvariable=self._view_variable.VAR_GO_BACK_LABEL_SELECTABLE_LANGUAGE, height=0, corner_radius=0, @@ -98,7 +94,12 @@ class _CreateSelectableLanguagesWindow(CTkToplevel): ) self.go_back_button_label.grid(row=0, column=0, padx=10, pady=8) - bindButtonReleaseFunction([self.go_back_button_label_wrapper, self.go_back_button_label], lambda _e: self.vrct_gui.closeSelectableLanguagesWindow()) + + bindEnterAndLeaveColor([self.go_back_button_container, self.go_back_button_label], self.settings.ctm.GO_BACK_BUTTON_BG_HOVERED_COLOR, self.settings.ctm.GO_BACK_BUTTON_BG_COLOR) + bindButtonPressColor([self.go_back_button_container, self.go_back_button_label], self.settings.ctm.GO_BACK_BUTTON_BG_CLICKED_COLOR, self.settings.ctm.GO_BACK_BUTTON_BG_COLOR) + + + bindButtonReleaseFunction([self.go_back_button_container, self.go_back_button_label], lambda _e: self.vrct_gui.closeSelectableLanguagesWindow()) @@ -137,7 +138,7 @@ class _CreateSelectableLanguagesWindow(CTkToplevel): column=0 for selectable_language_name in self._view_variable.LIST_SELECTABLE_LANGUAGES: - self.wrapper = CTkFrame(self.container, corner_radius=0, fg_color=self.settings.ctm.LANGUAGE_BUTTON_BG_COLOR, width=0, height=0) + self.wrapper = CTkFrame(self.container, corner_radius=0, fg_color=self.settings.ctm.LANGUAGE_BUTTON_BG_COLOR, width=0, height=0, cursor="hand2") self.wrapper.grid(row=row, column=column, ipadx=6, ipady=6, sticky="nsew") setattr(self, f"{row}_{column}", self.wrapper) diff --git a/vrct_gui/ui_managers/ColorThemeManager.py b/vrct_gui/ui_managers/ColorThemeManager.py index 18c73d0b..50ed0b17 100644 --- a/vrct_gui/ui_managers/ColorThemeManager.py +++ b/vrct_gui/ui_managers/ColorThemeManager.py @@ -199,12 +199,14 @@ class ColorThemeManager(): self.selectable_language_window.MAIN_BG_COLOR = self.DARK_875_COLOR - self.selectable_language_window.LANGUAGE_BUTTON_BG_COLOR = self.selectable_language_window.MAIN_BG_COLOR self.selectable_language_window.GO_BACK_BUTTON_BG_COLOR = self.DARK_800_COLOR + self.selectable_language_window.GO_BACK_BUTTON_BG_HOVERED_COLOR = self.DARK_750_COLOR + self.selectable_language_window.GO_BACK_BUTTON_BG_CLICKED_COLOR = self.DARK_875_COLOR self.selectable_language_window.TOP_BG_COLOR = self.main.SIDEBAR_BG_COLOR self.selectable_language_window.TITLE_TEXT_COLOR = self.DARK_400_COLOR + self.selectable_language_window.LANGUAGE_BUTTON_BG_COLOR = self.selectable_language_window.MAIN_BG_COLOR self.selectable_language_window.LANGUAGE_BUTTON_BG_HOVERED_COLOR = self.DARK_825_COLOR self.selectable_language_window.LANGUAGE_BUTTON_BG_CLICKED_COLOR = self.DARK_888_COLOR