From 31755c5031ede9980821f59e3e8d2c4c9762d0eb Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Tue, 2 Jan 2024 07:11:31 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[Update]=20Config=20Window:=20Dropdown=20Me?= =?UTF-8?q?nu.=20=E3=82=B9=E3=82=AF=E3=83=AD=E3=83=BC=E3=83=AB=E9=80=9F?= =?UTF-8?q?=E5=BA=A6UP,=20=E5=B9=85=E8=AA=BF=E6=95=B4=EF=BC=88=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=B3=E3=83=88=E3=82=84=E8=A8=80=E8=AA=9E=E3=81=AB?= =?UTF-8?q?=E3=82=88=E3=81=A3=E3=81=A6=E6=96=87=E5=AD=97=E5=B9=85=E3=81=8C?= =?UTF-8?q?=E5=A4=89=E3=82=8F=E3=82=8B=E3=81=AE=E3=81=A7=E3=80=81=E3=83=9E?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=B3=E3=81=A8=E3=81=97=E3=81=A6=E5=B0=91?= =?UTF-8?q?=E3=81=97=E8=BF=BD=E5=8A=A0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vrct_gui/_CreateDropdownMenuWindow.py | 10 ++++------ vrct_gui/ui_managers/UiScalingManager.py | 2 ++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vrct_gui/_CreateDropdownMenuWindow.py b/vrct_gui/_CreateDropdownMenuWindow.py index b0f459dd..0eade683 100644 --- a/vrct_gui/_CreateDropdownMenuWindow.py +++ b/vrct_gui/_CreateDropdownMenuWindow.py @@ -1,9 +1,9 @@ from types import SimpleNamespace -from customtkinter import CTkToplevel, CTkFrame, CTkLabel, CTkFont, CTkScrollableFrame +from customtkinter import CTkToplevel, CTkFrame, CTkLabel, CTkFont from time import sleep -from .ui_utils import bindButtonReleaseFunction, bindEnterAndLeaveColor, bindButtonPressColor, getLatestHeight, applyUiScalingAndFixTheBugScrollBar, getLatestWidth, getLongestText +from .ui_utils import bindButtonReleaseFunction, bindEnterAndLeaveColor, bindButtonPressColor, getLatestHeight, applyUiScalingAndFixTheBugScrollBar, getLatestWidth, getLongestText, CustomizedCTkScrollableFrame from functools import partial from utils import isEven, makeEven @@ -121,7 +121,7 @@ class _CreateDropdownMenuWindow(CTkToplevel): BORDER_WIDTH=self.window_border_width - self.scroll_frame_container = CTkScrollableFrame( + self.scroll_frame_container = CustomizedCTkScrollableFrame( self.dropdown_menu_container, corner_radius=0, fg_color=self.window_bg_color, @@ -180,7 +180,6 @@ class _CreateDropdownMenuWindow(CTkToplevel): __dropdown_menu_value_wrapper.grid_rowconfigure((0,2), weight=1) - # __dropdown_menu_value_wrapper.grid_columnconfigure(0, weight=1) __label_widget = CTkLabel( __dropdown_menu_value_wrapper, text=longest_text, @@ -190,7 +189,6 @@ class _CreateDropdownMenuWindow(CTkToplevel): anchor="w", text_color=self.values_text_color, ) - # setattr(self, f"l", __label_widget) __label_widget.grid(row=1, column=0, padx=self.value_ipadx, pady=self.value_ipady, sticky="w") @@ -198,7 +196,7 @@ class _CreateDropdownMenuWindow(CTkToplevel): label_width = getLatestWidth(__label_widget) label_width += self.scroll_frame_container._scrollbar.winfo_width() + (self.window_border_width*2) + (self.scrollbar_ipadx[0] + self.scrollbar_ipadx[1]) if label_width > self.new_width: - additional_width = int(label_width - self.new_width) + additional_width = int(label_width - self.new_width + self.settings.uism.MARGIN_WIDTH) self.new_width += additional_width # for fixing 1px bug diff --git a/vrct_gui/ui_managers/UiScalingManager.py b/vrct_gui/ui_managers/UiScalingManager.py index 7c79e02e..85b1997f 100644 --- a/vrct_gui/ui_managers/UiScalingManager.py +++ b/vrct_gui/ui_managers/UiScalingManager.py @@ -162,6 +162,8 @@ class UiScalingManager(): self.confirmation_modal.BUTTONS_IPADX = self._calculateUiSize(10) self.confirmation_modal.BUTTONS_IPADY = self._calculateUiSize(6) + # Dropdown Menu Window + self.config_window.MARGIN_WIDTH = self._calculateUiSize(16) # Config Window self.config_window.DEFAULT_WIDTH = self._calculateUiSize(1080) From 3891cafc1519cf135fe3941b64dde087e9cfb4c4 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Tue, 2 Jan 2024 11:52:21 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[Update]=20Main=20Window=20Cover:=20?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E7=94=BB=E9=9D=A2=E3=81=AA=E3=81=A9=E3=82=92?= =?UTF-8?q?=E9=96=8B=E3=81=84=E3=81=9F=E6=99=82=E3=81=AB=E3=83=A1=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E7=94=BB=E9=9D=A2=E3=82=92=E9=BB=92=E3=81=8F=E8=A6=86?= =?UTF-8?q?=E3=81=86=E7=94=BB=E9=9D=A2=E3=81=AE=E9=80=8F=E6=98=8E=E5=BA=A6?= =?UTF-8?q?=E3=82=92=E4=B8=8B=E3=81=92=E3=81=9F=E3=80=82=20=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E7=90=86=E7=94=B1:=20=E3=81=9D=E3=81=AE=E4=B8=8A?= =?UTF-8?q?=E3=81=AB=E5=87=BA=E3=82=8B=E6=96=87=E5=AD=97=EF=BC=88The=20fun?= =?UTF-8?q?ctionality=20is=20temporarily=20disabled=20until=20the=20settin?= =?UTF-8?q?gs=20window=20is=20closed.=EF=BC=89=E3=81=8C=E3=80=81=E5=BE=8C?= =?UTF-8?q?=E3=82=8D=E3=81=AE=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=83=9C?= =?UTF-8?q?=E3=83=83=E3=82=AF=E3=82=B9=E3=81=AE=E6=96=87=E5=AD=97=E3=81=A8?= =?UTF-8?q?=E8=A2=AB=E3=81=A3=E3=81=A6=E8=A6=96=E8=AA=8D=E6=80=A7=E3=81=8C?= =?UTF-8?q?=E6=82=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vrct_gui/_CreateWindowCover.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vrct_gui/_CreateWindowCover.py b/vrct_gui/_CreateWindowCover.py index 600619be..2b88a3d8 100644 --- a/vrct_gui/_CreateWindowCover.py +++ b/vrct_gui/_CreateWindowCover.py @@ -56,7 +56,7 @@ class _CreateWindowCover(CTkToplevel): self.width_new = self.attach_window.winfo_width() self.height_new = self.attach_window.winfo_height() self.geometry("{}x{}+{}+{}".format(self.width_new, self.height_new, self.x_pos, self.y_pos)) - fadeInAnimation(self, steps=5, interval=0.005, max_alpha=0.5) + fadeInAnimation(self, steps=5, interval=0.005, max_alpha=0.8)