perf(ui): skip legend placement work when the rectangle is unchanged

commit: 5df88734c95629aee2fb16e05cd182035ae438a6
author: brice · 8d ago · 2026-10-14 08:21 UTC
parent: ef74c93
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

1 file · +22 -18

M internal/ui/mode_toaster_view.go +22 -18


@@ -97,12 +97,17 @@ type gtkModeToasterView struct {
97	97
98	98		bodyWanted bool
99	99		lingering bool
100		-	// placement is the legend rectangle in overlay coordinates; nil hides it.
101		-	placement func() (x, y, width, height int, ok bool)
	100	+	// placement is the legend rectangle in overlay coordinates; it is only
	101	+	// meaningful while placed is set, which otherwise hides the legend.
	102	+	placement overlayRect
	103	+	placed bool
102	104		lastColumns int
103	105		lastWidth, lastMaxContent int
104	106		}
105	107
	108	+	// overlayRect is a rectangle in overlay coordinates.
	109	+	type overlayRect struct{ x, y, width, height int }
	110	+
106	111		func newGTKModeToasterView(overlay gtk.Overlay, window gtk.ApplicationWindow, events modeToasterEvents) *gtkModeToasterView {
107	112		if overlay == nil \|\| window == nil {
108	113		return nil

@@ -117,11 +122,11 @@ func newGTKModeToasterView(overlay gtk.Overlay, window gtk.ApplicationWindow,
117	122		overlay.SetClipOverlay(&v.root.Widget, false)
118	123		overlay.SetMeasureOverlay(&v.root.Widget, false)
119	124		cb := func(_ gtk.Overlay, widgetPtr uintptr, allocation *uintptr) bool {
120		-	if v.root == nil \|\| widgetPtr != v.root.GoPointer() \|\| v.placement == nil {
	125	+	if v.root == nil \|\| widgetPtr != v.root.GoPointer() \|\| !v.placed {
121	126		return false
122	127		}
123		-	x, y, w, h, ok := v.placement()
124		-	return ok && writeOverlayAllocation(allocation, x, y, w, h)
	128	+	r := v.placement
	129	+	return writeOverlayAllocation(allocation, r.x, r.y, r.width, r.height)
125	130		}
126	131		v.positionHandlerID = overlay.ConnectGetChildPosition(&cb)
127	132		v.installWindowControllers()

@@ -605,15 +610,16 @@ func (v *gtkModeToasterView) setBodyVisible(visible bool) {
605	610
606	611		func (v *gtkModeToasterView) hideBody() {
607	612		v.stopRefresh()
608		-	v.placement = nil
	613	+	v.placed = false
609	614		v.root.SetVisible(false)
610	615		}
611	616
612	617		func (v *gtkModeToasterView) lingerRect() (x, y, width, height int, ok bool) {
613		-	if v.placement == nil {
	618	+	if !v.placed {
614	619		return 0, 0, 0, 0, false
615	620		}
616		-	return v.placement()
	621	+	r := v.placement
	622	+	return r.x, r.y, r.width, r.height, true
617	623		}
618	624
619	625		func (v *gtkModeToasterView) scrollLegend(delta float64) bool {

@@ -693,22 +699,20 @@ func (v *gtkModeToasterView) refreshGeometry() {
693	699		return
694	700		}
695	701		y := max(bottom-naturalHeight, 0)
696		-	previous := v.placement
697		-	v.placement = func() (int, int, int, int, bool) { return left, y, bandWidth, naturalHeight, true }
698		-	v.root.SetVisible(true)
699		-	if previous != nil {
700		-	if ox, oy, ow, oh, _ := previous(); ox == left && oy == y && ow == bandWidth && oh == naturalHeight {
701		-	return
702		-	}
	702	+	next := overlayRect{x: left, y: y, width: bandWidth, height: naturalHeight}
	703	+	if v.placed && v.placement == next {
	704	+	return
703	705		}
	706	+	v.placement, v.placed = next, true
	707	+	v.root.SetVisible(true)
704	708		v.root.QueueAllocate()
705	709		}
706	710
707	711		func (v *gtkModeToasterView) clearPlacement() {
708		-	if v.placement == nil {
	712	+	if !v.placed {
709	713		return
710	714		}
711		-	v.placement = nil
	715	+	v.placed = false
712	716		v.root.SetVisible(false)
713	717		v.root.QueueAllocate()
714	718		}

@@ -725,7 +729,7 @@ func (v *gtkModeToasterView) destroy() {
725	729		gobject.SignalHandlerDisconnect(gobject.ObjectNewFromInternalPtr(v.overlay.GoPointer()), v.positionHandlerID)
726	730		v.positionHandlerID = 0
727	731		}
728		-	v.placement = nil
	732	+	v.placed = false
729	733		v.clearColumns()
730	734		v.releaseLegendWidgets()
731	735		v.overlay.RemoveOverlay(&v.pill.Widget)

 	bodyWanted bool
 	lingering  bool
-	// placement is the legend rectangle in overlay coordinates; nil hides it.
+	// placement is the legend rectangle in overlay coordinates; it is only
-	placement                 func() (x, y, width, height int, ok bool)
+	// meaningful while placed is set, which otherwise hides the legend.
+	placement                 overlayRect
+	placed                    bool
 	lastColumns               int
 	lastWidth, lastMaxContent int
 }
+// overlayRect is a rectangle in overlay coordinates.
+type overlayRect struct{ x, y, width, height int }
 func newGTKModeToasterView(overlay *gtk.Overlay, window *gtk.ApplicationWindow, events modeToasterEvents) *gtkModeToasterView {
 	if overlay == nil || window == nil {
 		return nil
 	overlay.SetClipOverlay(&v.root.Widget, false)
 	overlay.SetMeasureOverlay(&v.root.Widget, false)
 	cb := func(_ gtk.Overlay, widgetPtr uintptr, allocation *uintptr) bool {
-		if v.root == nil || widgetPtr != v.root.GoPointer() || v.placement == nil {
+		if v.root == nil || widgetPtr != v.root.GoPointer() || !v.placed {
 			return false
 		}
-		x, y, w, h, ok := v.placement()
+		r := v.placement
-		return ok && writeOverlayAllocation(allocation, x, y, w, h)
+		return writeOverlayAllocation(allocation, r.x, r.y, r.width, r.height)
 	}
 	v.positionHandlerID = overlay.ConnectGetChildPosition(&cb)
 	v.installWindowControllers()
 func (v *gtkModeToasterView) hideBody() {
 	v.stopRefresh()
-	v.placement = nil
+	v.placed = false
 	v.root.SetVisible(false)
 }
 func (v *gtkModeToasterView) lingerRect() (x, y, width, height int, ok bool) {
-	if v.placement == nil {
+	if !v.placed {
 		return 0, 0, 0, 0, false
 	}
-	return v.placement()
+	r := v.placement
+	return r.x, r.y, r.width, r.height, true
 }
 func (v *gtkModeToasterView) scrollLegend(delta float64) bool {
 		return
 	}
 	y := max(bottom-naturalHeight, 0)
-	previous := v.placement
+	next := overlayRect{x: left, y: y, width: bandWidth, height: naturalHeight}
-	v.placement = func() (int, int, int, int, bool) { return left, y, bandWidth, naturalHeight, true }
+	if v.placed && v.placement == next {
-	v.root.SetVisible(true)
+		return
-	if previous != nil {
-		if ox, oy, ow, oh, _ := previous(); ox == left && oy == y && ow == bandWidth && oh == naturalHeight {
-			return
-		}
 	}
+	v.placement, v.placed = next, true
+	v.root.SetVisible(true)
 	v.root.QueueAllocate()
 }
 func (v *gtkModeToasterView) clearPlacement() {
-	if v.placement == nil {
+	if !v.placed {
 		return
 	}
-	v.placement = nil
+	v.placed = false
 	v.root.SetVisible(false)
 	v.root.QueueAllocate()
 }
 		gobject.SignalHandlerDisconnect(gobject.ObjectNewFromInternalPtr(v.overlay.GoPointer()), v.positionHandlerID)
 		v.positionHandlerID = 0
 	}
-	v.placement = nil
+	v.placed = false
 	v.clearColumns()
 	v.releaseLegendWidgets()
 	v.overlay.RemoveOverlay(&v.pill.Widget)