Merge branch 'linux-new-go-impl' into dev

Author: kdroidFilter

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/kdroidFilter/LibWindowsTray.git
 [submodule "linuxlib"]
 	path = linuxlib
-	url = https://github.com/kdroidFilter/LibLinuxTray.git
+	url = https://github.com/kdroidFilter/ComposeNativeTrayLinuxLib

demo/build.gradle.kts

@@ -30,7 +30,7 @@ kotlin {
 
 compose.desktop {
     application {
-        mainClass = "com.kdroid.composetray.demo.TrayAppDemoKt"
+        mainClass = "com.kdroid.composetray.demo.DynamicTrayMenuKt"
         nativeDistributions {
             targetFormats(TargetFormat.Msi, TargetFormat.Deb, TargetFormat.Dmg)
             packageName = "tray-demo"
@@ -65,7 +65,7 @@ tasks.register("buildAndRunDemo") {
 }
 
 linuxDebConfig {
-    startupWMClass.set("com.kdroid.composetray.demo.TrayAppDemoKt")
+    startupWMClass.set("com.kdroid.composetray.demo.DynamicTrayMenuKt")
     addComposeNativeTrayDeps()
     enableT64AlternativeDeps = true
 }

demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/TrayAppDemo.kt

@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Book
+import androidx.compose.material.icons.filled.Window
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment.Companion.Center
@@ -17,6 +18,7 @@ import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
 import com.kdroid.composetray.tray.api.ExperimentalTrayAppApi
+import com.kdroid.composetray.tray.api.Tray
 import com.kdroid.composetray.tray.api.TrayApp
 import com.kdroid.composetray.utils.WindowRaise
 import composenativetray.demo.generated.resources.Res
@@ -32,9 +34,10 @@ fun main() {
     application {
         var isWindowVisible by remember { mutableStateOf(true) }
         var textFieldValue by remember { mutableStateOf("") }
+        var textFieldValue2 by remember { mutableStateOf("") }
 
         TrayApp(
-            icon = Icons.Default.Book,
+            icon = Icons.Default.Window,
             tooltip = "TrayAppDemo",
             windowSize = DpSize(300.dp, 500.dp),
             visibleOnStart = true,
@@ -63,15 +66,16 @@ fun main() {
                     Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
                         Text("Your futur awesome compagnon App !", color = MaterialTheme.colorScheme.onBackground)
                         TextField(
-                            value = textFieldValue,
-                            onValueChange = { textFieldValue = it },
+                            value = textFieldValue2,
+                            onValueChange = { textFieldValue2 = it },
                             placeholder = { Text("Enter some text") }
                         )
                     }
                 }
             }
         }
 
+
         if (isWindowVisible) {
             val state = rememberWindowState()
 

linuxlib

@@ -58,6 +58,7 @@ TRAY_API struct tray *tray_get_instance(void);
 TRAY_API int  tray_init (struct tray *tray);   /* 0 = OK, <0 = error         */
 TRAY_API int  tray_loop (int blocking);        /* 0 = running, -1 = finished */
 TRAY_API void tray_update(struct tray *tray);  /* refresh icon / menu        */
+TRAY_API void tray_dispose(struct tray *tray); /* dispose a single instance  */
 TRAY_API void tray_exit (void);                /* free everything and exit   */
 
 /* -------------------------------------------------------------------------- */
@@ -74,6 +75,10 @@ TRAY_API const char *tray_get_notification_icons_region(void);
 TRAY_API int         tray_get_status_item_position(int *x, int *y);
 TRAY_API const char *tray_get_status_item_region(void);
 
+/* macOS: per-instance variants */
+TRAY_API int         tray_get_status_item_position_for(struct tray *tray, int *x, int *y);
+TRAY_API const char *tray_get_status_item_region_for(struct tray *tray);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif