Merge pull request #241 from kdroidFilter/fix-linux-crash-when-changing-from-no-empty-to-empty

Fix-[Linux] Crash when changing from/to empty menuContent #238

Author: kdroidFilter

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

@@ -0,0 +1,67 @@
+package com.kdroid.composetray.demo
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.Text
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.window.Window
+import androidx.compose.ui.window.application
+import com.kdroid.composetray.tray.api.Tray
+import com.kdroid.composetray.utils.ComposeNativeTrayLoggingLevel
+import com.kdroid.composetray.utils.allowComposeNativeTrayLogging
+import com.kdroid.composetray.utils.composeNativeTrayloggingLevel
+import composenativetray.demo.generated.resources.Res
+import composenativetray.demo.generated.resources.icon
+import composenativetray.demo.generated.resources.icon2
+import org.jetbrains.compose.resources.painterResource
+
+/**
+ * DemoToggleEmptyMenu
+ *
+ * Minimal sample to test the Linux bug when switching the tray menu
+ * from empty to non-empty (and back). Left-click the tray icon to toggle
+ * the presence of a single menu item. When the flag is false, the menuContent
+ * is intentionally left empty.
+ */
+fun main() = application {
+    // Enable logging to help diagnose behavior on Linux
+    allowComposeNativeTrayLogging = false
+    composeNativeTrayloggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
+
+    var showMenuItem by remember { mutableStateOf(false) }
+    val icon = painterResource(Res.drawable.icon)
+    val icon2 = painterResource(Res.drawable.icon2)
+
+    Tray(
+        iconContent = {
+            Image(
+                painter =  icon,
+                contentDescription = "ComposeNativeTray Demo",
+                modifier = Modifier.fillMaxSize()
+            )
+        },
+        primaryAction = {
+            // Toggle between empty and non-empty menu
+            showMenuItem = !showMenuItem
+           println("Toggled showMenuItem to $showMenuItem")
+        },
+        tooltip = "Toggle Empty Menu"
+    ) {
+        if (showMenuItem) {
+            Item("I'm here when toggled ON") {
+                // Clicking this item turns the menu empty again on next open
+                showMenuItem = false
+                println("Clicked showMenuItem to $showMenuItem")
+            }
+        }
+
+
+    }
+    Window( onCloseRequest = ::exitApplication) {
+        Text("Compose Native Tray Demo")
+    }
+}

linuxlib

@@ -85,6 +85,25 @@ internal class LinuxTrayManager(
         taskQueue += action
     }
 
+    // KDE environment detection (KDE Plasma / SNI)
+    private fun isKDEDesktop(): Boolean {
+        return try {
+            val xdg = System.getenv("XDG_CURRENT_DESKTOP") ?: ""
+            val session = System.getenv("DESKTOP_SESSION") ?: ""
+            val kdeFull = System.getenv("KDE_FULL_SESSION") ?: ""
+            val xdgL = xdg.lowercase()
+            val sessionL = session.lowercase()
+            val kdeDetected =
+                kdeFull.equals("true", ignoreCase = true) ||
+                xdgL.contains("kde") || xdgL.contains("plasma") ||
+                sessionL.contains("kde") || sessionL.contains("plasma")
+            if (kdeDetected) debugln { "LinuxTrayManager: KDE environment detected (XDG='$xdg', SESSION='$session', KDE_FULL_SESSION='$kdeFull')" }
+            kdeDetected
+        } catch (_: Throwable) {
+            false
+        }
+    }
+
     // ----------------------------------------------------------------------------- menu model
     data class MenuItem(
         val text: String,
@@ -186,7 +205,8 @@ internal class LinuxTrayManager(
             callbackReferences.clear()
             menuItemReferences.clear()
 
-            if (menuItems.isNotEmpty()) {
+            val effectiveItems = if (menuItems.isEmpty() && isKDEDesktop()) listOf(MenuItem("-")) else menuItems
+            if (effectiveItems.isNotEmpty()) {
                 // Create or clear existing menu ------------------------------------------------
                 if (menuHandle == null) {
                     menuHandle = sni.create_menu()
@@ -215,7 +235,7 @@ internal class LinuxTrayManager(
                 }
 
                 // Add menu items --------------------------------------------------------------
-                menuItems.forEach { addNativeMenuItem(menuHandle!!, it) }
+                effectiveItems.forEach { addNativeMenuItem(menuHandle!!, it) }
                 sni.set_context_menu(trayHandle, menuHandle)
                 infoln { "LinuxTrayManager: Context menu set" }
             } else {
@@ -326,12 +346,13 @@ internal class LinuxTrayManager(
     }
 
     private fun initializeTrayMenu() {
-        if (menuItems.isEmpty()) return
+        val effectiveItems = if (menuItems.isEmpty() && isKDEDesktop()) listOf(MenuItem("-")) else menuItems
+        if (effectiveItems.isEmpty()) return
         menuHandle = sni.create_menu() ?: run {
             errorln { "Failed to create menu" }
             return
         }
-        menuItems.forEach { addNativeMenuItem(menuHandle!!, it) }
+        effectiveItems.forEach { addNativeMenuItem(menuHandle!!, it) }
         trayHandle?.let { sni.set_context_menu(it, menuHandle) }
     }