From 99b4db919b62f35e6d37b92cda8c2a102966ef10 Mon Sep 17 00:00:00 2001 From: Greg Pomerantz Date: Sat, 9 May 2026 14:49:43 -0400 Subject: [PATCH] Always draw Cut, Copy, Paste, Search icons; only ConflictIcon is conditional Co-authored-by: Qwen-Coder --- internal/ui/render.go | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/internal/ui/render.go b/internal/ui/render.go index daa35c0..ea3ef14 100644 --- a/internal/ui/render.go +++ b/internal/ui/render.go @@ -120,33 +120,25 @@ func (r *Renderer) drawStatusBar(gtx layout.Context, sb StatusBar) { // This matches Gio's default line spacing (ascent+descent with LineHeightScale=1.0). iconsLineY := filenameLineY + unit.Dp(20) - // Left side: Cut, Copy, Paste icons + // Left side: Cut, Copy, Paste icons (always visible) leftX := reg.X + unit.Dp(8) iconY := iconsLineY - if sb.CutCopy { - r.drawText(gtx, th.Shaper, "✂", r.theme.FontSize, leftX, iconY, color.NRGBA{R: 0, G: 0, B: 0, A: 255}) - leftX += unit.Dp(36) - } - if sb.Copy { - r.drawText(gtx, th.Shaper, "⎘", r.theme.FontSize, leftX, iconY, color.NRGBA{R: 0, G: 0, B: 0, A: 255}) - leftX += unit.Dp(36) - } - if sb.Paste { - r.drawText(gtx, th.Shaper, "⎘", r.theme.FontSize, leftX, iconY, color.NRGBA{R: 0, G: 0, B: 0, A: 255}) - leftX += unit.Dp(36) - } + r.drawText(gtx, th.Shaper, "✂", r.theme.FontSize, leftX, iconY, color.NRGBA{R: 0, G: 0, B: 0, A: 255}) + leftX += unit.Dp(36) + r.drawText(gtx, th.Shaper, "⎘", r.theme.FontSize, leftX, iconY, color.NRGBA{R: 0, G: 0, B: 0, A: 255}) + leftX += unit.Dp(36) + r.drawText(gtx, th.Shaper, "⎘", r.theme.FontSize, leftX, iconY, color.NRGBA{R: 0, G: 0, B: 0, A: 255}) + leftX += unit.Dp(12) - // Right side: Conflict, Search icons + // Right side: Conflict (conditional), Search (always visible) rightX := reg.X + reg.W - unit.Dp(8) - if sb.Search { - rightX -= unit.Dp(36) - r.drawText(gtx, th.Shaper, "🔍", r.theme.FontSize, rightX, iconY, color.NRGBA{R: 0, G: 0, B: 0, A: 255}) - } if sb.ConflictIcon { rightX -= unit.Dp(36) r.drawText(gtx, th.Shaper, "⚠", r.theme.FontSize, rightX, iconY, color.NRGBA{R: 0, G: 0, B: 0, A: 255}) } + rightX -= unit.Dp(36) + r.drawText(gtx, th.Shaper, "🔍", r.theme.FontSize, rightX, iconY, color.NRGBA{R: 0, G: 0, B: 0, A: 255}) c.Pop() }