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 263204d3..7d44a2bb 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 @@ -355,6 +355,7 @@ class _SettingBoxGenerator(): button_clicked_color=self.settings.ctm.SB__BUTTON_CLICKED_COLOR, button_image_file=self.settings.image_file.FOLDER_OPEN_ICON, button_image_size=self.settings.uism.SB__BUTTON_ICON_SIZE, + corner_radius=self.settings.uism.SB__BUTTON_CORNER_RADIUS, button_ipadxy=self.settings.uism.SB__BUTTON_IPADXY, button_command=button_command, ) @@ -941,7 +942,8 @@ class _SettingBoxGenerator(): button_enter_color=self.settings.ctm.SB__BUTTON_HOVERED_COLOR, button_clicked_color=self.settings.ctm.SB__BUTTON_CLICKED_COLOR, button_image_file=button_image, - button_image_size=self.settings.uism.SB__OPEN_CONFIG_FILE_BUTTON_ICON_SIZE, + button_image_size=self.settings.uism.SB__BUTTON_ICON_SIZE, + corner_radius=self.settings.uism.SB__BUTTON_CORNER_RADIUS, button_ipadxy=self.settings.uism.SB__OPEN_CONFIG_FILE_BUTTON_IPADXY, button_command=button_command, ) @@ -987,6 +989,7 @@ class _SettingBoxGenerator(): button_clicked_color=self.settings.ctm.SB__BUTTON_CLICKED_COLOR, button_image_file=self.settings.image_file.ARROW_LEFT.rotate(270), button_image_size=self.settings.uism.SB__BUTTON_ICON_SIZE, + corner_radius=self.settings.uism.SB__BUTTON_CORNER_RADIUS, button_ipadxy=self.settings.uism.SB__BUTTON_IPADXY, button_command=open_command, ) @@ -1001,6 +1004,7 @@ class _SettingBoxGenerator(): button_clicked_color=self.settings.ctm.SB__BUTTON_CLICKED_COLOR, button_image_file=self.settings.image_file.ARROW_LEFT.rotate(90), button_image_size=self.settings.uism.SB__BUTTON_ICON_SIZE, + corner_radius=self.settings.uism.SB__BUTTON_CORNER_RADIUS, button_ipadxy=self.settings.uism.SB__BUTTON_IPADXY, button_command=close_command, ) @@ -1216,6 +1220,7 @@ class _SettingBoxGenerator(): button_clicked_color=self.settings.ctm.SB__ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_CLICKED_BG_COLOR, button_image_file=self.settings.image_file.CANCEL_ICON, button_image_size=self.settings.uism.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IMG_SIZE, + corner_radius=self.settings.uism.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_CORNER_RADIUS, button_ipadxy=self.settings.uism.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IPADXY, button_command=lambda _e: pressedDeleteButtonCommand(_e, delete_button, redo_button), ) @@ -1228,6 +1233,7 @@ class _SettingBoxGenerator(): button_clicked_color=self.settings.ctm.SB__ADD_AND_DELETE_ABLE_LIST__VALUES_DELETED_BUTTON_CLICKED_BG_COLOR, button_image_file=self.settings.image_file.REDO_ICON, button_image_size=self.settings.uism.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IMG_SIZE, + corner_radius=self.settings.uism.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_CORNER_RADIUS, button_ipadxy=self.settings.uism.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IPADXY, button_command=lambda _e: pressedRedoButtonCommand(_e, delete_button, redo_button), ) diff --git a/vrct_gui/ui_managers/UiScalingManager.py b/vrct_gui/ui_managers/UiScalingManager.py index 0d9518e4..2e02b1bf 100644 --- a/vrct_gui/ui_managers/UiScalingManager.py +++ b/vrct_gui/ui_managers/UiScalingManager.py @@ -307,6 +307,7 @@ class UiScalingManager(): self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_TEXT_IPADX = (self._calculateUiSize(8), 0) self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_TEXT_IPADY = self._calculateUiSize(6) self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IMG_SIZE = self._calculateUiSize(14) + self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_CORNER_RADIUS = self._calculateUiSize(4) self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IPADXY = self._calculateUiSize(6) self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_PADX = (self._calculateUiSize(6), self._calculateUiSize(8)) @@ -333,9 +334,9 @@ class UiScalingManager(): self.config_window.SB__BUTTON_IPADXY = self._calculateUiSize(16) self.config_window.SB__BUTTON_ICON_SIZE = self._calculateUiSize(24) + self.config_window.SB__BUTTON_CORNER_RADIUS = self.config_window.BUTTONS_CORNER_RADIUS self.config_window.SB__OPEN_CONFIG_FILE_BUTTON_IPADXY = self._calculateUiSize(10) - self.config_window.SB__OPEN_CONFIG_FILE_BUTTON_ICON_SIZE = self._calculateUiSize(20) def _calculateUiSize(self, default_size, is_allowed_odd:bool=False, is_zero_allowed:bool=False):