From 7b804aba445afe40d4c6e47c7f838b97509847e8 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Tue, 10 Oct 2023 19:02:02 +0900 Subject: [PATCH] =?UTF-8?q?[Refactor]=20=E5=A4=89=E6=95=B0=E5=90=8D?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=80=81=E7=B5=B1=E4=B8=80=E3=80=82=20grid?= =?UTF-8?q?=5Frow/columnconfigure=E3=81=AA=E3=81=A9=E3=81=A7minsize?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E5=A4=89?= =?UTF-8?q?=E6=95=B0=E3=81=AFMIN=5F=E3=82=92=E3=81=A4=E3=81=91=E3=82=8B?= =?UTF-8?q?=E3=80=82=5FMIN=5FHEIGHT=E3=82=84=5FMIN=5FWIDTH=E3=81=AA?= =?UTF-8?q?=E3=81=A9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config_window/widgets/createConfigWindowTitle.py | 4 ++-- .../setting_box_containers/_SettingBoxGenerator.py | 6 +++--- vrct_gui/main_window/widgets/create_sidebar.py | 4 ++-- vrct_gui/ui_managers/UiScalingManager.py | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/vrct_gui/config_window/widgets/createConfigWindowTitle.py b/vrct_gui/config_window/widgets/createConfigWindowTitle.py index 302d8ccc..87d38480 100644 --- a/vrct_gui/config_window/widgets/createConfigWindowTitle.py +++ b/vrct_gui/config_window/widgets/createConfigWindowTitle.py @@ -2,8 +2,8 @@ from customtkinter import CTkFont, CTkFrame, CTkLabel, CTkImage def createConfigWindowTitle(config_window, settings): - config_window.grid_columnconfigure(0, weight=0, minsize=settings.uism.TOP_BAR_SIDE__WIDTH) - config_window.grid_rowconfigure(0, weight=0, minsize=settings.uism.TOP_BAR__HEIGHT) + config_window.grid_columnconfigure(0, weight=0, minsize=settings.uism.TOP_BAR_SIDE_AREA_MIN_WIDTH) + config_window.grid_rowconfigure(0, weight=0, minsize=settings.uism.TOP_BAR__MIN_HEIGHT) config_window.side_menu_config_window_title_logo_frame = CTkFrame(config_window, corner_radius=0, fg_color=settings.ctm.TOP_BAR_BG_COLOR, width=0, height=0) config_window.side_menu_config_window_title_logo_frame.grid(row=0, column=0, sticky="nsew") diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py index 0abcc4c4..5705031e 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py @@ -27,8 +27,8 @@ class _SettingBoxGenerator(): setting_box_frame_wrapper = CTkFrame(setting_box_frame, corner_radius=0, fg_color=self.settings.ctm.SB__BG_COLOR, width=0, height=0) setting_box_frame_wrapper.grid(row=0, column=0, padx=self.settings.uism.SB__IPADX, pady=self.settings.uism.SB__IPADY, sticky="ew") - setting_box_frame_wrapper.grid_columnconfigure(0, weight=0, minsize=int(self.settings.uism.SB__MAIN_WIDTH / 2)) - setting_box_frame_wrapper.grid_columnconfigure(2, weight=1, minsize=int(self.settings.uism.SB__MAIN_WIDTH / 2)) + setting_box_frame_wrapper.grid_columnconfigure(0, weight=0, minsize=int(self.settings.uism.MAIN_AREA_MIN_WIDTH / 2)) + setting_box_frame_wrapper.grid_columnconfigure(2, weight=1, minsize=int(self.settings.uism.MAIN_AREA_MIN_WIDTH / 2)) setting_box_frame_wrapper_fix_border = CTkFrame(setting_box_frame, corner_radius=0, width=0, height=0) setting_box_frame_wrapper_fix_border.grid(row=1, column=0, sticky="ew") @@ -67,7 +67,7 @@ class _SettingBoxGenerator(): anchor="w", justify="left", # height=0, - wraplength=int(self.settings.uism.SB__MAIN_WIDTH / 2), + wraplength=int(self.settings.uism.MAIN_AREA_MIN_WIDTH / 2), font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__DESC_FONT_SIZE, weight="normal"), text_color=self.settings.ctm.LABELS_DESC_TEXT_COLOR ) diff --git a/vrct_gui/main_window/widgets/create_sidebar.py b/vrct_gui/main_window/widgets/create_sidebar.py index 75aecb91..32aad519 100644 --- a/vrct_gui/main_window/widgets/create_sidebar.py +++ b/vrct_gui/main_window/widgets/create_sidebar.py @@ -16,8 +16,8 @@ def createSidebar(settings, main_window, view_variable): main_window.sidebar_compact_mode_bg_container = CTkFrame(main_window.sidebar_bg_container_wrapper, corner_radius=0, fg_color=settings.ctm.SIDEBAR_BG_COLOR, width=0, height=0) - main_window.sidebar_bg_container.grid_columnconfigure(0, weight=0, minsize=settings.uism.SIDEBAR_WIDTH) - main_window.sidebar_compact_mode_bg_container.grid_columnconfigure(0, weight=0, minsize=settings.uism.COMPACT_MODE_SIDEBAR_WIDTH) + main_window.sidebar_bg_container.grid_columnconfigure(0, weight=0, minsize=settings.uism.SIDEBAR_MIN_WIDTH) + main_window.sidebar_compact_mode_bg_container.grid_columnconfigure(0, weight=0, minsize=settings.uism.COMPACT_MODE_SIDEBAR_MIN_WIDTH) createSidebarFeatures(settings, main_window, view_variable) diff --git a/vrct_gui/ui_managers/UiScalingManager.py b/vrct_gui/ui_managers/UiScalingManager.py index d2fcb257..24acbd9b 100644 --- a/vrct_gui/ui_managers/UiScalingManager.py +++ b/vrct_gui/ui_managers/UiScalingManager.py @@ -49,8 +49,8 @@ class UiScalingManager(): # Sidebar - self.main.SIDEBAR_WIDTH = self._calculateUiSize(230) - self.main.COMPACT_MODE_SIDEBAR_WIDTH = self._calculateUiSize(60) + self.main.SIDEBAR_MIN_WIDTH = self._calculateUiSize(230) + self.main.COMPACT_MODE_SIDEBAR_MIN_WIDTH = self._calculateUiSize(60) # Sidebar Features self.main.SF__LOGO_MAX_SIZE = self._calculateUiSize(120) @@ -141,11 +141,11 @@ class UiScalingManager(): self.config_window.DEFAULT_HEIGHT = self._calculateUiSize(680) # Top bar common - self.config_window.TOP_BAR__HEIGHT = self._calculateUiSize(40) + self.config_window.TOP_BAR__MIN_HEIGHT = self._calculateUiSize(40) self.config_window.TOP_BAR__IPADY = self._calculateUiSize(12) # Top bar Side - self.config_window.TOP_BAR_SIDE__WIDTH = self._calculateUiSize(220) + self.config_window.TOP_BAR_SIDE_AREA_MIN_WIDTH = self._calculateUiSize(220) self.config_window.TOP_BAR_SIDE__CONFIG_LOGO_MARK_SIZE = self.dupTuple(self._calculateUiSize(28)) self.config_window.TOP_BAR_SIDE__CONFIG_TITLE_FONT_SIZE = self._calculateUiSize(22) self.config_window.TOP_BAR_SIDE__CONFIG_TITLE_LEFT_PADX = int(self.config_window.TOP_BAR_SIDE__CONFIG_TITLE_FONT_SIZE + self._calculateUiSize(16)) @@ -163,7 +163,7 @@ class UiScalingManager(): # Setting Box - self.config_window.SB__MAIN_WIDTH = self._calculateUiSize(720) + self.config_window.MAIN_AREA_MIN_WIDTH = self._calculateUiSize(720) self.config_window.SB__TOP_PADY_IF_WITH_SECTION_TITLE = (self._calculateUiSize(24)) self.config_window.SB__TOP_PADY_IF_WITHOUT_SECTION_TITLE = (self._calculateUiSize(64)) self.config_window.SB__BOTTOM_PADY = (self._calculateUiSize(40))