Skip to content

The ultimate harness for coding agents and beyond. All your agents. All your machines. One command center. Start with code, then follow your curiosity and build across disciplines: CAD, circuits, robots, games and music.

fix(desktop): hide PR context when pane controls appear (#266)

Leof6d3569b4e8e
diff --git a/desktop/lib/widgets/pane_header_actions.dart b/desktop/lib/widgets/pane_header_actions.dart
index 782c642d0..a2c673381 100644
--- a/desktop/lib/widgets/pane_header_actions.dart
+++ b/desktop/lib/widgets/pane_header_actions.dart
@@ -58,7 +58,7 @@ class PaneHeaderActions extends StatelessWidget {
/// layers keep their size so hovering never changes the title's width.
final Widget? details;
- /// A status link that stays interactive while hover reveals the controls.
+ /// Supplemental branch context, hidden with details when controls appear.
final Widget? trailing;
/// Where this agent runs, shown with the controls rather than beside the name.
@@ -202,7 +202,7 @@ class PaneHeaderActions extends StatelessWidget {
),
);
if (details == null) return controls;
- final layers = Stack(
+ return Stack(
alignment: Alignment.centerRight,
children: [
IgnorePointer(
@@ -213,21 +213,23 @@ class PaneHeaderActions extends StatelessWidget {
duration: MediaQuery.disableAnimationsOf(context)
? Duration.zero
: grid.AppMotion.hover,
- child: ExcludeSemantics(excluding: visible, child: details!),
+ child: ExcludeSemantics(
+ excluding: visible,
+ child: trailing == null
+ ? details!
+ : Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Flexible(child: details!),
+ trailing!,
+ ],
+ ),
+ ),
),
),
controls,
],
);
- return trailing == null
- ? layers
- : Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- Flexible(child: layers),
- trailing!,
- ],
- );
}
}
diff --git a/desktop/test/pull_request_badge_test.dart b/desktop/test/pull_request_badge_test.dart
index faf6febe3..3bc7d07e2 100644
--- a/desktop/test/pull_request_badge_test.dart
+++ b/desktop/test/pull_request_badge_test.dart
@@ -18,10 +18,9 @@ void main() {
body: PullRequestBadge(identity: id, read: read, open: open),
),
);
- testWidgets('PR remains clickable when hovering reveals header controls', (
+ testWidgets('PR and branch hide together while hovering reveals controls', (
tester,
) async {
- var opened = false;
await tester.pumpWidget(
MaterialApp(
home: Scaffold(
@@ -40,10 +39,6 @@ void main() {
'state': 'Open',
'url': 'https://github.com/acme/repo/pull/12',
},
- open: (_) async {
- opened = true;
- return true;
- },
),
),
),
@@ -56,8 +51,22 @@ void main() {
await mouse.addPointer(location: Offset.zero);
await mouse.moveTo(tester.getCenter(find.text('PR #12 · Open')));
await tester.pumpAndSettle();
- await tester.tap(find.text('PR #12 · Open'));
- expect(opened, isTrue);
+ final details = find.byKey(const ValueKey('pane-header-details'));
+ expect(tester.widget<AnimatedOpacity>(details).opacity, 0);
+ expect(
+ find.descendant(of: details, matching: find.text('branch-name')),
+ findsOneWidget,
+ );
+ expect(
+ find.descendant(of: details, matching: find.text('PR #12 · Open')),
+ findsOneWidget,
+ );
+ expect(find.text('PR #12 · Open').hitTestable(), findsNothing);
+ expect(find.byTooltip('Zoom Pane').hitTestable(), findsOneWidget);
+ await mouse.moveTo(const Offset(700, 500));
+ await tester.pumpAndSettle();
+ expect(tester.widget<AnimatedOpacity>(details).opacity, 1);
+ expect(find.text('PR #12 · Open').hitTestable(), findsOneWidget);
await mouse.removePointer();
await tester.pumpWidget(const SizedBox());
});
diff --git a/docs/vi/worktree-pull-requests_vi.md b/docs/vi/worktree-pull-requests_vi.md
index 6d82d9005..ea2d63468 100644
--- a/docs/vi/worktree-pull-requests_vi.md
+++ b/docs/vi/worktree-pull-requests_vi.md
@@ -1,7 +1,7 @@
# PR bên cạnh branch
Header terminal đủ rộng có link riêng `PR #123 · Draft / Open / Merged / Closed`, giữ nguyên màu
-branch. Link vẫn click được khi hover hiện các nút điều khiển. Header hẹp dùng nhãn gọn `#123 · Draft`, ưu tiên chỗ cho trạng thái PR trước tên branch.
+branch. Nhãn PR và thông tin branch cùng ẩn khi hover để chỉ hiện các nút điều khiển. Header hẹp dùng nhãn gọn `#123 · Draft`, ưu tiên chỗ cho trạng thái PR trước tên branch.
Chỉ header rất nhỏ (dưới 360 logical pixel ở cỡ chữ bình thường) mới ẩn nhãn.
Click mở GitHub; không merge, checkout hay xoá worktree.
diff --git a/docs/worktree-pull-requests.md b/docs/worktree-pull-requests.md
index 7b0667432..a30b08508 100644
--- a/docs/worktree-pull-requests.md
+++ b/docs/worktree-pull-requests.md
@@ -1,7 +1,7 @@
# Pull requests beside the branch
Wide terminal headers show a separate `PR #123 · Draft / Open / Merged / Closed` link next to
-branch context. The branch keeps its existing colour. The link remains clickable when hovering
+branch context. The branch keeps its existing colour. The PR badge and branch context hide together when hovering
reveals the pane controls; compact headers use `#123 · Draft` and reserve room for the badge before branch prose.
Only very small headers (under 360 logical pixels at normal text scale) omit it.
Clicking opens GitHub. Nothing merges a PR, changes a checkout, or deletes a worktree.