修复悬赏封印重复调起自定义任务,优化日志模块动画

TanyaShue · Nov 8, 2024 · 1ec62fa · 1ec62fa
1 parent 7023a10
commit 1ec62fa
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 11 deletions.
diff --git a/assets b/assets
diff --git a/src/custom_actions/task_list.py b/src/custom_actions/task_list.py
@@ -28,7 +28,7 @@ def run(self, context: Context, argv: CustomAction.RunArg) -> bool:
             print(f"执行任务: {task}")
             context.run_pipeline(task)
             print(f"任务 {task} 执行完成")
-            context.run_pipeline("返回庭院")
+            # context.run_pipeline("返回庭院")
             time.sleep(2)
         return True
 

diff --git a/src/ui/containers/log_container.py b/src/ui/containers/log_container.py
@@ -7,14 +7,18 @@ class LogContainer(QWidget):
     def __init__(self, parent=None):
         super().__init__(parent)
         self.expanded = False
+        # 初始化时完全收起
+        self.setFixedWidth(0)
         self.setMinimumWidth(0)
+        self.setMaximumWidth(0)
         self.setup_ui()
 
     def setup_ui(self):
         main_layout = QVBoxLayout(self)
         main_layout.setSpacing(0)
         main_layout.setContentsMargins(0, 0, 0, 0)
 
+        # 标题栏
         title_frame = QFrame()
         title_layout = QVBoxLayout(title_frame)
         title_layout.setContentsMargins(10, 10, 10, 10)
@@ -24,17 +28,46 @@ def setup_ui(self):
         title_layout.addWidget(self.title_label)
         main_layout.addWidget(title_frame)
 
-        log_area = QTextEdit()
-        log_area.setPlaceholderText("日志输出...")
-        log_area.setReadOnly(True)
-        main_layout.addWidget(log_area)
+        # 日志区域
+        self.log_area = QTextEdit()
+        self.log_area.setPlaceholderText("日志输出...")
+        self.log_area.setReadOnly(True)
+        main_layout.addWidget(self.log_area)
+
+        # 初始状态隐藏所有子组件
+        self.title_label.hide()
+        self.log_area.hide()
 
     def toggle_log_container(self):
+        # 设置目标宽度
         target_width = 300 if not self.expanded else 0
-        self.width_anim = QPropertyAnimation(self, b"minimumWidth")
+
+        # 创建宽度动画
+        self.width_anim = QPropertyAnimation(self, b"maximumWidth")
         self.width_anim.setDuration(300)
-        self.width_anim.setStartValue(self.minimumWidth())
+        self.width_anim.setStartValue(self.width())
         self.width_anim.setEndValue(target_width)
         self.width_anim.setEasingCurve(QEasingCurve.OutCubic)
+
+        # 同步最小宽度动画
+        self.min_width_anim = QPropertyAnimation(self, b"minimumWidth")
+        self.min_width_anim.setDuration(300)
+        self.min_width_anim.setStartValue(self.width())
+        self.min_width_anim.setEndValue(target_width)
+        self.min_width_anim.setEasingCurve(QEasingCurve.OutCubic)
+
+        # 切换展开状态
         self.expanded = not self.expanded
-        self.width_anim.start()
+
+        # 根据展开状态显示/隐藏组件
+        if self.expanded:
+            self.title_label.show()
+            self.log_area.show()
+        else:
+            # 在动画结束时隐藏组件
+            self.width_anim.finished.connect(lambda: self.title_label.hide())
+            self.width_anim.finished.connect(lambda: self.log_area.hide())
+
+        # 启动动画
+        self.width_anim.start()
+        self.min_width_anim.start()
diff --git a/src/ui/main_window.py b/src/ui/main_window.py
@@ -16,7 +16,7 @@ def __init__(self):
         self.controller = UIController()
 
         self.setWindowTitle('MaaYYs')
-        self.setMinimumSize(1440, 720)
+        self.setMinimumSize(1280, 720)
 
         # 加载样式
         self.controller.load_styles(self)
@@ -209,7 +209,6 @@ def init_splitter(self):
             layout = QVBoxLayout()
             group.setLayout(layout)
             details_container_splitter.addWidget(group)
-
         # 设置大小比例
         details_container_splitter.setSizes([500, 500])
         details_container_splitter.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)