Skip to content

feat: 完善悬浮窗的逻辑 - #5

Merged
ywydog merged 16 commits into
mainfrom
trae/solo-agent-VuGEdC
Jul 9, 2026
Merged

feat: 完善悬浮窗的逻辑#5
ywydog merged 16 commits into
mainfrom
trae/solo-agent-VuGEdC

Conversation

@ywydog

@ywydog ywydog commented Jul 9, 2026

Copy link
Copy Markdown
Owner

No description provided.

ywydog and others added 16 commits June 19, 2026 20:02
悬浮窗重构
Co-authored-by: traeagent <traeagent@users.noreply.github.com>
- Actions/ShowFloatingWindowAction.cs: 保留 HEAD 的空悬浮窗组件检查与 main 的 IsRevertable 状态快照
- Services/FloatingWindowService.cs: 保留 HEAD 基于 FloatingWindowProfile 的行规则集方案

Co-Authored-By: TRAE Agent <agent@trae.local>
- 去除悬浮窗设置页中的“组件库”区域
- 在“添加行”旁新增“添加按钮” Flyout,用于从可用按钮池中选择添加
- 为每个悬浮窗按钮项增加“设置”与“从行中移除”按钮,可在按钮单独设置中调整规则集
- 调整按钮项 Grid 列为 Auto,*,Auto,Auto,确保设置/移除按钮完整显示
- 修复 ToggleFloatingWindowLayer 的 TargetLayer 语义:0=置底,1=置顶(与 FloatingWindowProfile 内部语义一致)
- 修正 ShowFloatingWindowAction 恢复逻辑中 MainConfig 为 null 的潜在空引用

Co-Authored-By: TRAE Agent <agent@trae.local>
- 删除悬浮窗设置页中的“组件库”及“添加按钮” Flyout
- 新注册的按钮自动追加到第一行;被用户移除的按钮配置保留为 IsVisible=false,避免自动重新出现
- 按钮项内采用 inline 规则集/移除按钮,避免设置按钮被截断
- 行标题右侧增加行规则集、在下方插入一行、删除行三个操作按钮(参照 oSq 分支布局)
- 新增 OnRowRulesetClick / OnInsertRowBelowClick 事件处理
- ViewModel 移除 AvailableFloatingTriggerItems 集合,AddTriggerFromPool 改为直接从 Entries 重建

Co-Authored-By: TRAE Agent <agent@trae.local>
Remove the per-button remove button from floating window layout editor;
button removal is now handled via row settings only.
- ShowFloatingWindowAction: keep existing snapshot with null-safe revert
- ToggleFloatingWindowLayerAction: save/restore layer via ActionSet.Guid
- SwitchFloatingWindowThemeAction: save/restore theme via ActionSet.Guid
- ToggleFloatingWindowProfileAction: save/restore profile via ActionSet.Guid

Aligns with ClassIsland's revert pattern of keying snapshots by ActionSet.Guid.
Co-authored-by: traeagent <traeagent@users.noreply.github.com>
Co-authored-by: traeagent <traeagent@users.noreply.github.com>
Co-authored-by: traeagent <traeagent@users.noreply.github.com>
Co-authored-by: traeagent <traeagent@users.noreply.github.com>
Co-authored-by: traeagent <traeagent@users.noreply.github.com>
Co-authored-by: traeagent <traeagent@users.noreply.github.com>
Co-authored-by: traeagent <traeagent@users.noreply.github.com>
保留 trae/solo-agent-VuGEdC 上的悬浮窗改进:
- 4 个悬浮窗 Action 的可恢复快照(OnRevert 机制)
- 智能悬浮窗显隐(HasAnyVisibleButton)
- 一直显示拖拽把手功能(FloatingWindowDragHandleAlwaysVisible)
- 行/按钮规则集 Drawer、属性实时监听

与 origin/main 的差异保留:
- 切换悬浮窗层级方向 0=置底 1=置顶(与 Action 一致)
- 移除组件库,使用 axaml 中重做的"按钮行+按钮"布局
@ywydog
ywydog merged commit 07e8c9a into main Jul 9, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant