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

[Refactor/Update] Quick Settings Window(Overlay, VRC Mic Mute Sync): Apply UI Scaling.

Browse Source 
and remove the codes that is no longer in use.
This commit is contained in:
Sakamoto Shiina
2024-05-09 19:29:26 +09:00
parent 4c02a75221
commit 7339cf10a3
4 changed files with 9 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
vrct_gui/quick_settings_window/QuickSettingsWindow.py
View File

@@ -1,6 +1,6 @@
from utils import callFunctionIfCallable, floatToPctStr 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 ..ui_utils import getImagePath, setGeometryToCenterOfScreen, fadeInAnimation, createLabelButton
from ._CreateQuickSettingBox import _CreateQuickSettingBox 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 = 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(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 = 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) self.qsw_background__overlay.grid_columnconfigure(0, weight=1)
@@ -246,17 +246,9 @@ class QuickSettingsWindow(CTkToplevel):
# VRChat mic mute sync # 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 = 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) 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) cqsb = _CreateQuickSettingBox(self.qsw_setting_box__vrc_mic_mute_sync, vrct_gui, settings, view_variable)
createSettingBoxSlider = cqsb.createSettingBoxSlider createSettingBoxSlider = cqsb.createSettingBoxSlider
createSettingBoxSwitch = cqsb.createSettingBoxSwitch createSettingBoxSwitch = cqsb.createSettingBoxSwitch
@@ -312,7 +301,5 @@ class QuickSettingsWindow(CTkToplevel):
self.qsw_background.update() self.qsw_background.update()
self.geometry("{}x{}".format(self.qsw_background.winfo_width(), self.qsw_background.winfo_height())) self.geometry("{}x{}".format(self.qsw_background.winfo_width(), self.qsw_background.winfo_height()))
setGeometryToCenterOfScreen(root_widget=self) setGeometryToCenterOfScreen(root_widget=self)
fadeInAnimation(self, steps=5, interval=0.02) fadeInAnimation(self, steps=5, interval=0.02)

27
vrct_gui/quick_settings_window/_CreateQuickSettingBox.py
View File

@@ -1,9 +1,5 @@
from typing import Union from typing import Union
from customtkinter import CTkLabel, CTkFrame, CTkSlider, CTkFont, CTkSwitch
from utils import callFunctionIfCallable
from customtkinter import CTkImage, CTkLabel, CTkToplevel, CTkProgressBar, CTkFrame, CTkSlider, CTkFont, CTkSwitch
from ..ui_utils import openImageKeepAspectRatio, getImageFileFromUiUtils, setGeometryToCenterOfScreen, fadeInAnimation
class _CreateQuickSettingBox(): class _CreateQuickSettingBox():
def __init__(self, parent_frame, vrct_gui, settings, view_variable): def __init__(self, parent_frame, vrct_gui, settings, view_variable):
@@ -13,13 +9,6 @@ class _CreateQuickSettingBox():
self.parent_frame = parent_frame self.parent_frame = parent_frame
def _createSettingBoxFrame(self, for_var_label_text=None, for_var_current_value=None): 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) 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 # 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 = 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") setting_box_item_frame.grid(row=1, column=0, padx=0, sticky="nsew")
@@ -81,16 +66,6 @@ class _CreateQuickSettingBox():
def createSettingBoxSlider( def createSettingBoxSlider(
self, self,
for_var_label_text, for_var_label_text,

4
vrct_gui/ui_managers/AboutVrctManager.py
View File

@@ -1,7 +1,7 @@
from types import SimpleNamespace from types import SimpleNamespace
from ..ui_utils import calculateUiSize, getImageFileFromUiUtils_AboutVrct, bindButtonReleaseFunction, createButtonWithImage, bindButtonFunctionAndColor from ..ui_utils import calculateUiSize, getImageFileFromUiUtils_AboutVrct, bindButtonFunctionAndColor
from customtkinter import CTkFrame, CTkLabel, CTkImage, CTkFont from customtkinter import CTkFrame, CTkLabel, CTkImage
IMAGE_STANDARD_SCALING = 2 IMAGE_STANDARD_SCALING = 2
class AboutVrctManager(): class AboutVrctManager():

2
vrct_gui/ui_managers/UiScalingManager.py
View File

@@ -202,6 +202,8 @@ class UiScalingManager():
# Quick Settings Box # 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__IPADX = self._calculateUiSize(20)
self.config_window.QSB__IPADY = (self._calculateUiSize(14), self._calculateUiSize(8)) self.config_window.QSB__IPADY = (self._calculateUiSize(14), self._calculateUiSize(8))
self.config_window.QSB__LABEL_BOTTOM_PADY = self._calculateUiSize(6) self.config_window.QSB__LABEL_BOTTOM_PADY = self._calculateUiSize(6)