tungstenowl/FRAISEMOE-Addons-Installer-NEXT
1
0
Fork 0
mirror of https://github.com/hyb-oyqq/FRAISEMOE-Addons-Installer-NEXT.git synced 2026-01-15 08:00:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(ui): 添加禁/启用补丁按钮及其功能

Browse Source 
- 新增禁/启用补丁功能
- 更新动画模块以支持禁/启用补丁按钮的动画效果。
- 在下载模块中添加对禁用补丁游戏的检测和处理逻辑，优化用户体验。
- 扩展补丁管理模块，支持批量切换补丁的启用/禁用状态。
- 更新UI布局
This commit is contained in:
hyb-oyqq
2025-08-05 10:59:19 +08:00
parent 8b4dedc8c6
commit 2158331532
6 changed files with 828 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/core/animations.py
View File

@@ -49,6 +49,7 @@ class MultiStageAnimations(QObject):
# 移除菜单背景动画
# {"widget": ui.menubg, "end_pos": QPoint(720, 55), "duration": 600},
{"widget": ui.button_container, "end_pos": None, "duration": 600},
{"widget": ui.toggle_patch_container, "end_pos": None, "duration": 600}, # 添加禁/启用补丁按钮
{"widget": ui.uninstall_container, "end_pos": None, "duration": 600}, # 添加卸载补丁按钮
{"widget": ui.exit_container, "end_pos": None, "duration": 600}
]
@@ -301,18 +302,29 @@ class MultiStageAnimations(QObject):
if hasattr(self.ui, 'button_container'):
btn_width = self.ui.button_container.width()
x_pos = width - btn_width - right_margin
y_pos = int((height - 65) * 0.28) - 10 # 与resizeEvent中保持一致
y_pos = int((height - 65) * 0.18) - 10 # 从0.28改为0.18，向上移动
# 更新动画目标位置
for item in self.menu_widgets:
if item["widget"] == self.ui.button_container:
item["end_pos"] = QPoint(x_pos, y_pos)
# 禁用补丁按钮
if hasattr(self.ui, 'toggle_patch_container'):
btn_width = self.ui.toggle_patch_container.width()
x_pos = width - btn_width - right_margin
y_pos = int((height - 65) * 0.36) - 10 # 从0.46改为0.36，向上移动
# 更新动画目标位置
for item in self.menu_widgets:
if item["widget"] == self.ui.toggle_patch_container:
item["end_pos"] = QPoint(x_pos, y_pos)
# 卸载补丁按钮
if hasattr(self.ui, 'uninstall_container'):
btn_width = self.ui.uninstall_container.width()
x_pos = width - btn_width - right_margin
y_pos = int((height - 65) * 0.46) - 10 # 与resizeEvent中保持一致
y_pos = int((height - 65) * 0.54) - 10 # 从0.64改为0.54，向上移动
# 更新动画目标位置
for item in self.menu_widgets:
@@ -323,7 +335,7 @@ class MultiStageAnimations(QObject):
if hasattr(self.ui, 'exit_container'):
btn_width = self.ui.exit_container.width()
x_pos = width - btn_width - right_margin
y_pos = int((height - 65) * 0.64) - 10 # 与resizeEvent中保持一致
y_pos = int((height - 65) * 0.72) - 10 # 从0.82改为0.72，向上移动
# 更新动画目标位置
for item in self.menu_widgets:
@@ -334,10 +346,12 @@ class MultiStageAnimations(QObject):
for item in self.menu_widgets:
if item["widget"] == self.ui.button_container:
item["end_pos"] = QPoint(1050, 200)
elif item["widget"] == self.ui.uninstall_container:
elif item["widget"] == self.ui.toggle_patch_container:
item["end_pos"] = QPoint(1050, 310)
elif item["widget"] == self.ui.exit_container:
elif item["widget"] == self.ui.uninstall_container:
item["end_pos"] = QPoint(1050, 420)
elif item["widget"] == self.ui.exit_container:
item["end_pos"] = QPoint(1050, 530)
def start_animations(self):
"""启动完整动画序列"""

80
source/core/download_manager.py
View File

