fix: no background window on Linux

Author: wiiznokes

RustApp/src/audio/mod.rs

@@ -86,10 +86,8 @@ impl AppState {
             if let Err(e) = stream.play() {
                 error!("{e}");
             }
-        } else {
-            if let Err(e) = stream.pause() {
-                error!("{e}");
-            }
+        } else if let Err(e) = stream.pause() {
+            error!("{e}");
         }
 
         self.audio_stream = Some(Stream {

RustApp/src/ui/app.rs

@@ -24,10 +24,13 @@ use cosmic::{
 
 use super::{
     message::{AppMsg, ConfigMsg},
-    tray::{SystemTray, SystemTrayMsg, SystemTrayStream},
     view::{main_window, settings_window},
     wave::AudioWave,
 };
+
+#[cfg(not(target_os = "linux"))]
+use super::tray::{SystemTray, SystemTrayMsg, SystemTrayStream};
+
 use crate::{
     audio::{AudioPacketFormat, AudioProcessParams},
     config::{
@@ -128,7 +131,9 @@ pub struct AppState {
     pub about_window: Option<CustomWindow>,
     pub logs: Vec<markdown::Item>,
     log_path: String,
+    #[cfg(not(target_os = "linux"))]
     pub system_tray: Option<SystemTray>,
+    #[cfg(not(target_os = "linux"))]
     pub system_tray_stream: Option<SystemTrayStream>,
     has_shown_minimize_notification: bool,
     launched_automatically: bool,
@@ -240,6 +245,7 @@ impl AppState {
         self.audio_stream = None;
         self.audio_wave.clear();
 
+        #[cfg(not(target_os = "linux"))]
         if let Some(system_tray) = self.system_tray.as_mut() {
             system_tray.update_menu_state(true, &fl!("state_disconnected"));
         }
@@ -349,6 +355,7 @@ impl Application for AppState {
         };
 
         // initialize system tray
+        #[cfg(not(target_os = "linux"))]
         let (system_tray, system_tray_stream) = match SystemTray::new() {
             Ok((mut tray, stream)) => {
                 tray.update_menu_state(true, &fl!("state_disconnected"));
@@ -379,7 +386,9 @@ impl Application for AppState {
             about_window: None,
             logs: Vec::new(),
             log_path: flags.log_path.clone(),
+            #[cfg(not(target_os = "linux"))]
             system_tray,
+            #[cfg(not(target_os = "linux"))]
             system_tray_stream,
             has_shown_minimize_notification: false,
             launched_automatically: flags.launched_automatically,
@@ -400,10 +409,14 @@ impl Application for AppState {
         info!("config path: {}", flags.config_path);
         info!("log path: {}", flags.log_path);
 
+        #[cfg(not(target_os = "linux"))]
         if !flags.launched_automatically || !app.config.data().start_minimized {
             commands.push(app.open_main_window());
         }
 
+        #[cfg(target_os = "linux")]
+        commands.push(app.open_main_window());
+
         match single_instance::stream() {
             Ok(stream) => {
                 commands.push(cosmic::iced::task::Task::run(stream, |event| match event {
@@ -455,6 +468,7 @@ impl Application for AppState {
                         error!("{e}");
                     }
 
+                    #[cfg(not(target_os = "linux"))]
                     if let Some(system_tray) = self.system_tray.as_mut() {
                         system_tray.update_menu_state(false, &fl!("state_listening"));
                     }
@@ -487,6 +501,7 @@ impl Application for AppState {
                         error!("{e}");
                     }
 
+                    #[cfg(not(target_os = "linux"))]
                     if let Some(system_tray) = self.system_tray.as_mut() {
                         system_tray.update_menu_state(false, &fl!("state_connected"));
                     }
@@ -756,6 +771,7 @@ impl Application for AppState {
                     error!("{e}");
                 }
             }
+            #[cfg(not(target_os = "linux"))]
             AppMsg::SystemTray(tray_msg) => match tray_msg {
                 SystemTrayMsg::Show => {
                     if let Some(main_window) = &self.main_window {
@@ -791,6 +807,9 @@ impl Application for AppState {
                     return Task::batch(vec![command, self.update_audio_stream()]);
                 }
             }
+            AppMsg::Exit => {
+                return cosmic::iced_runtime::task::effect(cosmic::iced::runtime::Action::Exit);
+            }
         }
 
         Task::none()
@@ -822,8 +841,9 @@ impl Application for AppState {
     }
 
     fn subscription(&self) -> cosmic::iced::Subscription<Self::Message> {
-        let mut subscriptions = vec![Subscription::run(|| streamer::sub().map(AppMsg::Streamer))];
+        let subscriptions = vec![Subscription::run(|| streamer::sub().map(AppMsg::Streamer))];
 
+        #[cfg(not(target_os = "linux"))]
         if let Some(system_tray_stream) = &self.system_tray_stream {
             subscriptions.push(Subscription::run_with_id(
                 "system-tray",
@@ -848,8 +868,11 @@ impl Application for AppState {
         if let Some(window) = &self.main_window
             && window.window_id == id
         {
-            // close the app
+            #[cfg(not(target_os = "linux"))]
             return Some(AppMsg::HideWindow);
+
+            #[cfg(target_os = "linux")]
+            return Some(AppMsg::Exit);
         }
 
         None

RustApp/src/ui/message.rs

@@ -1,4 +1,5 @@
 use super::app::AudioDevice;
+#[cfg(not(target_os = "linux"))]
 use super::tray::SystemTrayMsg;
 use crate::{
     config::{
@@ -24,7 +25,9 @@ pub enum AppMsg {
     ShowWindow,
     Menu(MenuMsg),
     LinkClicked(String),
+    #[cfg(not(target_os = "linux"))]
     SystemTray(SystemTrayMsg),
+    Exit,
 }
 
 #[derive(Debug, Clone)]

RustApp/src/ui/mod.rs

@@ -1,6 +1,8 @@
 pub mod app;
 mod icon;
 mod message;
+
+#[cfg(not(target_os = "linux"))]
 mod tray;
 mod view;
 mod wave;

RustApp/src/ui/tray.rs

@@ -3,13 +3,11 @@ use futures::SinkExt;
 use std::sync::Arc;
 use tokio::sync::{Mutex, mpsc};
 
-#[cfg(not(target_os = "linux"))]
 use tray_icon::{
     TrayIcon, TrayIconBuilder, TrayIconEvent,
     menu::{Menu, MenuEvent, MenuItem, PredefinedMenuItem},
 };
 
-#[cfg(not(target_os = "linux"))]
 use crate::{fl, tray_icon};
 
 #[derive(Debug, Clone)]
@@ -25,18 +23,13 @@ pub struct SystemTrayStream {
     receiver: Arc<Mutex<mpsc::UnboundedReceiver<SystemTrayMsg>>>,
 }
 
-#[cfg(not(target_os = "linux"))]
 pub struct SystemTray {
     tray_icon: TrayIcon,
     item_connect: MenuItem,
     item_disconnect: MenuItem,
 }
 
-#[cfg(target_os = "linux")]
-pub struct SystemTray;
-
 impl SystemTray {
-    #[cfg(not(target_os = "linux"))]
     pub fn new() -> anyhow::Result<(Self, SystemTrayStream)> {
         let item_show = MenuItem::new(fl!("tray_show_window"), true, None);
         let item_connect = MenuItem::new(fl!("tray_connect"), true, None);
@@ -95,19 +88,6 @@ impl SystemTray {
         ))
     }
 
-    #[cfg(target_os = "linux")]
-    pub fn new() -> anyhow::Result<(Self, SystemTrayStream)> {
-        // placeholder here
-        let (_sender, receiver) = mpsc::unbounded_channel();
-        Ok((
-            Self {},
-            SystemTrayStream {
-                receiver: Arc::new(Mutex::new(receiver)),
-            },
-        ))
-    }
-
-    #[cfg(not(target_os = "linux"))]
     pub fn update_menu_state(&mut self, disconnected: bool, status: &str) {
         // update menu item states
         self.item_connect.set_enabled(disconnected);
@@ -119,11 +99,6 @@ impl SystemTray {
                 error!("failed to set tray icon tooltip: {e}");
             });
     }
-
-    #[cfg(target_os = "linux")]
-    pub fn update_menu_state(&mut self, _disconnected: bool, _status: &str) {
-        // placeholder here
-    }
 }
 
 impl SystemTrayStream {