refactor: replace ButtonCfg references with Layout in click handlers, update related functions, and optimize event handling logic in views

mike-ward · mike-ward · commit 0b1f4391dd5e · 2025-11-07T06:48:00.000-06:00
diff --git a/doc/04-Rows-Columns.md b/doc/04-Rows-Columns.md
@@ -35,7 +35,6 @@ pub fn button(cfg ButtonCfg) View {
 		min_height:   cfg.min_height
 		max_height:   cfg.max_height
 		sizing:       cfg.sizing
-		cfg:          &cfg
 		on_click:     cfg.on_click
 		on_char:      cfg.on_char_button
 		amend_layout: cfg.amend_layout
diff --git a/doc/08-Container-View.md b/doc/08-Container-View.md
@@ -92,8 +92,6 @@ Events and hooks:
 
 Tips:
 
-- Use `cfg: &cfg` in your composed views to let handlers access your
-  outer config struct.
 - To hide the container from layout spacing but keep it drawing, use
   `over_draw` on the view side (primarily internal; `invisible` also
   removes spacing by returning a minimal placeholder).
diff --git a/event_handlers.v b/event_handlers.v
@@ -25,7 +25,7 @@ fn char_handler(layout &Layout, mut e Event, mut w Window) {
 			}
 		}
 		if layout.shape.on_char != unsafe { nil } {
-			layout.shape.on_char(layout.shape, mut e, mut w)
+			layout.shape.on_char(layout, mut e, mut w)
 			if e.is_handled {
 				return
 			}
@@ -57,7 +57,7 @@ fn keydown_handler(layout &Layout, mut e Event, mut w Window) {
 			}
 		}
 		if layout.shape.on_keydown != unsafe { nil } {
-			layout.shape.on_keydown(layout.shape, mut e, mut w)
+			layout.shape.on_keydown(layout, mut e, mut w)
 			if e.is_handled {
 				return
 			}
@@ -125,7 +125,7 @@ fn mouse_down_handler(layout &Layout, in_handler bool, mut e Event, mut w Window
 		if layout.shape.on_click != unsafe { nil } {
 			// make click handler mouse coordinates relative to layout.shape
 			mut ev := event_relative_to(layout.shape, e)
-			layout.shape.on_click(layout.shape, mut ev, mut w)
+			layout.shape.on_click(layout, mut ev, mut w)
 			if ev.is_handled {
 				e.is_handled = true
 				return
@@ -190,7 +190,7 @@ fn mouse_up_handler(layout &Layout, mut e Event, mut w Window) {
 		if layout.shape.on_mouse_up != unsafe { nil } {
 			// make up handler mouse coordinates relative to layout.shape
 			mut ev := event_relative_to(layout.shape, e)
-			layout.shape.on_mouse_up(layout.shape, mut ev, mut w)
+			layout.shape.on_mouse_up(layout, mut ev, mut w)
 			if ev.is_handled {
 				e.is_handled = true
 				return
diff --git a/examples/buttons.v b/examples/buttons.v
@@ -120,15 +120,15 @@ fn button_row(label string, button gui.View) gui.View {
 		content: [
 			gui.row(
 				padding: gui.padding_none
-				content: [gui.text(text: label, mode: .wrap)]
+				content: [gui.text(text: label, mode: .single_line)]
 			),
 			gui.row(sizing: gui.fill_fit),
 			button,
 		]
 	)
 }
 
-fn click_handler(_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {
+fn click_handler(_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {
 	mut app := w.state[ButtonsApp]()
 	app.clicks += 1
 	w.set_id_focus(1)
diff --git a/examples/calc.v b/examples/calc.v
@@ -112,9 +112,9 @@ fn get_row(ops []string) []gui.View {
 	return content
 }
 
-fn btn_click(btn &gui.ButtonCfg, mut e gui.Event, mut w gui.Window) {
+fn btn_click(ly &gui.Layout, mut e gui.Event, mut w gui.Window) {
 	mut app := w.state[CalcApp]()
-	app.do_op(btn.id)
+	app.do_op(ly.shape.id)
 	e.is_handled = true
 }
 
diff --git a/examples/date_picker_options.v b/examples/date_picker_options.v
@@ -486,7 +486,7 @@ fn years_dates_group(app DatePickerApp) gui.View {
 						content:  [
 							gui.text(text: 'Reset'),
 						]
-						on_click: fn (_ &gui.ButtonCfg, mut e gui.Event, mut w gui.Window) {
+						on_click: fn (_ &gui.Layout, mut e gui.Event, mut w gui.Window) {
 							w.date_picker_reset('example')
 							mut app := w.state[DatePickerApp]()
 							app.date_picker_dates = [
diff --git a/examples/dialogs.v b/examples/dialogs.v
@@ -55,7 +55,7 @@ fn message_type() gui.View {
 		id_focus: 1
 		sizing:   gui.fill_fit
 		content:  [gui.text(text: '.dialog_type == .message')]
-		on_click: fn (_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {
+		on_click: fn (_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {
 			w.dialog(
 				align_buttons: .end
 				dialog_type:   .message
@@ -77,7 +77,7 @@ fn confirm_type() gui.View {
 		id_focus: 2
 		sizing:   gui.fill_fit
 		content:  [gui.text(text: '.dialog_type == .confirm')]
-		on_click: fn (_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {
+		on_click: fn (_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {
 			w.dialog(
 				dialog_type:  .confirm
 				title:        'Destory All Data?'
@@ -98,7 +98,7 @@ fn prompt_type() gui.View {
 		id_focus: 3
 		sizing:   gui.fill_fit
 		content:  [gui.text(text: '.dialog_type == .prompt')]
-		on_click: fn (_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {
+		on_click: fn (_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {
 			w.dialog(
 				dialog_type:  .prompt
 				title:        'Monty Python Quiz'
@@ -119,7 +119,7 @@ fn custom_type() gui.View {
 		id_focus: 4
 		sizing:   gui.fill_fit
 		content:  [gui.text(text: '.dialog_type == .custom')]
-		on_click: fn (_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {
+		on_click: fn (_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {
 			w.dialog(
 				dialog_type:    .custom
 				custom_content: [
@@ -131,7 +131,7 @@ fn custom_type() gui.View {
 							gui.button(
 								id_focus: gui.dialog_base_id_focus
 								content:  [gui.text(text: 'Close Me')]
-								on_click: fn (_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {
+								on_click: fn (_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {
 									w.dialog_dismiss()
 								}
 							),
diff --git a/examples/form_demo.v b/examples/form_demo.v
@@ -73,7 +73,7 @@ fn main_view(mut window gui.Window) gui.View {
 								id_focus:        id_focus_zip
 								sizing:          gui.fixed_fit
 								width:           100
-								on_text_changed: fn (_ &gui.InputCfg, s string, mut w gui.Window) {
+								on_text_changed: fn (_ &gui.Shape, s string, mut w gui.Window) {
 									mut app := w.state[FormDemoApp]()
 									app.zip = s
 								}
@@ -109,7 +109,7 @@ fn label_input_row(label string, value string, id_focus u32, changed fn (string)
 				id_focus:        id_focus
 				sizing:          gui.fixed_fit
 				width:           field_width
-				on_text_changed: fn [changed] (_ &gui.InputCfg, s string, mut w gui.Window) {
+				on_text_changed: fn [changed] (_ &gui.Shape, s string, mut w gui.Window) {
 					changed(s)
 				}
 			),
diff --git a/examples/get_started.v b/examples/get_started.v
@@ -55,7 +55,7 @@ fn main_view(window &gui.Window) gui.View {
 			gui.button(
 				id_focus: 1
 				content:  [gui.text(text: '${app.clicks} Clicks')]
-				on_click: fn (_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {
+				on_click: fn (_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {
 					mut app := w.state[GetStartedApp]()
 					app.clicks += 1
 				}
diff --git a/examples/icon_font_demo.v b/examples/icon_font_demo.v
@@ -87,7 +87,7 @@ fn search_box(text string) gui.View {
 		padding_border:  gui.padding_one
 		color_border:    gui.theme().color_border
 		placeholder:     'Search'
-		on_text_changed: fn (_ &gui.InputCfg, s string, mut w gui.Window) {
+		on_text_changed: fn (_ &gui.Shape, s string, mut w gui.Window) {
 			mut app := w.state[IconFontApp]()
 			app.search = s
 			app.icons.clear()
diff --git a/examples/image_demo.v b/examples/image_demo.v
@@ -26,7 +26,7 @@ fn main_view(window &gui.Window) gui.View {
 		content: [
 			gui.image(
 				file_name: sample_path
-				on_click:  fn (_ &gui.ImageCfg, mut e gui.Event, mut w gui.Window) {
+				on_click:  fn (_ &gui.Layout, mut e gui.Event, mut w gui.Window) {
 					w.dialog(
 						align_buttons: .end
 						dialog_type:   .message
diff --git a/examples/inputs.v b/examples/inputs.v
@@ -50,7 +50,7 @@ fn main_view(window &gui.Window) gui.View {
 						placeholder:     'type here...'
 						width:           input_width
 						sizing:          gui.fixed_fit
-						on_text_changed: fn (_ &gui.InputCfg, s string, mut w gui.Window) {
+						on_text_changed: fn (_ &gui.Shape, s string, mut w gui.Window) {
 							mut state := w.state[InputsApp]()
 							state.input_a = s
 						}
@@ -62,7 +62,7 @@ fn main_view(window &gui.Window) gui.View {
 						sizing:          gui.fixed_fit
 						padding_border:  gui.padding_one
 						is_password:     true
-						on_text_changed: fn (_ &gui.InputCfg, s string, mut w gui.Window) {
+						on_text_changed: fn (_ &gui.Shape, s string, mut w gui.Window) {
 							mut state := w.state[InputsApp]()
 							state.input_a = s
 						}
@@ -75,7 +75,7 @@ fn main_view(window &gui.Window) gui.View {
 						padding_border:  gui.padding_one
 						radius:          0
 						radius_border:   0
-						on_text_changed: fn (_ &gui.InputCfg, s string, mut w gui.Window) {
+						on_text_changed: fn (_ &gui.Shape, s string, mut w gui.Window) {
 							mut state := w.state[InputsApp]()
 							state.input_a = s
 						}
@@ -89,7 +89,7 @@ fn main_view(window &gui.Window) gui.View {
 						fill_border:     false
 						radius:          0
 						radius_border:   0
-						on_text_changed: fn (_ &gui.InputCfg, s string, mut w gui.Window) {
+						on_text_changed: fn (_ &gui.Shape, s string, mut w gui.Window) {
 							mut state := w.state[InputsApp]()
 							state.input_a = s
 						}
@@ -100,7 +100,7 @@ fn main_view(window &gui.Window) gui.View {
 						width:           input_width
 						sizing:          gui.fixed_fit
 						mode:            .multiline
-						on_text_changed: fn (_ &gui.InputCfg, s string, mut w gui.Window) {
+						on_text_changed: fn (_ &gui.Shape, s string, mut w gui.Window) {
 							mut state := w.state[InputsApp]()
 							state.input_a = s
 						}
diff --git a/examples/menu_demo.v b/examples/menu_demo.v
@@ -171,7 +171,7 @@ fn menu(window &gui.Window) gui.View {
 							radius_border:     0
 							text_style:        gui.theme().menubar_style.text_style
 							placeholder_style: gui.theme().menubar_style.text_style
-							on_text_changed:   fn (_ &gui.InputCfg, s string, mut w gui.Window) {
+							on_text_changed:   fn (_ &gui.Shape, s string, mut w gui.Window) {
 								mut app := w.state[MenuApp]()
 								app.search_text = s
 							}
@@ -209,7 +209,7 @@ fn body(mut app MenuApp, window &gui.Window) gui.View {
 			gui.button(
 				id_focus: 1
 				content:  [gui.text(text: '${app.clicks} Clicks')]
-				on_click: fn (_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {
+				on_click: fn (_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {
 					mut app := w.state[MenuApp]()
 					app.clicks += 1
 				}
diff --git a/examples/showcase.v b/examples/showcase.v
@@ -269,7 +269,7 @@ fn buttons(w &gui.Window) gui.View {
 					gui.button(
 						id_focus:       104
 						padding_border: gui.padding_two
-						on_click:       fn (_ &gui.ButtonCfg, mut e gui.Event, mut w gui.Window) {
+						on_click:       fn (_ &gui.Layout, mut e gui.Event, mut w gui.Window) {
 							mut app := w.state[ShowcaseApp]()
 							app.button_clicks += 1
 						}
@@ -301,7 +301,7 @@ fn buttons(w &gui.Window) gui.View {
 	)
 }
 
-fn button_click(_ &gui.ButtonCfg, mut e gui.Event, mut w gui.Window) {
+fn button_click(_ &gui.Layout, mut e gui.Event, mut w gui.Window) {
 	e.is_handled = true
 }
 
@@ -375,7 +375,7 @@ fn inputs(w &gui.Window) gui.View {
 						padding_border:  gui.padding_one
 						placeholder:     'Multline...'
 						mode:            .multiline
-						on_text_changed: fn (_ &gui.InputCfg, s string, mut w gui.Window) {
+						on_text_changed: fn (_ &gui.Shape, s string, mut w gui.Window) {
 							mut app := w.state[ShowcaseApp]()
 							app.input_multiline = s
 						}
@@ -386,7 +386,7 @@ fn inputs(w &gui.Window) gui.View {
 	)
 }
 
-fn text_changed(_ &gui.InputCfg, s string, mut w gui.Window) {
+fn text_changed(_ &gui.Shape, s string, mut w gui.Window) {
 	mut app := w.state[ShowcaseApp]()
 	app.input_text = s
 }
@@ -512,7 +512,7 @@ fn message_type() gui.View {
 		id_focus: 1
 		sizing:   gui.fill_fit
 		content:  [gui.text(text: '.dialog_type == .message')]
-		on_click: fn (_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {
+		on_click: fn (_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {
 			w.dialog(
 				align_buttons: .end
 				dialog_type:   .message
@@ -534,7 +534,7 @@ fn confirm_type() gui.View {
 		id_focus: 2
 		sizing:   gui.fill_fit
 		content:  [gui.text(text: '.dialog_type == .confirm')]
-		on_click: fn (_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {
+		on_click: fn (_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {
 			w.dialog(
 				dialog_type:  .confirm
 				title:        'Destory All Data?'
@@ -555,7 +555,7 @@ fn prompt_type() gui.View {
 		id_focus: 3
 		sizing:   gui.fill_fit
 		content:  [gui.text(text: '.dialog_type == .prompt')]
-		on_click: fn (_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {
+		on_click: fn (_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {
 			w.dialog(
 				dialog_type:  .prompt
 				title:        'Monty Python Quiz'
@@ -576,7 +576,7 @@ fn custom_type() gui.View {
 		id_focus: 4
 		sizing:   gui.fill_fit
 		content:  [gui.text(text: '.dialog_type == .custom')]
-		on_click: fn (_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {
+		on_click: fn (_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {
 			w.dialog(
 				dialog_type:    .custom
 				custom_content: [
@@ -588,7 +588,7 @@ fn custom_type() gui.View {
 							gui.button(
 								id_focus: gui.dialog_base_id_focus
 								content:  [gui.text(text: 'Close Me')]
-								on_click: fn (_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {
+								on_click: fn (_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {
 									w.dialog_dismiss()
 								}
 							),
@@ -733,7 +733,7 @@ fn menu(window &gui.Window) gui.View {
 							radius_border:     0
 							text_style:        gui.theme().menubar_style.text_style
 							placeholder_style: gui.theme().menubar_style.text_style
-							on_text_changed:   fn (_ &gui.InputCfg, s string, mut w gui.Window) {
+							on_text_changed:   fn (_ &gui.Shape, s string, mut w gui.Window) {
 								mut app := w.state[ShowcaseApp]()
 								app.search_text = s
 							}
diff --git a/examples/split_panel.v b/examples/split_panel.v
@@ -69,7 +69,7 @@ fn main_view(window &gui.Window) gui.View {
 	)
 }
 
-fn split_click(cfg &gui.ButtonCfg, mut e gui.Event, mut w gui.Window) {
+fn split_click(cfg &gui.Layout, mut e gui.Event, mut w gui.Window) {
 	w.mouse_lock(gui.MouseLockCfg{
 		mouse_move: fn (layout &gui.Layout, mut e gui.Event, mut w gui.Window) {
 			// The layout here is first layout in the view. This is because
diff --git a/examples/switch_views.v b/examples/switch_views.v
@@ -37,7 +37,7 @@ fn page_one(window &gui.Window) gui.View {
 		gui.button(
 			id_focus: 1
 			content:  [gui.text(text: 'next >>')]
-			on_click: fn (cfg &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {
+			on_click: fn (cfg &gui.Layout, mut _ gui.Event, mut w gui.Window) {
 				w.update_view(page_two)
 				w.set_id_focus(1)
 			}
@@ -51,7 +51,7 @@ fn page_two(window &gui.Window) gui.View {
 		gui.button(
 			id_focus: 1
 			content:  [gui.text(text: '<< previous')]
-			on_click: fn (_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {
+			on_click: fn (_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {
 				w.update_view(page_one)
 				w.set_id_focus(1)
 			}
diff --git a/examples/tab_view.v b/examples/tab_view.v
@@ -78,7 +78,7 @@ fn (mut app TabViewApp) tab_button(id_focus u32, id string, text string) gui.Vie
 		padding:        gui.pad_tblr(4, 10)
 		padding_border: gui.padding_one
 		content:        [gui.text(text: text, text_style: gui.theme().b4)]
-		on_click:       fn [id] (_ &gui.ButtonCfg, mut e gui.Event, mut w gui.Window) {
+		on_click:       fn [id] (_ &gui.Layout, mut e gui.Event, mut w gui.Window) {
 			mut tvapp := w.state[TabViewApp]()
 			tvapp.select_tab = id
 		}
diff --git a/examples/test_layout.v b/examples/test_layout.v
@@ -104,7 +104,7 @@ fn main_view(w &gui.Window) gui.View {
 								content:        [
 									gui.text(text: 'Click Count ${state.click_count}'),
 								]
-								on_click:       fn (_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {
+								on_click:       fn (_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {
 									mut state := w.state[AppState]()
 									state.click_count += 1
 								}
@@ -132,7 +132,7 @@ fn main_view(w &gui.Window) gui.View {
 										placeholder:     'Type here...'
 										mode:            .single_line
 										padding_border:  gui.padding_two
-										on_text_changed: fn (_ &gui.InputCfg, s string, mut w gui.Window) {
+										on_text_changed: fn (_ &gui.Shape, s string, mut w gui.Window) {
 											mut state := w.state[AppState]()
 											state.other_input = s
 										}
@@ -163,7 +163,7 @@ fn main_view(w &gui.Window) gui.View {
 						mode:            .multiline
 						sizing:          gui.fixed_fit
 						padding_border:  gui.padding_two
-						on_text_changed: fn (_ &gui.InputCfg, s string, mut w gui.Window) {
+						on_text_changed: fn (_ &gui.Shape, s string, mut w gui.Window) {
 							mut state := w.state[AppState]()
 							state.name = s
 						}
diff --git a/shape.v b/shape.v
diff --git a/view_button.v b/view_button.v
diff --git a/view_container.v b/view_container.v
diff --git a/view_date_picker.v b/view_date_picker.v
diff --git a/view_dialog.v b/view_dialog.v
diff --git a/view_image.v b/view_image.v
diff --git a/view_input.v b/view_input.v
diff --git a/view_input_date.v b/view_input_date.v
diff --git a/view_scrollbar.v b/view_scrollbar.v

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ fn char_handler(layout &Layout, mut e Event, mut w Window) {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`if layout.shape.on_char != unsafe { nil } {`
`28`		`- layout.shape.on_char(layout.shape, mut e, mut w)`
	`28`	`+ layout.shape.on_char(layout, mut e, mut w)`
`29`	`29`	`if e.is_handled {`
`30`	`30`	`return`
`31`	`31`	`}`
`@@ -57,7 +57,7 @@ fn keydown_handler(layout &Layout, mut e Event, mut w Window) {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`if layout.shape.on_keydown != unsafe { nil } {`
`60`		`- layout.shape.on_keydown(layout.shape, mut e, mut w)`
	`60`	`+ layout.shape.on_keydown(layout, mut e, mut w)`
`61`	`61`	`if e.is_handled {`
`62`	`62`	`return`
`63`	`63`	`}`
`@@ -125,7 +125,7 @@ fn mouse_down_handler(layout &Layout, in_handler bool, mut e Event, mut w Window`
`125`	`125`	`if layout.shape.on_click != unsafe { nil } {`
`126`	`126`	`// make click handler mouse coordinates relative to layout.shape`
`127`	`127`	`mut ev := event_relative_to(layout.shape, e)`
`128`		`- layout.shape.on_click(layout.shape, mut ev, mut w)`
	`128`	`+ layout.shape.on_click(layout, mut ev, mut w)`
`129`	`129`	`if ev.is_handled {`
`130`	`130`	`e.is_handled = true`
`131`	`131`	`return`
`@@ -190,7 +190,7 @@ fn mouse_up_handler(layout &Layout, mut e Event, mut w Window) {`
`190`	`190`	`if layout.shape.on_mouse_up != unsafe { nil } {`
`191`	`191`	`// make up handler mouse coordinates relative to layout.shape`
`192`	`192`	`mut ev := event_relative_to(layout.shape, e)`
`193`		`- layout.shape.on_mouse_up(layout.shape, mut ev, mut w)`
	`193`	`+ layout.shape.on_mouse_up(layout, mut ev, mut w)`
`194`	`194`	`if ev.is_handled {`
`195`	`195`	`e.is_handled = true`
`196`	`196`	`return`
Original file line number	Diff line number	Diff line change
`@@ -120,15 +120,15 @@ fn button_row(label string, button gui.View) gui.View {`
`120`	`120`	`content: [`
`121`	`121`	`gui.row(`
`122`	`122`	`padding: gui.padding_none`
`123`		`- content: [gui.text(text: label, mode: .wrap)]`
	`123`	`+ content: [gui.text(text: label, mode: .single_line)]`
`124`	`124`	`),`
`125`	`125`	`gui.row(sizing: gui.fill_fit),`
`126`	`126`	`button,`
`127`	`127`	`]`
`128`	`128`	`)`
`129`	`129`	`}`
`130`	`130`
`131`		`-fn click_handler(_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {`
	`131`	`+fn click_handler(_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {`
`132`	`132`	`mut app := w.state[ButtonsApp]()`
`133`	`133`	`app.clicks += 1`
`134`	`134`	`w.set_id_focus(1)`
Original file line number	Diff line number	Diff line change
`@@ -112,9 +112,9 @@ fn get_row(ops []string) []gui.View {`
`112`	`112`	`return content`
`113`	`113`	`}`
`114`	`114`
`115`		`-fn btn_click(btn &gui.ButtonCfg, mut e gui.Event, mut w gui.Window) {`
	`115`	`+fn btn_click(ly &gui.Layout, mut e gui.Event, mut w gui.Window) {`
`116`	`116`	`mut app := w.state[CalcApp]()`
`117`		`- app.do_op(btn.id)`
	`117`	`+ app.do_op(ly.shape.id)`
`118`	`118`	`e.is_handled = true`
`119`	`119`	`}`
`120`	`120`
Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ fn years_dates_group(app DatePickerApp) gui.View {`
`486`	`486`	`content: [`
`487`	`487`	`gui.text(text: 'Reset'),`
`488`	`488`	`]`
`489`		`- on_click: fn (_ &gui.ButtonCfg, mut e gui.Event, mut w gui.Window) {`
	`489`	`+ on_click: fn (_ &gui.Layout, mut e gui.Event, mut w gui.Window) {`
`490`	`490`	`w.date_picker_reset('example')`
`491`	`491`	`mut app := w.state[DatePickerApp]()`
`492`	`492`	`app.date_picker_dates = [`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ fn main_view(window &gui.Window) gui.View {`
`55`	`55`	`gui.button(`
`56`	`56`	`id_focus: 1`
`57`	`57`	`content: [gui.text(text: '${app.clicks} Clicks')]`
`58`		`- on_click: fn (_ &gui.ButtonCfg, mut _ gui.Event, mut w gui.Window) {`
	`58`	`+ on_click: fn (_ &gui.Layout, mut _ gui.Event, mut w gui.Window) {`
`59`	`59`	`mut app := w.state[GetStartedApp]()`
`60`	`60`	`app.clicks += 1`
`61`	`61`	`}`