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

[Update] Main Window: 色やUIスケール変更に対応するために変数追加。指定。

Browse Source
This commit is contained in:
Sakamoto Shiina
2023-09-23 15:34:11 +09:00
parent 34c61291bb
commit 4d9600159b
3 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
vrct_gui/main_window/createMainWindowWidgets.py
View File

@@ -41,26 +41,26 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable):
# Update Available Button
vrct_gui.update_available_container = CTkFrame( vrct_gui.update_available_container = CTkFrame(
vrct_gui.main_topbar_container, vrct_gui.main_topbar_container,
corner_radius=settings.uism.HELP_AND_INFO_BUTTON_CORNER_RADIUS, corner_radius=settings.uism.UPDATE_AVAILABLE_BUTTON_CORNER_RADIUS,
fg_color=settings.ctm.MAIN_BG_COLOR, fg_color=settings.ctm.MAIN_BG_COLOR,
cursor="hand2", cursor="hand2",
) )
vrct_gui.update_available_container.grid(row=0, column=3, padx=(0,4), pady=settings.uism.HELP_AND_INFO_BUTTON_PADY, sticky="nse") vrct_gui.update_available_container.grid(row=0, column=3, padx=settings.uism.UPDATE_AVAILABLE_BUTTON_PADX, pady=settings.uism.TOP_BAR_BUTTON_PADY, sticky="nse")
vrct_gui.update_available_container.rowconfigure((0,2), weight=1) vrct_gui.update_available_container.rowconfigure((0,2), weight=1)
vrct_gui.update_available_icon = CTkLabel( vrct_gui.update_available_icon = CTkLabel(
vrct_gui.update_available_container, vrct_gui.update_available_container,
text=None, text=None,
corner_radius=0, corner_radius=0,
height=0, height=0,
image=CTkImage(settings.image_file.REFRESH_ICON.rotate(25), size=(settings.uism.HELP_AND_INFO_BUTTON_SIZE-6,settings.uism.HELP_AND_INFO_BUTTON_SIZE-6)), image=CTkImage(settings.image_file.REFRESH_ICON.rotate(25), size=settings.uism.UPDATE_AVAILABLE_BUTTON_SIZE)
) )
vrct_gui.update_available_icon.grid(row=1, column=0, padx=(6,4), pady=0) vrct_gui.update_available_icon.grid(row=1, column=0, padx=(settings.uism.UPDATE_AVAILABLE_BUTTON_IPADX, settings.uism.UPDATE_AVAILABLE_PADX_BETWEEN_LABEL_AND_ICON), pady=0)
vrct_gui.update_available_label = CTkLabel( vrct_gui.update_available_label = CTkLabel(
@@ -68,15 +68,12 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable):
textvariable=view_variable.VAR_UPDATE_AVAILABLE, textvariable=view_variable.VAR_UPDATE_AVAILABLE,
height=0, height=0,
corner_radius=0, corner_radius=0,
font=CTkFont(family=settings.FONT_FAMILY, size=12, weight="normal"), font=CTkFont(family=settings.FONT_FAMILY, size=settings.uism.UPDATE_AVAILABLE_BUTTON_FONT_SIZE, weight="normal"),
anchor="e", anchor="e",
text_color="#61b4a7", text_color=settings.ctm.UPDATE_AVAILABLE_BUTTON_TEXT_COLOR,
) )
# This "right padx +1" is for fixing a bug that sticks out from the frame. I don't know why that happens... # This "right padx +1" is for fixing a bug that sticks out from the frame. I don't know why that happens...
vrct_gui.update_available_label.grid(row=1, column=1, padx=(0,6+1), pady=0) vrct_gui.update_available_label.grid(row=1, column=1, padx=(0,settings.uism.UPDATE_AVAILABLE_BUTTON_IPADX+1), pady=0)
bindButtonFunctionAndColor( bindButtonFunctionAndColor(
@@ -85,14 +82,16 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable):
vrct_gui.update_available_label, vrct_gui.update_available_label,
vrct_gui.update_available_icon, vrct_gui.update_available_icon,
], ],
enter_color=settings.ctm.HELP_AND_INFO_BUTTON_HOVERED_BG_COLOR, enter_color=settings.ctm.UPDATE_AVAILABLE_BUTTON_HOVERED_BG_COLOR,
leave_color=settings.ctm.HELP_AND_INFO_BUTTON_BG_COLOR, leave_color=settings.ctm.UPDATE_AVAILABLE_BUTTON_BG_COLOR,
clicked_color=settings.ctm.HELP_AND_INFO_BUTTON_CLICKED_BG_COLOR, clicked_color=settings.ctm.UPDATE_AVAILABLE_BUTTON_CLICKED_BG_COLOR,
buttonReleasedFunction=vrct_gui.openHelpAndInfoWindow, buttonReleasedFunction=vrct_gui.openHelpAndInfoWindow,
) )
# Help and Info button # Help and Info button
vrct_gui.help_and_info_button_container = createButtonWithImage( vrct_gui.help_and_info_button_container = createButtonWithImage(
parent_widget=vrct_gui.main_topbar_container, parent_widget=vrct_gui.main_topbar_container,
@@ -105,7 +104,7 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable):
button_command=vrct_gui.openHelpAndInfoWindow, button_command=vrct_gui.openHelpAndInfoWindow,
corner_radius=settings.uism.HELP_AND_INFO_BUTTON_CORNER_RADIUS, corner_radius=settings.uism.HELP_AND_INFO_BUTTON_CORNER_RADIUS,
) )
vrct_gui.help_and_info_button_container.grid(row=0, column=4, padx=settings.uism.HELP_AND_INFO_BUTTON_PADX, pady=settings.uism.HELP_AND_INFO_BUTTON_PADY, sticky="e") vrct_gui.help_and_info_button_container.grid(row=0, column=4, padx=settings.uism.HELP_AND_INFO_BUTTON_PADX, pady=settings.uism.TOP_BAR_BUTTON_PADY, sticky="e")
createSidebar(settings, vrct_gui, view_variable) createSidebar(settings, vrct_gui, view_variable)

