[Update] About VRCT: adjust bottom padding for About VRCT as an exception.
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
from customtkinter import CTkFont, CTkFrame, CTkLabel
|
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):
|
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
|
||||||
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)
|
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)
|
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()
|
setting_box_container_widget.grid_remove()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -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 = 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
|
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(
|
_createSettingBoxContainer(
|
||||||
config_window=config_window,
|
config_window=config_window,
|
||||||
settings=settings,
|
settings=settings,
|
||||||
view_variable=view_variable,
|
view_variable=view_variable,
|
||||||
setting_box_container_settings=sm_and_sbc_setting["setting_box_container_settings"],
|
setting_box_container_settings=sm_and_sbc_setting["setting_box_container_settings"],
|
||||||
|
bottom_margin=bottom_margin,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -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 = 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")
|
vrchat_disclaimer_label.grid(column=0, row=0, padx=0, pady=about_vrct_uism.VRCHAT_DISCLAIMER_SECTION_PADY, sticky="nsew")
|
||||||
@@ -17,7 +17,7 @@ class AboutVrctManager():
|
|||||||
self.uism.SECTION_BOTTOM_PADY = self._calculateUiSize(22)
|
self.uism.SECTION_BOTTOM_PADY = self._calculateUiSize(22)
|
||||||
self.uism.PROJECT_LINKS_SECTION_BOTTOM_PADDING = self._calculateUiSize(18) # Exception pady
|
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.THE_DEVELOPERS_SECTION_TITLE_BOTTOM_PADY = self._calculateUiSize(8)
|
||||||
self.uism.DEVS_CONTACTS_Y1 = self._calculateUiSize(118)
|
self.uism.DEVS_CONTACTS_Y1 = self._calculateUiSize(118)
|
||||||
|
|||||||
@@ -264,7 +264,7 @@ class UiScalingManager():
|
|||||||
|
|
||||||
self.config_window.SB__IPADX = self._calculateUiSize(20)
|
self.config_window.SB__IPADX = self._calculateUiSize(20)
|
||||||
self.config_window.SB__IPADY = self._calculateUiSize(12)
|
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__FAKE_BOTTOM_BORDER_SIZE = (0, self._calculateUiSize(1, is_allowed_odd=True))
|
||||||
|
|
||||||
self.config_window.SB__SECTION_TITLE_FONT_SIZE = self._calculateUiSize(20)
|
self.config_window.SB__SECTION_TITLE_FONT_SIZE = self._calculateUiSize(20)
|
||||||
|
|||||||
Reference in New Issue
Block a user