Merge pull request #5 from ttytm/feat/item-cb-sumtype

Allow to set fn() or fn(item &MenuItem) for on_click cbs

example/basic_usage.v

@@ -11,13 +11,11 @@ fn main() {
 	mut tray := vtray.create(icon, tooltip: 'VTray Demo!')
 	tray.add_item('Edit',
 		checkable: true
-		on_click: fn [tray] () {
-			if x := tray.get_item('Edit') {
-				if x.checked {
-					tray.set_icon('${@VMODROOT}/assets/test.ico')
-				} else {
-					tray.set_icon('${@VMODROOT}/assets/icon.ico')
-				}
+		on_click: fn [tray] (item &vtray.MenuItem) {
+			if item.checked {
+				tray.set_icon('${@VMODROOT}/assets/test.ico')
+			} else {
+				tray.set_icon('${@VMODROOT}/assets/icon.ico')
 			}
 		}
 	)

src/lib.c.v

@@ -38,16 +38,6 @@ struct VTrayParams {
 	on_click   fn (menu_item &MenuItem) = unsafe { nil }
 }
 
-[heap]
-struct MenuItem {
-pub:
-	id        int
-	text      string
-	checked   bool
-	checkable bool
-	disabled  bool
-}
-
 fn C.vtray_init(params &VTrayParams, num_items usize, items []&MenuItem) &VTray
 fn C.vtray_run(tray &VTray)
 fn C.vtray_exit(tray &VTray)

src/lib.v

@@ -9,10 +9,19 @@ mut:
 	identifier string
 	tooltip    string
 	items      []&MenuItem
-	callbacks  map[int]fn ()
+	callbacks  map[int]ItemCallback
 	last_id    int = 1
 }
 
+pub struct MenuItem {
+pub:
+	id        int
+	text      string
+	checked   bool
+	checkable bool
+	disabled  bool
+}
+
 [params]
 pub struct CreatOptions {
 	identifier string = 'VTray'
@@ -25,9 +34,11 @@ pub struct MenuItemOptions {
 	checked   bool
 	checkable bool
 	disabled  bool
-	on_click  ?fn ()
+	on_click  ?ItemCallback
 }
 
+type ItemCallback = fn () | fn (menu_item &MenuItem)
+
 // create creates the tray.
 // On macOS, the tray icon size must be 22x22 pixels to be rendered correctly.
 pub fn create(icon_path string, opts CreatOptions) &Tray {
@@ -75,8 +86,14 @@ pub fn (mut t Tray) run() {
 		tooltip: t.tooltip
 		icon: t.icon
 		on_click: fn [t] (menu_item &MenuItem) {
-			if cb := t.callbacks[menu_item.id] {
-				cb()
+			cb := t.callbacks[menu_item.id] or { return }
+			match cb {
+				fn (menu_item &MenuItem) {
+					cb(menu_item)
+				}
+				fn () {
+					cb()
+				}
 			}
 		}
 	}, usize(t.items.len), t.items.data)