From 7339cf10a36f6b926f0f9d64675f0adb95899935 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Thu, 9 May 2024 19:29:26 +0900 Subject: [PATCH 1/2] [Refactor/Update] Quick Settings Window(Overlay, VRC Mic Mute Sync): Apply UI Scaling. and remove the codes that is no longer in use. --- .../QuickSettingsWindow.py | 21 +++------------ .../_CreateQuickSettingBox.py | 27 +------------------ vrct_gui/ui_managers/AboutVrctManager.py | 4 +-- vrct_gui/ui_managers/UiScalingManager.py | 2 ++ 4 files changed, 9 insertions(+), 45 deletions(-) diff --git a/vrct_gui/quick_settings_window/QuickSettingsWindow.py b/vrct_gui/quick_settings_window/QuickSettingsWindow.py index 4c2bb266..1f44f523 100644 --- a/vrct_gui/quick_settings_window/QuickSettingsWindow.py +++ b/vrct_gui/quick_settings_window/QuickSettingsWindow.py @@ -1,6 +1,6 @@ from utils import callFunctionIfCallable, floatToPctStr -from customtkinter import CTkImage, CTkLabel, CTkToplevel, CTkProgressBar, CTkFrame, CTkSlider +from customtkinter import CTkToplevel, CTkFrame from ..ui_utils import getImagePath, setGeometryToCenterOfScreen, fadeInAnimation, createLabelButton from ._CreateQuickSettingBox import _CreateQuickSettingBox @@ -22,11 +22,11 @@ class QuickSettingsWindow(CTkToplevel): self.qsw_background = CTkFrame(self, corner_radius=0, fg_color=self.settings.ctm.SB__BG_COLOR) self.qsw_background.grid(row=0, column=0, pady=0, sticky="ew") - self.qsw_background.grid_columnconfigure(0, weight=1, minsize=400) + self.qsw_background.grid_columnconfigure(0, weight=1, minsize=self.settings.uism.QSB__MIN_WIDTH) self.qsw_background__overlay = CTkFrame(self.qsw_background, corner_radius=0, fg_color=self.settings.ctm.SB__BG_COLOR) - self.qsw_background__overlay.grid(row=0, column=0, pady=(0,18), sticky="ew") + self.qsw_background__overlay.grid(row=0, column=0, pady=self.settings.uism.QSB__BOX_PADY, sticky="ew") self.qsw_background__overlay.grid_columnconfigure(0, weight=1) @@ -246,17 +246,9 @@ class QuickSettingsWindow(CTkToplevel): - - - - - - - - # VRChat mic mute sync self.qsw_background__vrc_mic_mute_sync = CTkFrame(self.qsw_background, corner_radius=0, fg_color=self.settings.ctm.SB__BG_COLOR) - self.qsw_background__vrc_mic_mute_sync.grid(row=0, column=0, pady=(0,18), sticky="ew") + self.qsw_background__vrc_mic_mute_sync.grid(row=0, column=0, pady=self.settings.uism.QSB__BOX_PADY, sticky="ew") self.qsw_background__vrc_mic_mute_sync.grid_columnconfigure(0, weight=1) @@ -269,9 +261,6 @@ class QuickSettingsWindow(CTkToplevel): - - - cqsb = _CreateQuickSettingBox(self.qsw_setting_box__vrc_mic_mute_sync, vrct_gui, settings, view_variable) createSettingBoxSlider = cqsb.createSettingBoxSlider createSettingBoxSwitch = cqsb.createSettingBoxSwitch @@ -312,7 +301,5 @@ class QuickSettingsWindow(CTkToplevel): self.qsw_background.update() self.geometry("{}x{}".format(self.qsw_background.winfo_width(), self.qsw_background.winfo_height())) - - setGeometryToCenterOfScreen(root_widget=self) fadeInAnimation(self, steps=5, interval=0.02) \ No newline at end of file diff --git a/vrct_gui/quick_settings_window/_CreateQuickSettingBox.py b/vrct_gui/quick_settings_window/_CreateQuickSettingBox.py index e2bbe271..3bb10ebc 100644 --- a/vrct_gui/quick_settings_window/_CreateQuickSettingBox.py +++ b/vrct_gui/quick_settings_window/_CreateQuickSettingBox.py @@ -1,9 +1,5 @@ from typing import Union - -from utils import callFunctionIfCallable - -from customtkinter import CTkImage, CTkLabel, CTkToplevel, CTkProgressBar, CTkFrame, CTkSlider, CTkFont, CTkSwitch -from ..ui_utils import openImageKeepAspectRatio, getImageFileFromUiUtils, setGeometryToCenterOfScreen, fadeInAnimation +from customtkinter import CTkLabel, CTkFrame, CTkSlider, CTkFont, CTkSwitch class _CreateQuickSettingBox(): def __init__(self, parent_frame, vrct_gui, settings, view_variable): @@ -13,13 +9,6 @@ class _CreateQuickSettingBox(): self.parent_frame = parent_frame - - - - - - - def _createSettingBoxFrame(self, for_var_label_text=None, for_var_current_value=None): setting_box_frame = CTkFrame(self.parent_frame, corner_radius=0, fg_color=self.settings.ctm.SB__BG_COLOR, width=0, height=0) @@ -63,10 +52,6 @@ class _CreateQuickSettingBox(): - - - - # Items setting_box_item_frame = CTkFrame(setting_box_frame_wrapper, corner_radius=0, width=0, height=0, fg_color=self.settings.ctm.SB__BG_COLOR) setting_box_item_frame.grid(row=1, column=0, padx=0, sticky="nsew") @@ -81,16 +66,6 @@ class _CreateQuickSettingBox(): - - - - - - - - - - def createSettingBoxSlider( self, for_var_label_text, diff --git a/vrct_gui/ui_managers/AboutVrctManager.py b/vrct_gui/ui_managers/AboutVrctManager.py index 9e45db63..0b5a8797 100644 --- a/vrct_gui/ui_managers/AboutVrctManager.py +++ b/vrct_gui/ui_managers/AboutVrctManager.py @@ -1,7 +1,7 @@ from types import SimpleNamespace -from ..ui_utils import calculateUiSize, getImageFileFromUiUtils_AboutVrct, bindButtonReleaseFunction, createButtonWithImage, bindButtonFunctionAndColor -from customtkinter import CTkFrame, CTkLabel, CTkImage, CTkFont +from ..ui_utils import calculateUiSize, getImageFileFromUiUtils_AboutVrct, bindButtonFunctionAndColor +from customtkinter import CTkFrame, CTkLabel, CTkImage IMAGE_STANDARD_SCALING = 2 class AboutVrctManager(): diff --git a/vrct_gui/ui_managers/UiScalingManager.py b/vrct_gui/ui_managers/UiScalingManager.py index 2c081c2c..a25ce5c9 100644 --- a/vrct_gui/ui_managers/UiScalingManager.py +++ b/vrct_gui/ui_managers/UiScalingManager.py @@ -202,6 +202,8 @@ class UiScalingManager(): # Quick Settings Box + self.config_window.QSB__MIN_WIDTH = self._calculateUiSize(400) + self.config_window.QSB__BOX_PADY = (0, self._calculateUiSize(18)) self.config_window.QSB__IPADX = self._calculateUiSize(20) self.config_window.QSB__IPADY = (self._calculateUiSize(14), self._calculateUiSize(8)) self.config_window.QSB__LABEL_BOTTOM_PADY = self._calculateUiSize(6) From 1aeeda4828eba1a1b3cad725115c2a467c93b8fb Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Thu, 9 May 2024 21:54:35 +0900 Subject: [PATCH 2/2] [Update] About VRCT: adjust bottom padding for About VRCT as an exception. --- .../_createSettingBoxContainer.py | 4 ++-- .../createSideMenuAndSettingsBoxContainers.py | 5 +++-- .../setting_box_about_vrct/createSettingBox_AboutVrct.py | 2 +- vrct_gui/ui_managers/AboutVrctManager.py | 2 +- vrct_gui/ui_managers/UiScalingManager.py | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/_createSettingBoxContainer.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/_createSettingBoxContainer.py index 28b7c552..a140ecc3 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/_createSettingBoxContainer.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/_createSettingBoxContainer.py @@ -1,7 +1,7 @@ from customtkinter import CTkFont, CTkFrame, CTkLabel -def _createSettingBoxContainer(config_window, settings, view_variable, setting_box_container_settings): +def _createSettingBoxContainer(config_window, settings, view_variable, setting_box_container_settings, bottom_margin): def createSectionTitle(container_widget, var_section_title): @@ -22,7 +22,7 @@ def _createSettingBoxContainer(config_window, settings, view_variable, setting_b # Setting box container setting_box_container_widget = CTkFrame(config_window.main_setting_box_bg_wrapper, corner_radius=0, fg_color=settings.ctm.MAIN_BG_COLOR, width=0, height=0) setattr(config_window, setting_box_container_settings["setting_box_container_attr_name"], setting_box_container_widget) - setting_box_container_widget.grid(row=0, pady=settings.uism.SB__BOTTOM_MARGIN) + setting_box_container_widget.grid(row=0, pady=bottom_margin) setting_box_container_widget.grid_remove() diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/createSideMenuAndSettingsBoxContainers.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/createSideMenuAndSettingsBoxContainers.py index d70a0eba..85e2d20e 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/createSideMenuAndSettingsBoxContainers.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/createSideMenuAndSettingsBoxContainers.py @@ -52,7 +52,7 @@ def createSideMenuAndSettingsBoxContainers(config_window, settings, view_variabl config_window.main_setting_box_bg_wrapper = CTkFrame(config_window.main_setting_box_scrollable_container, corner_radius=0, width=0, height=0, fg_color=settings.ctm.MAIN_BG_COLOR) - config_window.main_setting_box_bg_wrapper.grid(row=0, column=0, pady=settings.uism.SB__BOTTOM_MARGIN, sticky="n") + config_window.main_setting_box_bg_wrapper.grid(row=0, column=0, pady=0, sticky="n") @@ -187,12 +187,13 @@ def createSideMenuAndSettingsBoxContainers(config_window, settings, view_variabl side_menu_row+=1 + bottom_margin = 0 if sm_and_sbc_setting["setting_box_container_settings"]["setting_box_container_attr_name"] == "setting_box_container_about_vrct" else settings.uism.SB__BOTTOM_MARGIN _createSettingBoxContainer( config_window=config_window, settings=settings, view_variable=view_variable, setting_box_container_settings=sm_and_sbc_setting["setting_box_container_settings"], - + bottom_margin=bottom_margin, ) diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/createSettingBox_AboutVrct.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/createSettingBox_AboutVrct.py index 261a4a79..3ef4b4fc 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/createSettingBox_AboutVrct.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/createSettingBox_AboutVrct.py @@ -611,4 +611,4 @@ def createSettingBox_AboutVrct(setting_box_wrapper, config_window, settings, vie vrchat_disclaimer_label = settings.about_vrct.embedImageCTkLabel(vrchat_disclaimer_contents_wrapper, "vrchat_disclaimer.png") - vrchat_disclaimer_label.grid(column=0, row=0, padx=0, pady=(about_vrct_uism.VRCHAT_DISCLAIMER_SECTION_TOP_PADDING, 0), sticky="nsew") \ No newline at end of file + vrchat_disclaimer_label.grid(column=0, row=0, padx=0, pady=about_vrct_uism.VRCHAT_DISCLAIMER_SECTION_PADY, sticky="nsew") \ No newline at end of file diff --git a/vrct_gui/ui_managers/AboutVrctManager.py b/vrct_gui/ui_managers/AboutVrctManager.py index 0b5a8797..42cdc6fe 100644 --- a/vrct_gui/ui_managers/AboutVrctManager.py +++ b/vrct_gui/ui_managers/AboutVrctManager.py @@ -17,7 +17,7 @@ class AboutVrctManager(): self.uism.SECTION_BOTTOM_PADY = self._calculateUiSize(22) self.uism.PROJECT_LINKS_SECTION_BOTTOM_PADDING = self._calculateUiSize(18) # Exception pady - self.uism.VRCHAT_DISCLAIMER_SECTION_TOP_PADDING = self._calculateUiSize(80) # Exception pady + self.uism.VRCHAT_DISCLAIMER_SECTION_PADY = (self._calculateUiSize(80), self._calculateUiSize(20)) # Exception pady self.uism.THE_DEVELOPERS_SECTION_TITLE_BOTTOM_PADY = self._calculateUiSize(8) self.uism.DEVS_CONTACTS_Y1 = self._calculateUiSize(118) diff --git a/vrct_gui/ui_managers/UiScalingManager.py b/vrct_gui/ui_managers/UiScalingManager.py index a25ce5c9..3d4e2c30 100644 --- a/vrct_gui/ui_managers/UiScalingManager.py +++ b/vrct_gui/ui_managers/UiScalingManager.py @@ -264,7 +264,7 @@ class UiScalingManager(): self.config_window.SB__IPADX = self._calculateUiSize(20) self.config_window.SB__IPADY = self._calculateUiSize(12) - self.config_window.SB__BOTTOM_MARGIN = (0, self._calculateUiSize(60)) + self.config_window.SB__BOTTOM_MARGIN = (0, self._calculateUiSize(120)) self.config_window.SB__FAKE_BOTTOM_BORDER_SIZE = (0, self._calculateUiSize(1, is_allowed_odd=True)) self.config_window.SB__SECTION_TITLE_FONT_SIZE = self._calculateUiSize(20)