From d738978dff664ca4044c4e808cd9ae0665f217b3 Mon Sep 17 00:00:00 2001
From: Kayshen-X <kayshen_xu@163.com>
Date: Sun, 31 May 2026 23:51:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(git):=20match=20TS=20metrics=20=E2=80=94=20?=
 =?UTF-8?q?chip/arrow=2012px,=20full-strength=20colors,=20merge=20header?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git_panel_ready: branch chip GitBranch 14→12, label 13→12, chevron 10→12;
pull/push arrows 14→12 with full foreground (enabled) / muted-foreground
(disabled) instead of 0.80/0.50 alpha; milestone button font 12→11, gap 5→4,
icon stroke 1.8→2.0. git_panel_menus: merge header now 合并到 {branch}
(git.branch.mergeHeading) not the generic action label, and merge rows use a
ChevronRight glyph (TS branch-row) instead of GitBranch.
---
 .../src/widgets/git_panel_menus.rs            | 23 +++++++++++-----
 .../src/widgets/git_panel_ready.rs            | 26 ++++++++++---------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/crates/op-editor-ui/src/widgets/git_panel_menus.rs b/crates/op-editor-ui/src/widgets/git_panel_menus.rs
index 175a0f8e1..38785b73b 100644
--- a/crates/op-editor-ui/src/widgets/git_panel_menus.rs
+++ b/crates/op-editor-ui/src/widgets/git_panel_menus.rs
@@ -185,10 +185,18 @@ impl GitPanel<'_> {
         cx.backend.stroke_round_rect(panel, 8.0, t.border, 1.0);
 
         let mode = self.state.branch_picker_mode;
-        // Header label per mode (TS list / create / merge headings).
-        let heading = match mode {
+        // Header label per mode (TS list / create / merge headings). Merge
+        // uses "合并到 {name}" (git.branch.mergeHeading) with the current
+        // branch substituted, not the generic "合并分支…" action label.
+        let merge_heading;
+        let heading: &str = match mode {
             GitBranchPickerMode::Create => self.t("git.branch.createAction"),
-            GitBranchPickerMode::Merge => self.t("git.branch.mergeAction"),
+            GitBranchPickerMode::Merge => {
+                merge_heading = self
+                    .t("git.branch.mergeHeading")
+                    .replace("{{name}}", self.state.branch.as_deref().unwrap_or(""));
+                &merge_heading
+            }
             GitBranchPickerMode::List => self.t("git.branch.listHeading"),
         };
         self.text(
@@ -265,14 +273,15 @@ impl GitPanel<'_> {
                 t.muted_foreground,
             );
             if merging {
+                // TS merge-candidate row trailing glyph is a ChevronRight.
                 draw_icon(
                     cx.backend,
-                    Icon::GitBranch,
+                    Icon::ChevronRight,
                     Point2D::new(
-                        row.origin.x + row.size.x - 24.0,
-                        row.origin.y + (row.size.y - 14.0) / 2.0,
+                        row.origin.x + row.size.x - 22.0,
+                        row.origin.y + (row.size.y - 12.0) / 2.0,
                     ),
-                    14.0,
+                    12.0,
                     t.muted_foreground,
                     1.5,
                 );
diff --git a/crates/op-editor-ui/src/widgets/git_panel_ready.rs b/crates/op-editor-ui/src/widgets/git_panel_ready.rs
index 064ae9b2c..58930b267 100644
--- a/crates/op-editor-ui/src/widgets/git_panel_ready.rs
+++ b/crates/op-editor-ui/src/widgets/git_panel_ready.rs
@@ -172,8 +172,8 @@ impl GitPanel<'_> {
         draw_icon(
             cx.backend,
             Icon::GitBranch,
-            Point2D::new(branch_r.origin.x, cy - 7.0),
-            14.0,
+            Point2D::new(branch_r.origin.x, cy - 6.0),
+            12.0,
             t.foreground,
             1.5,
         );
@@ -186,14 +186,14 @@ impl GitPanel<'_> {
             &label,
             branch_r.origin.x + 18.0,
             cy + 4.0,
-            13.0,
+            12.0,
             t.foreground,
         );
         draw_icon(
             cx.backend,
             Icon::ChevronDown,
-            Point2D::new(branch_r.origin.x + branch_r.size.x - 12.0, cy - 5.0),
-            10.0,
+            Point2D::new(branch_r.origin.x + branch_r.size.x - 14.0, cy - 6.0),
+            12.0,
             t.muted_foreground,
             1.5,
         );
@@ -344,12 +344,14 @@ impl GitPanel<'_> {
     /// One ghost icon button — a faint rounded slot + a centred glyph,
     /// dimmed when disabled.
     fn paint_ready_icon(&self, cx: &mut PaintCx<'_>, rect: Rect, icon: Icon, enabled: bool) {
+        // TS: enabled = currentColor (foreground), disabled = full
+        // text-muted-foreground — no half-alpha (git-panel-remote-controls.tsx).
         let color = if enabled {
-            alpha(self.theme.foreground, 0.80)
+            self.theme.foreground
         } else {
-            alpha(self.theme.muted_foreground, 0.50)
+            self.theme.muted_foreground
         };
-        let s = 14.0;
+        let s = 12.0;
         let c = Point2D::new(
             rect.origin.x + (rect.size.x - s) / 2.0,
             rect.origin.y + (rect.size.y - s) / 2.0,
@@ -371,8 +373,8 @@ impl GitPanel<'_> {
 
         let label = self.t("git.commit.submitButton");
         let icon_s = 11.0;
-        let gap = 5.0;
-        let label_w = cx.backend.measure_text(label, 12.0);
+        let gap = 4.0;
+        let label_w = cx.backend.measure_text(label, 11.0);
         let content_w = icon_s + gap + label_w;
         let start_x = rect.origin.x + (rect.size.x - content_w).max(6.0) / 2.0;
         let color = alpha(t.primary_foreground, factor);
@@ -385,14 +387,14 @@ impl GitPanel<'_> {
             Point2D::new(start_x, rect.origin.y + (rect.size.y - icon_s) / 2.0),
             icon_s,
             color,
-            1.8,
+            2.0,
         );
         self.text(
             cx,
             label,
             start_x + icon_s + gap,
             rect.origin.y + rect.size.y / 2.0 + 4.0,
-            12.0,
+            11.0,
             color,
         );
         cx.backend.restore();