@@ -209,20 +209,76 @@ class DownloadManager:
installable_games = []
already_installed_games = []
disabled_patch_games = [] # 存储检测到禁用补丁的游戏
for game_version, game_dir in game_dirs.items():
# 检查游戏是否已安装补丁
if self.main_window.installed_status.get(game_version, False):
if debug_mode:
print(f"DEBUG: {game_version} 已安装补丁，不需要再次安装")
already_installed_games.append(game_version)
else:
if debug_mode:
print(f"DEBUG: {game_version} 未安装补丁，可以安装")
installable_games.append(game_version)
# 检查是否存在被禁用的补丁
is_disabled, disabled_path = self.main_window.patch_manager.check_patch_disabled(game_dir, game_version)
if is_disabled:
if debug_mode:
print(f"DEBUG: {game_version} 存在被禁用的补丁: {disabled_path}")
disabled_patch_games.append(game_version)
else:
if debug_mode:
print(f"DEBUG: {game_version} 未安装补丁，可以安装")
installable_games.append(game_version)
status_message = ""
if already_installed_games:
status_message += f"已安装补丁的游戏：\n{chr(10).join(already_installed_games)}\n\n"
# 处理禁用补丁的情况
if disabled_patch_games:
# 构建提示消息
disabled_msg = f"检测到以下游戏的补丁已被禁用：\n{chr(10).join(disabled_patch_games)}\n\n是否要启用这些补丁？"
reply = QtWidgets.QMessageBox.question(
self.main_window,
f"检测到禁用补丁 - {APP_NAME}",
disabled_msg,
QtWidgets.QMessageBox.StandardButton.Yes | QtWidgets.QMessageBox.StandardButton.No
)
if reply == QtWidgets.QMessageBox.StandardButton.Yes:
# 用户选择启用补丁
if debug_mode:
print(f"DEBUG: 用户选择启用被禁用的补丁")
# 为每个禁用的游戏创建目录映射
disabled_game_dirs = {game: game_dirs[game] for game in disabled_patch_games}
# 批量启用补丁
success_count, fail_count, results = self.main_window.patch_manager.batch_toggle_patches(
disabled_game_dirs,
operation="enable"
)
# 显示启用结果
self.main_window.patch_manager.show_toggle_result(success_count, fail_count, results)
# 更新安装状态
for game_version in disabled_patch_games:
self.main_window.installed_status[game_version] = True
if game_version in installable_games:
installable_games.remove(game_version)
if game_version not in already_installed_games:
already_installed_games.append(game_version)
else:
if debug_mode:
print(f"DEBUG: 用户选择不启用被禁用的补丁，这些游戏将被添加到可安装列表")
# 用户选择不启用，将这些游戏视为可以安装补丁
installable_games.extend(disabled_patch_games)
# 更新status_message
if already_installed_games:
status_message = f"已安装补丁的游戏：\n{chr(10).join(already_installed_games)}\n\n"
if not installable_games:
QtWidgets.QMessageBox.information(
self.main_window,
@@ -233,28 +289,28 @@ class DownloadManager:
self.main_window.ui.start_install_text.setText("开始安装")
return
dialog = QDialog(self.main_window)
dialog = QtWidgets.QDialog(self.main_window)
dialog.setWindowTitle("选择要安装的游戏")
dialog.resize(400, 300)
layout = QVBoxLayout(dialog)
layout = QtWidgets.QVBoxLayout(dialog)
if already_installed_games:
already_installed_label = QLabel("已安装补丁的游戏:", dialog)
already_installed_label.setFont(QFont(already_installed_label.font().family(), already_installed_label.font().pointSize(), QFont.Bold))
already_installed_label = QtWidgets.QLabel("已安装补丁的游戏:", dialog)
already_installed_label.setFont(QFont(already_installed_label.font().family(), already_installed_label.font().pointSize(), QFont.Weight.Bold))
layout.addWidget(already_installed_label)
already_installed_list = QLabel(chr(10).join(already_installed_games), dialog)
already_installed_list = QtWidgets.QLabel(chr(10).join(already_installed_games), dialog)
layout.addWidget(already_installed_list)
layout.addSpacing(10)
info_label = QLabel("请选择你需要安装补丁的游戏:", dialog)
info_label.setFont(QFont(info_label.font().family(), info_label.font().pointSize(), QFont.Bold))
info_label = QtWidgets.QLabel("请选择你需要安装补丁的游戏:", dialog)
info_label.setFont(QFont(info_label.font().family(), info_label.font().pointSize(), QFont.Weight.Bold))
layout.addWidget(info_label)
list_widget = QListWidget(dialog)
list_widget.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection)
list_widget = QtWidgets.QListWidget(dialog)
list_widget.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection)
for game in installable_games:
list_widget.addItem(game)
layout.addWidget(list_widget)

