Creepso/stremio-shell-ng
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-shell-ng.git synced 2026-04-21 16:01:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: handle quit on close setting

Browse source
This commit is contained in:
Tim 2025-02-19 11:08:45 +01:00
parent 349349af9d
commit 18b41fd707
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/stremio_app/app.rs
View file

@ -1,6 +1,7 @@
use native_windows_derive::NwgUi; use native_windows_derive::NwgUi;
use native_windows_gui as nwg; use native_windows_gui as nwg;
use rand::Rng; use rand::Rng;
use serde::Deserialize;
use serde_json; use serde_json;
use std::{ use std::{
cell::RefCell, cell::RefCell,
@ -29,6 +30,12 @@ use crate::stremio_app::{
use super::stremio_server::StremioServer; use super::stremio_server::StremioServer;
#[derive(Default, Deserialize, Debug)]
#[serde(rename_all = "camelCase")]
pub struct Settings {
pub quit_on_close: bool,
}
#[derive(Default, NwgUi)] #[derive(Default, NwgUi)]
pub struct MainWindow { pub struct MainWindow {
pub command: String, pub command: String,
@ -41,6 +48,7 @@ pub struct MainWindow {
pub release_candidate: bool, pub release_candidate: bool,
pub autoupdater_setup_file: Arc<Mutex<Option<PathBuf>>>, pub autoupdater_setup_file: Arc<Mutex<Option<PathBuf>>>,
pub saved_window_style: RefCell<WindowStyle>, pub saved_window_style: RefCell<WindowStyle>,
pub settings: Arc<Mutex<Settings>>,
#[nwg_resource] #[nwg_resource]
pub embed: nwg::EmbedResource, pub embed: nwg::EmbedResource,
#[nwg_resource(source_embed: Some(&data.embed), source_embed_str: Some("MAINICON"))] #[nwg_resource(source_embed: Some(&data.embed), source_embed_str: Some("MAINICON"))]
@ -223,6 +231,8 @@ impl MainWindow {
let hide_splash_sender = self.hide_splash_notice.sender(); let hide_splash_sender = self.hide_splash_notice.sender();
let focus_sender = self.focus_notice.sender(); let focus_sender = self.focus_notice.sender();
let autoupdater_setup_mutex = self.autoupdater_setup_file.clone(); let autoupdater_setup_mutex = self.autoupdater_setup_file.clone();
let app_settings = self.settings.clone();
thread::spawn(move || loop { thread::spawn(move || loop {
if let Some(msg) = web_rx if let Some(msg) = web_rx
.recv() .recv()
@ -250,6 +260,18 @@ impl MainWindow {
web_tx_web.send(RPCResponse::open_media(command_ref)).ok(); web_tx_web.send(RPCResponse::open_media(command_ref)).ok();
} }
} }
Some("update_settings") => {
if let Some(arg) = msg.get_params() {
match serde_json::from_value::<Settings>(arg.to_owned()) {
Ok(settings) => {
let mut app_settings = app_settings.lock().unwrap();
*app_settings = settings;
println!("App settings updated.");
}
Err(e) => eprintln!("Failed to deserialize settings object: {e}"),
}
}
}
Some("app-error") => { Some("app-error") => {
hide_splash_sender.notice(); hide_splash_sender.notice();
if let Some(arg) = msg.get_params() { if let Some(arg) = msg.get_params() {
@ -396,8 +418,14 @@ impl MainWindow {
if let nwg::EventData::OnWindowClose(data) = data { if let nwg::EventData::OnWindowClose(data) = data {
data.close(false); data.close(false);
} }
self.window.set_visible(false);
self.tray.tray_show_hide.set_checked(self.window.visible()); let settings = self.settings.lock().unwrap();
self.transmit_window_full_screen_change(false, false); if settings.quit_on_close {
self.quit_notice.sender().notice();
} else {
self.window.set_visible(false);
self.tray.tray_show_hide.set_checked(self.window.visible());
self.transmit_window_full_screen_change(false, false);
}
} }
} }