Merge pull request #1 from kl11n/master

Make CheckableItems checkable on init
kdroidFilter · Nov 20, 2024 · da77d8a · da77d8a
2 parents 10758a1 + 35861af
commit da77d8a
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/src/main/kotlin/com/kdroid/composetray/lib/linux/appindicator/Gtk.kt b/src/main/kotlin/com/kdroid/composetray/lib/linux/appindicator/Gtk.kt
@@ -23,5 +23,6 @@ internal interface Gtk : Library {
     fun gtk_widget_set_sensitive(widget: Pointer, sensitive: Int)
     fun gtk_widget_destroy(menu: Pointer)
     fun gtk_widget_hide(get: Pointer?)
+    fun gtk_check_menu_item_set_active(checkMenuItem: Pointer, active: Boolean)
 
-}
+}
diff --git a/src/main/kotlin/com/kdroid/composetray/menu/api/TrayMenuBuilder.kt b/src/main/kotlin/com/kdroid/composetray/menu/api/TrayMenuBuilder.kt
@@ -2,7 +2,7 @@ package com.kdroid.composetray.menu.api
 
  interface TrayMenuBuilder {
     fun Item(label: String, isEnabled: Boolean = true, onClick: () -> Unit = {})
-    fun CheckableItem(label: String, isEnabled: Boolean = true, onToggle: (Boolean) -> Unit)
+    fun CheckableItem(label: String, checked: Boolean = false, isEnabled: Boolean = true, onToggle: (Boolean) -> Unit)
     fun SubMenu(label: String, isEnabled: Boolean = true, submenuContent: (TrayMenuBuilder.() -> Unit)?)
     fun Divider()
     fun dispose()

diff --git a/src/main/kotlin/com/kdroid/composetray/menu/impl/AwtTrayMenuBuilderImpl.kt b/src/main/kotlin/com/kdroid/composetray/menu/impl/AwtTrayMenuBuilderImpl.kt
@@ -16,8 +16,8 @@ internal class AwtTrayMenuBuilderImpl(private val popupMenu: PopupMenu, private
         popupMenu.add(menuItem)
     }
 
-    override fun CheckableItem(label: String, isEnabled: Boolean, onToggle: (Boolean) -> Unit) {
-        var isChecked = false
+    override fun CheckableItem(label: String, checked:Boolean, isEnabled: Boolean, onToggle: (Boolean) -> Unit) {
+        var isChecked = checked
         val checkableMenuItem = MenuItem(getCheckableLabel(label, isChecked))
         checkableMenuItem.isEnabled = isEnabled
 

diff --git a/src/main/kotlin/com/kdroid/composetray/menu/impl/LinuxTrayMenuBuilderImpl.kt b/src/main/kotlin/com/kdroid/composetray/menu/impl/LinuxTrayMenuBuilderImpl.kt
@@ -61,10 +61,11 @@ class LinuxTrayMenuBuilderImpl(private val menu: Pointer) : TrayMenuBuilder {
         )
     }
 
-    override fun CheckableItem(label: String, isEnabled: Boolean, onToggle: (Boolean) -> Unit) {
+    override fun CheckableItem(label: String, checked: Boolean, isEnabled: Boolean, onToggle: (Boolean) -> Unit) {
         val checkMenuItem = Gtk.INSTANCE.gtk_check_menu_item_new_with_label(label)
         Gtk.INSTANCE.gtk_menu_shell_append(menu, checkMenuItem)
         Gtk.INSTANCE.gtk_widget_set_sensitive(checkMenuItem, if (isEnabled) 1 else 0)
+        Gtk.INSTANCE.gtk_check_menu_item_set_active(checkMenuItem, checked)
 
         val callback = object : GCallback {
             override fun callback(widget: Pointer, data: Pointer?) {
@@ -139,4 +140,4 @@ class LinuxTrayMenuBuilderImpl(private val menu: Pointer) : TrayMenuBuilder {
     override fun dispose() {
         scope.cancel()
     }
-}
+}
diff --git a/src/main/kotlin/com/kdroid/composetray/menu/impl/WindowsTrayMenuBuilderImpl.kt b/src/main/kotlin/com/kdroid/composetray/menu/impl/WindowsTrayMenuBuilderImpl.kt
@@ -28,8 +28,8 @@ internal class WindowsTrayMenuBuilderImpl(
         }
     }
 
-    override fun CheckableItem(label: String, isEnabled: Boolean, onToggle: (Boolean) -> Unit) {
-        var isChecked = false // Initialise l'état checked
+    override fun CheckableItem(label: String, checked: Boolean, isEnabled: Boolean, onToggle: (Boolean) -> Unit) {
+        var isChecked = checked // Initialise l'état checked
 
         lock.withLock {
             val menuItem = WindowsTrayManager.MenuItem(
@@ -89,4 +89,4 @@ internal class WindowsTrayMenuBuilderImpl(
     }
 
     fun build(): List<WindowsTrayManager.MenuItem> = lock.withLock { menuItems.toList() }
-}
+}
diff --git a/src/test/kotlin/sample/DemoAdaptivePositionWindows.kt b/src/test/kotlin/sample/DemoAdaptivePositionWindows.kt
@@ -70,6 +70,9 @@ fun main() = application {
             CheckableItem(label = "Enable notifications") { isChecked ->
                 Log.i(logTag, "Notifications ${if (isChecked) "enabled" else "disabled"}")
             }
+            CheckableItem(label = "Initial Checked", checked = true) { isChecked ->
+                Log.i(logTag, "Initial Checked ${if (isChecked) "enabled" else "disabled"}")
+            }
 
             Divider()
 

diff --git a/src/test/kotlin/sample/DemoWithContextMenu.kt b/src/test/kotlin/sample/DemoWithContextMenu.kt
@@ -88,6 +88,9 @@ fun main() = application {
             CheckableItem(label = "Enable notifications") { isChecked ->
                 Log.i(logTag, "Notifications ${if (isChecked) "enabled" else "disabled"}")
             }
+            CheckableItem(label = "Initial Checked", checked = true) { isChecked ->
+                Log.i(logTag, "Initial Checked ${if (isChecked) "enabled" else "disabled"}")
+            }
 
             Divider()