364
source/core/patch_manager.py
View File

@@ -69,6 +69,9 @@ class PatchManager:
"""
debug_mode = self._is_debug_mode()
if debug_mode:
print(f"DEBUG: 开始卸载 {game_version} 补丁，目录: {game_dir}")
if game_version not in self.game_info:
if not silent:
QMessageBox.critical(
@@ -79,9 +82,6 @@ class PatchManager:
)
return False if not silent else {"success": False, "message": f"无法识别游戏版本: {game_version}", "files_removed": 0}
if debug_mode:
print(f"DEBUG: 开始卸载 {game_version} 补丁，目录: {game_dir}")
try:
files_removed = 0
@@ -98,28 +98,51 @@ class PatchManager:
patch_file_path.replace("_", "-"),
]
# 查找并删除补丁文件
if debug_mode:
print(f"DEBUG: 查找以下可能的补丁文件路径: {patch_files_to_check}")
# 查找并删除补丁文件，包括启用和禁用的
patch_file_found = False
for patch_path in patch_files_to_check:
# 检查常规补丁文件
if os.path.exists(patch_path):
patch_file_found = True
os.remove(patch_path)
files_removed += 1
if debug_mode:
print(f"DEBUG: 已删除补丁文件: {patch_path}")
# 检查被禁用的补丁文件（带.fain后缀）
disabled_path = f"{patch_path}.fain"
if os.path.exists(disabled_path):
patch_file_found = True
os.remove(disabled_path)
files_removed += 1
if debug_mode:
print(f"DEBUG: 已删除被禁用的补丁文件: {disabled_path}")
if not patch_file_found and debug_mode:
print(f"DEBUG: 未找到补丁文件，检查了以下路径: {patch_files_to_check}")
print(f"DEBUG: 也检查了禁用的补丁文件（.fain后缀）")
# 检查是否有额外的签名文件 (.sig)
if game_version == "NEKOPARA After":
for patch_path in patch_files_to_check:
# 检查常规签名文件
sig_file_path = f"{patch_path}.sig"
if os.path.exists(sig_file_path):
os.remove(sig_file_path)
files_removed += 1
if debug_mode:
print(f"DEBUG: 已删除签名文件: {sig_file_path}")
# 检查被禁用补丁的签名文件
disabled_sig_path = f"{patch_path}.fain.sig"
if os.path.exists(disabled_sig_path):
os.remove(disabled_sig_path)
files_removed += 1
if debug_mode:
print(f"DEBUG: 已删除被禁用补丁的签名文件: {disabled_sig_path}")
# 删除patch文件夹
patch_folders_to_check = [
@@ -206,6 +229,8 @@ class PatchManager:
error_message = f"\n卸载 {game_version} 补丁时出错：\n\n{str(e)}\n"
if debug_mode:
print(f"DEBUG: 卸载错误 - {str(e)}")
import traceback
print(f"DEBUG: 错误详情:\n{traceback.format_exc()}")
QMessageBox.critical(
None,
@@ -310,7 +335,7 @@ class PatchManager:
game_version: 游戏版本
Returns:
bool: 如果已安装补丁返回True，否则返回False
bool: 如果已安装补丁或有被禁用的补丁文件返回True，否则返回False
"""
debug_mode = self._is_debug_mode()
@@ -336,6 +361,12 @@ class PatchManager:
if debug_mode:
print(f"DEBUG: 找到补丁文件: {patch_path}")
return True
# 检查是否存在被禁用的补丁文件（带.fain后缀）
disabled_path = f"{patch_path}.fain"
if os.path.exists(disabled_path):
if debug_mode:
print(f"DEBUG: 找到被禁用的补丁文件: {disabled_path}")
return True
# 检查是否有补丁文件夹
patch_folders_to_check = [
@@ -388,4 +419,325 @@ class PatchManager:
# 没有找到补丁文件或文件夹
if debug_mode:
print(f"DEBUG: {game_version} 在 {game_dir} 中没有安装补丁")
return False
return False
def check_patch_disabled(self, game_dir, game_version):
"""检查游戏的补丁是否已被禁用
Args:
game_dir: 游戏目录路径
game_version: 游戏版本
Returns:
bool: 如果补丁被禁用返回True，否则返回False
str: 禁用的补丁文件路径，如果没有禁用返回None
"""
debug_mode = self._is_debug_mode()
if game_version not in self.game_info:
return False, None
# 获取可能的补丁文件路径
install_path_base = os.path.basename(self.game_info[game_version]["install_path"])
patch_file_path = os.path.join(game_dir, install_path_base)
# 检查是否存在禁用的补丁文件（.fain后缀）
disabled_patch_files = [
f"{patch_file_path}.fain",
f"{patch_file_path.lower()}.fain",
f"{patch_file_path.upper()}.fain",
f"{patch_file_path.replace('_', '')}.fain",
f"{patch_file_path.replace('_', '-')}.fain",
]
# 检查是否有禁用的补丁文件
for disabled_path in disabled_patch_files:
if os.path.exists(disabled_path):
if debug_mode:
print(f"DEBUG: 找到禁用的补丁文件: {disabled_path}")
return True, disabled_path
if debug_mode:
print(f"DEBUG: {game_version} 在 {game_dir} 的补丁未被禁用")
return False, None
def toggle_patch(self, game_dir, game_version, operation=None, silent=False):
"""切换补丁的禁用/启用状态
Args:
game_dir: 游戏目录路径
game_version: 游戏版本
operation: 指定操作，可以是"enable"、"disable"或None（None则自动切换当前状态）
silent: 是否静默模式(不显示弹窗)
Returns:
dict: 包含操作结果信息的字典
"""
debug_mode = self._is_debug_mode()
if debug_mode:
print(f"DEBUG: 开始切换补丁状态 - 游戏版本: {game_version}, 游戏目录: {game_dir}, 操作: {operation}")
if game_version not in self.game_info:
if debug_mode:
print(f"DEBUG: 无法识别游戏版本: {game_version}")
if not silent:
QMessageBox.critical(
None,
f"错误 - {self.app_name}",
f"\n无法识别游戏版本: {game_version}\n",
QMessageBox.StandardButton.Ok,
)
return {"success": False, "message": f"无法识别游戏版本: {game_version}", "action": "none"}
# 检查补丁是否已安装
is_patch_installed = self.check_patch_installed(game_dir, game_version)
if debug_mode:
print(f"DEBUG: 补丁安装状态检查结果: {is_patch_installed}")
if not is_patch_installed:
if debug_mode:
print(f"DEBUG: {game_version} 未安装补丁，无法进行禁用/启用操作")
if not silent:
QMessageBox.warning(
None,
f"提示 - {self.app_name}",
f"\n{game_version} 未安装补丁，无法进行禁用/启用操作。\n",
QMessageBox.StandardButton.Ok,
)
return {"success": False, "message": f"{game_version} 未安装补丁", "action": "none"}
try:
# 检查当前状态
is_disabled, disabled_path = self.check_patch_disabled(game_dir, game_version)
if debug_mode:
print(f"DEBUG: 补丁禁用状态检查结果 - 是否禁用: {is_disabled}, 禁用路径: {disabled_path}")
# 获取可能的补丁文件路径
install_path_base = os.path.basename(self.game_info[game_version]["install_path"])
patch_file_path = os.path.join(game_dir, install_path_base)
# 尝试查找原始补丁文件，支持不同大小写
patch_files_to_check = [
patch_file_path,
patch_file_path.lower(),
patch_file_path.upper(),
patch_file_path.replace("_", ""),
patch_file_path.replace("_", "-"),
]
if debug_mode:
print(f"DEBUG: 将检查以下可能的补丁文件: {patch_files_to_check}")
# 确定操作类型
if operation:
if operation == "enable":
action_needed = is_disabled # 只有当前是禁用状态时才需要启用
elif operation == "disable":
action_needed = not is_disabled # 只有当前是启用状态时才需要禁用
else:
action_needed = True # 无效操作类型，强制进行操作
else:
action_needed = True # 未指定操作类型，始终执行切换
if debug_mode:
print(f"DEBUG: 操作决策 - 操作类型: {operation}, 是否需要执行操作: {action_needed}")
if not action_needed:
# 补丁已经是目标状态，无需操作
if operation == "enable":
message = f"{game_version} 补丁已经是启用状态"
else:
message = f"{game_version} 补丁已经是禁用状态"
if debug_mode:
print(f"DEBUG: {message}, 无需操作")
if not silent:
QMessageBox.information(
None,
f"提示 - {self.app_name}",
f"\n{message}\n",
QMessageBox.StandardButton.Ok,
)
return {"success": True, "message": message, "action": "none"}
if is_disabled:
# 当前是禁用状态，需要启用
if disabled_path and os.path.exists(disabled_path):
# 从禁用文件名去掉.fain后缀
enabled_path = disabled_path[:-5] # 去掉.fain
if debug_mode:
print(f"DEBUG: 正在启用补丁 - 从 {disabled_path} 重命名为 {enabled_path}")
os.rename(disabled_path, enabled_path)
if debug_mode:
print(f"DEBUG: 已启用 {game_version} 的补丁，重命名文件成功")
action = "enable"
message = f"{game_version} 补丁已启用"
else:
# 未找到禁用的补丁文件，但状态是禁用
message = f"未找到禁用的补丁文件: {disabled_path}"
if debug_mode:
print(f"DEBUG: {message}")
return {"success": False, "message": message, "action": "none"}
else:
# 当前是启用状态，需要禁用
# 查找正在使用的补丁文件
active_patch_file = None
for patch_path in patch_files_to_check:
if os.path.exists(patch_path):
active_patch_file = patch_path
if debug_mode:
print(f"DEBUG: 找到活跃的补丁文件: {active_patch_file}")
break
if active_patch_file:
# 给补丁文件添加.fain后缀禁用它
disabled_path = f"{active_patch_file}.fain"
if debug_mode:
print(f"DEBUG: 正在禁用补丁 - 从 {active_patch_file} 重命名为 {disabled_path}")
os.rename(active_patch_file, disabled_path)
if debug_mode:
print(f"DEBUG: 已禁用 {game_version} 的补丁，重命名文件成功")
action = "disable"
message = f"{game_version} 补丁已禁用"
else:
# 未找到活跃的补丁文件，但状态是启用
message = f"未找到启用的补丁文件，请检查游戏目录: {game_dir}"
if debug_mode:
print(f"DEBUG: {message}")
return {"success": False, "message": message, "action": "none"}
# 非静默模式下显示操作结果
if not silent:
QMessageBox.information(
None,
f"操作成功 - {self.app_name}",
f"\n{message}\n",
QMessageBox.StandardButton.Ok,
)
if debug_mode:
print(f"DEBUG: 切换补丁状态操作完成 - 结果: 成功, 操作: {action}, 消息: {message}")
return {"success": True, "message": message, "action": action}
except Exception as e:
error_message = f"切换 {game_version} 补丁状态时出错: {str(e)}"
if debug_mode:
print(f"DEBUG: {error_message}")
import traceback
print(f"DEBUG: 错误详情:\n{traceback.format_exc()}")
if not silent:
QMessageBox.critical(
None,
f"操作失败 - {self.app_name}",
f"\n{error_message}\n",
QMessageBox.StandardButton.Ok,
)
return {"success": False, "message": error_message, "action": "none"}
def batch_toggle_patches(self, game_dirs, operation=None):
"""批量切换多个游戏补丁的禁用/启用状态
Args:
game_dirs: 游戏版本到游戏目录的映射字典
operation: 指定操作，可以是"enable"、"disable"或None（None则自动切换当前状态）
Returns:
tuple: (成功数量, 失败数量, 详细结果列表)
"""
success_count = 0
fail_count = 0
debug_mode = self._is_debug_mode()
results = []
if debug_mode:
print(f"DEBUG: 开始批量切换补丁状态 - 操作: {operation}, 游戏数量: {len(game_dirs)}")
print(f"DEBUG: 游戏列表: {list(game_dirs.keys())}")
for version, path in game_dirs.items():
try:
if debug_mode:
print(f"DEBUG: 处理游戏 {version}, 目录: {path}")
# 在批量模式下使用静默操作
result = self.toggle_patch(path, version, operation=operation, silent=True)
if debug_mode:
print(f"DEBUG: 游戏 {version} 操作结果: {result}")
if result["success"]:
success_count += 1
if debug_mode:
print(f"DEBUG: 游戏 {version} 操作成功，操作类型: {result['action']}")
else:
fail_count += 1
if debug_mode:
print(f"DEBUG: 游戏 {version} 操作失败，原因: {result['message']}")
results.append({
"version": version,
"success": result["success"],
"message": result["message"],
"action": result["action"]
})
except Exception as e:
if debug_mode:
print(f"DEBUG: 切换 {version} 补丁状态时出错: {str(e)}")
import traceback
print(f"DEBUG: 错误详情:\n{traceback.format_exc()}")
fail_count += 1
results.append({
"version": version,
"success": False,
"message": f"操作出错: {str(e)}",
"action": "none"
})
if debug_mode:
print(f"DEBUG: 批量切换补丁状态完成 - 成功: {success_count}, 失败: {fail_count}")
return success_count, fail_count, results
def show_toggle_result(self, success_count, fail_count, results=None):
"""显示批量切换补丁状态的结果
Args:
success_count: 成功操作的数量
fail_count: 操作失败的数量
results: 详细结果列表，如果提供，会显示更详细的信息
"""
result_text = f"\n批量操作完成！\n成功: {success_count} 个\n失败: {fail_count} 个\n"
# 如果有详细结果，添加到消息中
if results:
enabled_list = [r["version"] for r in results if r["success"] and r["action"] == "enable"]
disabled_list = [r["version"] for r in results if r["success"] and r["action"] == "disable"]
skipped_list = [r["version"] for r in results if r["success"] and r["action"] == "none"]
fail_list = [r["version"] for r in results if not r["success"]]
if enabled_list:
result_text += f"\n【已启用补丁】：\n{chr(10).join(enabled_list)}\n"
if disabled_list:
result_text += f"\n【已禁用补丁】：\n{chr(10).join(disabled_list)}\n"
if skipped_list:
result_text += f"\n【无需操作】：\n{chr(10).join(skipped_list)}\n"
if fail_list:
result_text += f"\n【操作失败】：\n{chr(10).join(fail_list)}\n"
QMessageBox.information(
None,
f"批量操作完成 - {self.app_name}",
result_text,
QMessageBox.StandardButton.Ok,
)

14
source/core/window_manager.py
View File

@@ -115,22 +115,30 @@ class WindowManager:
btn_width = 211 # 扩大后的容器宽度
btn_height = 111 # 扩大后的容器高度
x_pos = new_width - btn_width - right_margin
y_pos = int((new_height - 65) * 0.28) - 10 # 调整为更靠上的位置
y_pos = int((new_height - 65) * 0.18) - 10 # 从0.28改为0.18，向上移动
self.ui.button_container.setGeometry(x_pos, y_pos, btn_width, btn_height)
# 添加禁/启用补丁按钮容器的位置调整
if hasattr(self.ui, 'toggle_patch_container'):
btn_width = 211 # 扩大后的容器宽度
btn_height = 111 # 扩大后的容器高度
x_pos = new_width - btn_width - right_margin
y_pos = int((new_height - 65) * 0.36) - 10 # 从0.46改为0.36，向上移动
self.ui.toggle_patch_container.setGeometry(x_pos, y_pos, btn_width, btn_height)
# 添加卸载补丁按钮容器的位置调整
if hasattr(self.ui, 'uninstall_container'):
btn_width = 211 # 扩大后的容器宽度
btn_height = 111 # 扩大后的容器高度
x_pos = new_width - btn_width - right_margin
y_pos = int((new_height - 65) * 0.46) - 10 # 调整为中间位置
y_pos = int((new_height - 65) * 0.54) - 10 # 从0.64改为0.54，向上移动
self.ui.uninstall_container.setGeometry(x_pos, y_pos, btn_width, btn_height)
if hasattr(self.ui, 'exit_container'):
btn_width = 211 # 扩大后的容器宽度
btn_height = 111 # 扩大后的容器高度
x_pos = new_width - btn_width - right_margin
y_pos = int((new_height - 65) * 0.64) - 10 # 调整为更靠下的位置
y_pos = int((new_height - 65) * 0.72) - 10 # 从0.82改为0.72，向上移动
self.ui.exit_container.setGeometry(x_pos, y_pos, btn_width, btn_height)
# 更新圆角