every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Update] Main Window: Language Selectable Window. UI Size変更対応。

Browse Source
This commit is contained in:
Sakamoto Shiina
2023-10-10 16:14:31 +09:00
parent 7fe1cb329a
commit 0b5b3a62fe
4 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
view.py
View File

@@ -49,7 +49,7 @@ class View():
self.settings.selectable_language_window = SimpleNamespace(
ctm=all_ctm.selectable_language_window,
uism=all_uism.config_window,
uism=all_uism.selectable_language_window,
**common_args
)

2
vrct_gui/_CreateModalWindow.py
View File

@@ -29,7 +29,7 @@ class _CreateModalWindow(CTkToplevel):
self.height_new = self.attach_window.winfo_height()
self.geometry('{}x{}+{}+{}'.format(self.width_new, self.height_new, self.x_pos, self.y_pos))
self.geometry("{}x{}+{}+{}".format(self.width_new, self.height_new, self.x_pos, self.y_pos))
self.grid_rowconfigure(0,weight=1)
self.grid_columnconfigure(0,weight=1)

21
vrct_gui/_CreateSelectableLanguagesWindow.py
View File

@@ -43,7 +43,7 @@ class _CreateSelectableLanguagesWindow(CTkToplevel):
self.height_new = self.attach.winfo_height()
self.geometry('{}x{}+{}+{}'.format(self.width_new, self.height_new, self.x_pos, self.y_pos))
self.geometry("{}x{}+{}+{}".format(self.width_new, self.height_new, self.x_pos, self.y_pos))
@@ -70,7 +70,7 @@ class _CreateSelectableLanguagesWindow(CTkToplevel):
def _createContainer(self):
self.grid_rowconfigure(0, minsize=50)
self.grid_rowconfigure(0, minsize=self.settings.uism.TOP_BAR_MIN_HEIGHT)
self.grid_rowconfigure(1, weight=1)
self.grid_columnconfigure(0, weight=1)
self.top_container = CTkFrame(self, corner_radius=0, fg_color=self.settings.ctm.TOP_BG_COLOR, width=0, height=0)
@@ -87,11 +87,11 @@ class _CreateSelectableLanguagesWindow(CTkToplevel):
textvariable=self._view_variable.VAR_GO_BACK_LABEL_SELECTABLE_LANGUAGE,
height=0,
corner_radius=0,
font=CTkFont(family=self.settings.FONT_FAMILY, size=14, weight="normal"),
font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.GO_BACK_BUTTON_LABEL_FONT_SIZE, weight="normal"),
anchor="w",
text_color=self.settings.ctm.BASIC_TEXT_COLOR,
)
self.go_back_button_label.grid(row=0, column=0, padx=10, pady=8)
self.go_back_button_label.grid(row=0, column=0, padx=self.settings.uism.GO_BACK_BUTTON_IPADX, pady=self.settings.uism.GO_BACK_BUTTON_IPADY)
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)
@@ -112,7 +112,7 @@ class _CreateSelectableLanguagesWindow(CTkToplevel):
textvariable=self._view_variable.VAR_TITLE_LABEL_SELECTABLE_LANGUAGE,
height=0,
corner_radius=0,
font=CTkFont(family=self.settings.FONT_FAMILY, size=18, weight="normal"),
font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.TITLE_FONT_SIZE, weight="normal"),
anchor="w",
text_color=self.settings.ctm.TITLE_TEXT_COLOR,
)
@@ -124,6 +124,11 @@ class _CreateSelectableLanguagesWindow(CTkToplevel):
self.scroll_frame_container = CTkScrollableFrame(self, corner_radius=0, fg_color=self.settings.ctm.MAIN_BG_COLOR, width=self.width_new, height=self.height_new)
self.scroll_frame_container.grid(row=1, column=0, sticky="nsew")
self.scroll_frame_container._scrollbar.grid_configure(padx=self.settings.uism.SCROLLBAR_IPADX)
# This is for CustomTkinter's spec change or bug fix.
self.scroll_frame_container._scrollbar.configure(height=0)
self.scroll_frame_container._scrollbar.configure(width=self.settings.uism.SCROLLBAR_WIDTH)
self.container = CTkFrame(self.scroll_frame_container, corner_radius=0, fg_color=self.settings.ctm.MAIN_BG_COLOR, width=0, height=0)
@@ -138,7 +143,7 @@ class _CreateSelectableLanguagesWindow(CTkToplevel):
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, cursor="hand2")
self.wrapper.grid(row=row, column=column, ipadx=6, ipady=6, sticky="nsew")
self.wrapper.grid(row=row, column=column, sticky="nsew")
setattr(self, f"{row}_{column}", self.wrapper)
@@ -150,13 +155,13 @@ class _CreateSelectableLanguagesWindow(CTkToplevel):
text=selectable_language_name_for_text,
height=0,
corner_radius=0,
font=CTkFont(family=self.settings.FONT_FAMILY, size=14, weight="normal"),
font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.VALUES_TEXT_FONT_SIZE, weight="normal"),
anchor="w",
text_color=self.settings.ctm.BASIC_TEXT_COLOR,
)
# setattr(self, f"l", label_widget)
label_widget.grid(row=1, column=0, padx=(8,0))
label_widget.grid(row=1, column=0, padx=self.settings.uism.VALUES_TEXT_IPADX, pady=self.settings.uism.VALUES_TEXT_IPADY)

17
vrct_gui/ui_managers/UiScalingManager.py
View File

@@ -6,6 +6,7 @@ class UiScalingManager():
self.SCALING_FLOAT = max(scaling_float, 0.4)
self.main = SimpleNamespace()
self.config_window = SimpleNamespace()
self.selectable_language_window = SimpleNamespace()
self.modal_window = SimpleNamespace()
self._calculatedUiSizes()
@@ -102,6 +103,22 @@ class UiScalingManager():
self.main.MINIMIZE_SIDEBAR_BUTTON_ICON_SIZE_Y = self._calculateUiSize(26)
# Selectable Language Window
self.selectable_language_window.TOP_BAR_MIN_HEIGHT = self._calculateUiSize(50)
self.selectable_language_window.SCROLLBAR_IPADX = (self._calculateUiSize(2), self._calculateUiSize(2))
self.selectable_language_window.SCROLLBAR_WIDTH = self._calculateUiSize(16)
self.selectable_language_window.GO_BACK_BUTTON_LABEL_FONT_SIZE = self._calculateUiSize(14)
self.selectable_language_window.GO_BACK_BUTTON_IPADX = self._calculateUiSize(10)
self.selectable_language_window.GO_BACK_BUTTON_IPADY = self._calculateUiSize(8)
self.selectable_language_window.TITLE_FONT_SIZE = self._calculateUiSize(18)
self.selectable_language_window.VALUES_TEXT_FONT_SIZE = self._calculateUiSize(14)
self.selectable_language_window.VALUES_TEXT_IPADX = (self._calculateUiSize(8), 0)
self.selectable_language_window.VALUES_TEXT_IPADY = self._calculateUiSize(8)
self.modal_window.TEXT_FONT_SIZE = self._calculateUiSize(20)
# Top bar common