7
vrct_gui/ui_managers/ColorThemeManager.py
View File

@@ -172,6 +172,13 @@ class ColorThemeManager():
self.main.MINIMIZE_SIDEBAR_BUTTON_CLICKED_BG_COLOR = self.DARK_900_COLOR self.main.MINIMIZE_SIDEBAR_BUTTON_CLICKED_BG_COLOR = self.DARK_900_COLOR
# self.main.MINIMIZE_SIDEBAR_BUTTON_DISABLE_COLOR = self.DARK_900_COLOR # self.main.MINIMIZE_SIDEBAR_BUTTON_DISABLE_COLOR = self.DARK_900_COLOR
self.main.UPDATE_AVAILABLE_BUTTON_BG_COLOR = self.main.MAIN_BG_COLOR
self.main.UPDATE_AVAILABLE_BUTTON_HOVERED_BG_COLOR = self.DARK_850_COLOR
self.main.UPDATE_AVAILABLE_BUTTON_CLICKED_BG_COLOR = self.DARK_950_COLOR
# self.main.UPDATE_AVAILABLE_BUTTON_DISABLE_COLOR = self.DARK_900_COLOR
self.main.UPDATE_AVAILABLE_BUTTON_TEXT_COLOR = self.PRIMARY_300_COLOR
self.main.HELP_AND_INFO_BUTTON_BG_COLOR = self.main.MAIN_BG_COLOR self.main.HELP_AND_INFO_BUTTON_BG_COLOR = self.main.MAIN_BG_COLOR
self.main.HELP_AND_INFO_BUTTON_HOVERED_BG_COLOR = self.DARK_850_COLOR self.main.HELP_AND_INFO_BUTTON_HOVERED_BG_COLOR = self.DARK_850_COLOR
self.main.HELP_AND_INFO_BUTTON_CLICKED_BG_COLOR = self.DARK_950_COLOR self.main.HELP_AND_INFO_BUTTON_CLICKED_BG_COLOR = self.DARK_950_COLOR

12
vrct_gui/ui_managers/UiScalingManager.py
View File

@@ -75,11 +75,21 @@ class UiScalingManager():
self.main.SIDEBAR_CONFIG_BUTTON_PADY = self._calculateUiSize(10) self.main.SIDEBAR_CONFIG_BUTTON_PADY = self._calculateUiSize(10)
self.main.SIDEBAR_CONFIG_BUTTON_IPADY = self._calculateUiSize(8) self.main.SIDEBAR_CONFIG_BUTTON_IPADY = self._calculateUiSize(8)
self.main.TOP_BAR_BUTTON_PADY = (self._calculateUiSize(6),0)
self.main.UPDATE_AVAILABLE_BUTTON_CORNER_RADIUS = self._calculateUiSize(6)
self.main.UPDATE_AVAILABLE_BUTTON_SIZE = (self._calculateUiSize(18), self._calculateUiSize(18))
self.main.UPDATE_AVAILABLE_BUTTON_FONT_SIZE = self._calculateUiSize(12)
self.main.UPDATE_AVAILABLE_BUTTON_PADX = (0, self._calculateUiSize(4))
self.main.UPDATE_AVAILABLE_BUTTON_IPADX = self._calculateUiSize(6)
self.main.UPDATE_AVAILABLE_ICON_PADX = (self._calculateUiSize(6), self._calculateUiSize(4))
self.main.UPDATE_AVAILABLE_PADX_BETWEEN_LABEL_AND_ICON = self._calculateUiSize(4)
self.main.HELP_AND_INFO_BUTTON_CORNER_RADIUS = self._calculateUiSize(6) self.main.HELP_AND_INFO_BUTTON_CORNER_RADIUS = self._calculateUiSize(6)
self.main.HELP_AND_INFO_BUTTON_SIZE = self._calculateUiSize(24) self.main.HELP_AND_INFO_BUTTON_SIZE = self._calculateUiSize(24)
self.main.HELP_AND_INFO_BUTTON_PADX = (0, self._calculateUiSize(6)) self.main.HELP_AND_INFO_BUTTON_PADX = (0, self._calculateUiSize(6))
self.main.HELP_AND_INFO_BUTTON_PADY = (self._calculateUiSize(6),0)
self.main.HELP_AND_INFO_BUTTON_IPADXY = self._calculateUiSize(6) self.main.HELP_AND_INFO_BUTTON_IPADXY = self._calculateUiSize(6)
self.main.MINIMIZE_SIDEBAR_BUTTON_ICON_SIZE_X = int(self.main.TEXTBOX_PADX/2+self.main.TEXTBOX_CORNER_RADIUS*2) self.main.MINIMIZE_SIDEBAR_BUTTON_ICON_SIZE_X = int(self.main.TEXTBOX_PADX/2+self.main.TEXTBOX_CORNER_RADIUS*2)