feat(layout): add event controller support to widget interface

commit: dc03f2e0fd37c07a765d1a1aa948b148a19972e1
author: brice · 10mo ago · 2025-12-16 18:00 UTC
committer: brice · 10mo ago · 2025-12-16 17:45 UTC
parent: 5252d9a
signature: unsigned

2 files · +24 -14

M internal/ui/layout/gtk_widgets.go +21 -14


@@ -54,8 +54,9 @@ func (w *gtkWidget) GetParent() Widget {
54	54		return &gtkWidget{inner: parent}
55	55		}
56	56
57		-	func (w *gtkWidget) GetAllocatedWidth() int { return w.inner.GetAllocatedWidth() }
58		-	func (w *gtkWidget) GetAllocatedHeight() int { return w.inner.GetAllocatedHeight() }
	57	+	func (w *gtkWidget) GetAllocatedWidth() int { return w.inner.GetAllocatedWidth() }
	58	+	func (w *gtkWidget) GetAllocatedHeight() int { return w.inner.GetAllocatedHeight() }
	59	+	func (w gtkWidget) AddController(c gtk.EventController) { w.inner.AddController(c) }
59	60
60	61		func (w *gtkWidget) ComputePoint(target Widget) (x, y float64, ok bool) {
61	62		srcPoint := &graphene.Point{X: 0, Y: 0}

@@ -167,8 +168,9 @@ func (p *gtkPaned) AddTickCallback(callback func() bool) uint {
167	168		return p.inner.AddTickCallback(&cb, 0, nil)
168	169		}
169	170
170		-	func (p *gtkPaned) GetAllocatedWidth() int { return p.inner.GetAllocatedWidth() }
171		-	func (p *gtkPaned) GetAllocatedHeight() int { return p.inner.GetAllocatedHeight() }
	171	+	func (p *gtkPaned) GetAllocatedWidth() int { return p.inner.GetAllocatedWidth() }
	172	+	func (p *gtkPaned) GetAllocatedHeight() int { return p.inner.GetAllocatedHeight() }
	173	+	func (p gtkPaned) AddController(c gtk.EventController) { p.inner.AddController(c) }
172	174
173	175		func (p *gtkPaned) ComputePoint(target Widget) (x, y float64, ok bool) {
174	176		srcPoint := &graphene.Point{X: 0, Y: 0}

@@ -271,8 +273,9 @@ func (b *gtkBox) GetSpacing() int { return b.inner.GetSpacing() }
271	273		func (b *gtkBox) SetOrientation(o Orientation) { b.inner.SetOrientation(o) }
272	274		func (b *gtkBox) GetOrientation() Orientation { return b.inner.GetOrientation() }
273	275
274		-	func (b *gtkBox) GetAllocatedWidth() int { return b.inner.GetAllocatedWidth() }
275		-	func (b *gtkBox) GetAllocatedHeight() int { return b.inner.GetAllocatedHeight() }
	276	+	func (b *gtkBox) GetAllocatedWidth() int { return b.inner.GetAllocatedWidth() }
	277	+	func (b *gtkBox) GetAllocatedHeight() int { return b.inner.GetAllocatedHeight() }
	278	+	func (b gtkBox) AddController(c gtk.EventController) { b.inner.AddController(c) }
276	279
277	280		func (b *gtkBox) ComputePoint(target Widget) (x, y float64, ok bool) {
278	281		srcPoint := &graphene.Point{X: 0, Y: 0}

@@ -383,8 +386,9 @@ func (o *gtkOverlay) GetMeasureOverlay(overlay Widget) bool {
383	386		return o.inner.GetMeasureOverlay(overlay.GtkWidget())
384	387		}
385	388
386		-	func (o *gtkOverlay) GetAllocatedWidth() int { return o.inner.GetAllocatedWidth() }
387		-	func (o *gtkOverlay) GetAllocatedHeight() int { return o.inner.GetAllocatedHeight() }
	389	+	func (o *gtkOverlay) GetAllocatedWidth() int { return o.inner.GetAllocatedWidth() }
	390	+	func (o *gtkOverlay) GetAllocatedHeight() int { return o.inner.GetAllocatedHeight() }
	391	+	func (o gtkOverlay) AddController(c gtk.EventController) { o.inner.AddController(c) }
388	392
389	393		func (o *gtkOverlay) ComputePoint(target Widget) (x, y float64, ok bool) {
390	394		srcPoint := &graphene.Point{X: 0, Y: 0}

@@ -444,8 +448,9 @@ func (l *gtkLabel) SetEllipsize(mode EllipsizeMode) { l.inner.SetEllipsize(pango
444	448		func (l *gtkLabel) SetMaxWidthChars(n int) { l.inner.SetMaxWidthChars(n) }
445	449		func (l *gtkLabel) SetXalign(x float32) { l.inner.SetXalign(x) }
446	450
447		-	func (l *gtkLabel) GetAllocatedWidth() int { return l.inner.GetAllocatedWidth() }
448		-	func (l *gtkLabel) GetAllocatedHeight() int { return l.inner.GetAllocatedHeight() }
	451	+	func (l *gtkLabel) GetAllocatedWidth() int { return l.inner.GetAllocatedWidth() }
	452	+	func (l *gtkLabel) GetAllocatedHeight() int { return l.inner.GetAllocatedHeight() }
	453	+	func (l gtkLabel) AddController(c gtk.EventController) { l.inner.AddController(c) }
449	454
450	455		func (l *gtkLabel) ComputePoint(target Widget) (x, y float64, ok bool) {
451	456		srcPoint := &graphene.Point{X: 0, Y: 0}

@@ -524,8 +529,9 @@ func (btn *gtkButton) ConnectClicked(callback func()) uint32 {
524	529		return btn.inner.ConnectClicked(&cb)
525	530		}
526	531
527		-	func (btn *gtkButton) GetAllocatedWidth() int { return btn.inner.GetAllocatedWidth() }
528		-	func (btn *gtkButton) GetAllocatedHeight() int { return btn.inner.GetAllocatedHeight() }
	532	+	func (btn *gtkButton) GetAllocatedWidth() int { return btn.inner.GetAllocatedWidth() }
	533	+	func (btn *gtkButton) GetAllocatedHeight() int { return btn.inner.GetAllocatedHeight() }
	534	+	func (btn gtkButton) AddController(c gtk.EventController) { btn.inner.AddController(c) }
529	535
530	536		func (btn *gtkButton) ComputePoint(target Widget) (x, y float64, ok bool) {
531	537		srcPoint := &graphene.Point{X: 0, Y: 0}

@@ -594,8 +600,9 @@ func (img *gtkImage) SetFromPaintable(p Paintable) {
594	600		func (img *gtkImage) SetPixelSize(size int) { img.inner.SetPixelSize(size) }
595	601		func (img *gtkImage) Clear() { img.inner.Clear() }
596	602
597		-	func (img *gtkImage) GetAllocatedWidth() int { return img.inner.GetAllocatedWidth() }
598		-	func (img *gtkImage) GetAllocatedHeight() int { return img.inner.GetAllocatedHeight() }
	603	+	func (img *gtkImage) GetAllocatedWidth() int { return img.inner.GetAllocatedWidth() }
	604	+	func (img *gtkImage) GetAllocatedHeight() int { return img.inner.GetAllocatedHeight() }
	605	+	func (img gtkImage) AddController(c gtk.EventController) { img.inner.AddController(c) }
599	606
600	607		func (img *gtkImage) ComputePoint(target Widget) (x, y float64, ok bool) {
601	608		srcPoint := &graphene.Point{X: 0, Y: 0}

 	return &gtkWidget{inner: parent}
 }
-func (w *gtkWidget) GetAllocatedWidth() int  { return w.inner.GetAllocatedWidth() }
+func (w *gtkWidget) GetAllocatedWidth() int               { return w.inner.GetAllocatedWidth() }
-func (w *gtkWidget) GetAllocatedHeight() int { return w.inner.GetAllocatedHeight() }
+func (w *gtkWidget) GetAllocatedHeight() int              { return w.inner.GetAllocatedHeight() }
+func (w *gtkWidget) AddController(c *gtk.EventController) { w.inner.AddController(c) }
 func (w *gtkWidget) ComputePoint(target Widget) (x, y float64, ok bool) {
 	srcPoint := &graphene.Point{X: 0, Y: 0}
 	return p.inner.AddTickCallback(&cb, 0, nil)
 }
-func (p *gtkPaned) GetAllocatedWidth() int  { return p.inner.GetAllocatedWidth() }
+func (p *gtkPaned) GetAllocatedWidth() int               { return p.inner.GetAllocatedWidth() }
-func (p *gtkPaned) GetAllocatedHeight() int { return p.inner.GetAllocatedHeight() }
+func (p *gtkPaned) GetAllocatedHeight() int              { return p.inner.GetAllocatedHeight() }
+func (p *gtkPaned) AddController(c *gtk.EventController) { p.inner.AddController(c) }
 func (p *gtkPaned) ComputePoint(target Widget) (x, y float64, ok bool) {
 	srcPoint := &graphene.Point{X: 0, Y: 0}
 func (b *gtkBox) SetOrientation(o Orientation) { b.inner.SetOrientation(o) }
 func (b *gtkBox) GetOrientation() Orientation  { return b.inner.GetOrientation() }
-func (b *gtkBox) GetAllocatedWidth() int  { return b.inner.GetAllocatedWidth() }
+func (b *gtkBox) GetAllocatedWidth() int               { return b.inner.GetAllocatedWidth() }
-func (b *gtkBox) GetAllocatedHeight() int { return b.inner.GetAllocatedHeight() }
+func (b *gtkBox) GetAllocatedHeight() int              { return b.inner.GetAllocatedHeight() }
+func (b *gtkBox) AddController(c *gtk.EventController) { b.inner.AddController(c) }
 func (b *gtkBox) ComputePoint(target Widget) (x, y float64, ok bool) {
 	srcPoint := &graphene.Point{X: 0, Y: 0}
 	return o.inner.GetMeasureOverlay(overlay.GtkWidget())
 }
-func (o *gtkOverlay) GetAllocatedWidth() int  { return o.inner.GetAllocatedWidth() }
+func (o *gtkOverlay) GetAllocatedWidth() int               { return o.inner.GetAllocatedWidth() }
-func (o *gtkOverlay) GetAllocatedHeight() int { return o.inner.GetAllocatedHeight() }
+func (o *gtkOverlay) GetAllocatedHeight() int              { return o.inner.GetAllocatedHeight() }
+func (o *gtkOverlay) AddController(c *gtk.EventController) { o.inner.AddController(c) }
 func (o *gtkOverlay) ComputePoint(target Widget) (x, y float64, ok bool) {
 	srcPoint := &graphene.Point{X: 0, Y: 0}
 func (l *gtkLabel) SetMaxWidthChars(n int)          { l.inner.SetMaxWidthChars(n) }
 func (l *gtkLabel) SetXalign(x float32)             { l.inner.SetXalign(x) }
-func (l *gtkLabel) GetAllocatedWidth() int  { return l.inner.GetAllocatedWidth() }
+func (l *gtkLabel) GetAllocatedWidth() int               { return l.inner.GetAllocatedWidth() }
-func (l *gtkLabel) GetAllocatedHeight() int { return l.inner.GetAllocatedHeight() }
+func (l *gtkLabel) GetAllocatedHeight() int              { return l.inner.GetAllocatedHeight() }
+func (l *gtkLabel) AddController(c *gtk.EventController) { l.inner.AddController(c) }
 func (l *gtkLabel) ComputePoint(target Widget) (x, y float64, ok bool) {
 	srcPoint := &graphene.Point{X: 0, Y: 0}
 	return btn.inner.ConnectClicked(&cb)
 }
-func (btn *gtkButton) GetAllocatedWidth() int  { return btn.inner.GetAllocatedWidth() }
+func (btn *gtkButton) GetAllocatedWidth() int               { return btn.inner.GetAllocatedWidth() }
-func (btn *gtkButton) GetAllocatedHeight() int { return btn.inner.GetAllocatedHeight() }
+func (btn *gtkButton) GetAllocatedHeight() int              { return btn.inner.GetAllocatedHeight() }
+func (btn *gtkButton) AddController(c *gtk.EventController) { btn.inner.AddController(c) }
 func (btn *gtkButton) ComputePoint(target Widget) (x, y float64, ok bool) {
 	srcPoint := &graphene.Point{X: 0, Y: 0}
 func (img *gtkImage) SetPixelSize(size int) { img.inner.SetPixelSize(size) }
 func (img *gtkImage) Clear()                { img.inner.Clear() }
-func (img *gtkImage) GetAllocatedWidth() int  { return img.inner.GetAllocatedWidth() }
+func (img *gtkImage) GetAllocatedWidth() int               { return img.inner.GetAllocatedWidth() }
-func (img *gtkImage) GetAllocatedHeight() int { return img.inner.GetAllocatedHeight() }
+func (img *gtkImage) GetAllocatedHeight() int              { return img.inner.GetAllocatedHeight() }
+func (img *gtkImage) AddController(c *gtk.EventController) { img.inner.AddController(c) }
 func (img *gtkImage) ComputePoint(target Widget) (x, y float64, ok bool) {
 	srcPoint := &graphene.Point{X: 0, Y: 0}

M internal/ui/layout/widgets.go +3 -0


@@ -61,6 +61,9 @@ type Widget interface {
61	61
62	62		// GTK interop - returns the underlying GTK widget for embedding
63	63		GtkWidget() *gtk.Widget
	64	+
	65	+	// AddController adds an event controller to the widget
	66	+	AddController(controller *gtk.EventController)
64	67		}
65	68
66	69		// PanedWidget wraps gtk.Paned for creating split views.


@@ -61,6 +61,9 @@ type Widget interface {
61		61
62	// GTK interop - returns the underlying GTK widget for embedding	62		// GTK interop - returns the underlying GTK widget for embedding
63	GtkWidget() *gtk.Widget	63		GtkWidget() *gtk.Widget
		64	+
		65	+	// AddController adds an event controller to the widget
		66	+	AddController(controller *gtk.EventController)
64	}	67		}
65		68
66	// PanedWidget wraps gtk.Paned for creating split views.	69		// PanedWidget wraps gtk.Paned for creating split views.