From 5b60695a52b5af4bd18a54f8806ab338247a6290 Mon Sep 17 00:00:00 2001
From: dijunkun <junkun.di@hotmail.com>
Date: Tue, 8 Sep 2026 15:03:32 +0800
Subject: [PATCH] [fix] restore Linux Dock icons in packaged builds

---
 apps/desktop/scripts/linux/package_deb.sh            | 6 +++++-
 apps/desktop/src/gui/application/gui_application.cpp | 3 +++
 apps/desktop/src/gui/ui/main_window.slint            | 1 +
 apps/desktop/src/gui/ui/server_window.slint          | 1 +
 apps/desktop/src/gui/ui/stream_window.slint          | 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/desktop/scripts/linux/package_deb.sh b/apps/desktop/scripts/linux/package_deb.sh
index d5b99927..2cc6dece 100755
--- a/apps/desktop/scripts/linux/package_deb.sh
+++ b/apps/desktop/scripts/linux/package_deb.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+# Keep readelf and ldd output stable for the runtime dependency checks below.
+export LC_ALL=C
+
 if [[ $# -lt 3 || $# -gt 4 ]]; then
     echo "Usage: $0 <debian-arch> <xmake-arch> <version> [extra-recommendation]" >&2
     exit 2
@@ -169,11 +172,12 @@ EOF
 
 cat > "$DESKTOP_DIR/$PKG_NAME.desktop" <<EOF
 [Desktop Entry]
-Version=$DEB_VERSION
+Version=1.0
 Name=$APP_NAME
 Comment=$DESCRIPTION
 Exec=/usr/bin/$PKG_NAME
 Icon=$PKG_NAME
+StartupWMClass=$PKG_NAME
 Terminal=false
 Type=Application
 Categories=Utility;
diff --git a/apps/desktop/src/gui/application/gui_application.cpp b/apps/desktop/src/gui/application/gui_application.cpp
index 03886d4e..c8b6ed4b 100644
--- a/apps/desktop/src/gui/application/gui_application.cpp
+++ b/apps/desktop/src/gui/application/gui_application.cpp
@@ -1111,6 +1111,9 @@ void GuiApplication::InitializeUi() {
     wayland_display_guard.emplace("WAYLAND_DISPLAY");
     wayland_socket_guard.emplace("WAYLAND_SOCKET");
   }
+  // Match crossdesk.desktop even when the Debian launcher runs crossdesk-bin.
+  // Set this before creating any windows so X11 and Wayland share the same id.
+  slint::set_xdg_app_id("crossdesk");
 #endif
   ui_ = std::make_unique<SlintUi>();
   ui_->video_presenter =
diff --git a/apps/desktop/src/gui/ui/main_window.slint b/apps/desktop/src/gui/ui/main_window.slint
index 2c443484..61d20307 100644
--- a/apps/desktop/src/gui/ui/main_window.slint
+++ b/apps/desktop/src/gui/ui/main_window.slint
@@ -186,6 +186,7 @@ component ConnectionDialogButton inherits Rectangle {
 
 export component MainWindow inherits Window {
     title: "CrossDesk";
+    icon: @image-url("../../../resources/linux/crossdesk_256x256.png");
     preferred-width: 640px;
     preferred-height: 450px + root.titlebar-height;
     min-width: 640px;
diff --git a/apps/desktop/src/gui/ui/server_window.slint b/apps/desktop/src/gui/ui/server_window.slint
index 24ec27e1..8367297b 100644
--- a/apps/desktop/src/gui/ui/server_window.slint
+++ b/apps/desktop/src/gui/ui/server_window.slint
@@ -7,6 +7,7 @@ export struct ControllerEntry {
 
 export component ServerWindow inherits Window {
     title: "CrossDesk";
+    icon: @image-url("../../../resources/linux/crossdesk_256x256.png");
     preferred-width: root.language-index == 0 ? 250px : root.language-index == 1 ? 330px : 430px;
     preferred-height: 150px;
     min-width: root.language-index == 0 ? 250px : root.language-index == 1 ? 330px : 430px;
diff --git a/apps/desktop/src/gui/ui/stream_window.slint b/apps/desktop/src/gui/ui/stream_window.slint
index 64bf833c..d1453259 100644
--- a/apps/desktop/src/gui/ui/stream_window.slint
+++ b/apps/desktop/src/gui/ui/stream_window.slint
@@ -111,6 +111,7 @@ component ControlBarButton inherits Rectangle {
 
 export component StreamWindow inherits Window {
     title: "CrossDesk";
+    icon: @image-url("../../../resources/linux/crossdesk_256x256.png");
     preferred-width: 1280px;
     preferred-height: 720px + (root.custom-titlebar ? 32px : 0px);
     min-width: 640px;