gmp/Pad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always draw Cut, Copy, Paste, Search icons; only ConflictIcon is conditional

Browse Source 
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
Greg Pomerantz 2026-05-09 14:49:43 -04:00
parent 9fd6239129
commit 99b4db919b
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
internal/ui/render.go
View File

@ -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). // This matches Gio's default line spacing (ascent+descent with LineHeightScale=1.0).
iconsLineY := filenameLineY + unit.Dp(20) 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) leftX := reg.X + unit.Dp(8)
iconY := iconsLineY 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})
r.drawText(gtx, th.Shaper, "✂", r.theme.FontSize, leftX, iconY, color.NRGBA{R: 0, G: 0, B: 0, A: 255}) leftX += unit.Dp(36)
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)
if sb.Copy { r.drawText(gtx, th.Shaper, "⎘", r.theme.FontSize, leftX, iconY, color.NRGBA{R: 0, G: 0, B: 0, A: 255})
r.drawText(gtx, th.Shaper, "⎘", r.theme.FontSize, leftX, iconY, color.NRGBA{R: 0, G: 0, B: 0, A: 255}) leftX += unit.Dp(12)
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)
}
// Right side: Conflict, Search icons // Right side: Conflict (conditional), Search (always visible)
rightX := reg.X + reg.W - unit.Dp(8) 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 { if sb.ConflictIcon {
rightX -= unit.Dp(36) rightX -= unit.Dp(36)
r.drawText(gtx, th.Shaper, "⚠", r.theme.FontSize, rightX, iconY, color.NRGBA{R: 0, G: 0, B: 0, A: 255}) 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() c.Pop()
} }