leyoda/cosmic-terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into primary

Browse source
This commit is contained in:
Mattias Eriksson 2024-04-08 16:17:46 +02:00
commit ff473d2509
4 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main.rs
View file

@ -142,13 +142,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
let mut settings = Settings::default();
settings = settings.theme(config.app_theme.theme());
#[cfg(target_os = "redox")]
{
// Redox does not support resize if doing CSDs
settings = settings.client_decorations(false);
}
settings = settings.size_limits(Limits::NONE.min_width(360.0).min_height(180.0));
let flags = Flags {
@ -1173,6 +1166,7 @@ impl App {
working_directory: None,
//TODO: configurable hold (keep open when child exits)?
hold: false,
env: HashMap::new(),
};
let tab_title_override = if !profile.tab_title.is_empty() {
Some(profile.tab_title.clone())
@ -2273,6 +2267,9 @@ impl Application for App {
}
}
}
TermEvent::ChildExit(_error_code) => {
//Ignore this for now
},
}
}
Message::TermEventTx(term_event_tx) => {

6
src/terminal.rs
View file

@ -276,7 +276,7 @@ impl Terminal {
let window_id = 0;
let pty = tty::new(&options, size.into(), window_id)?;
let pty_event_loop = EventLoop::new(term.clone(), event_proxy, pty, options.hold, false);
let pty_event_loop = EventLoop::new(term.clone(), event_proxy, pty, options.hold, false)?;
let notifier = Notifier(pty_event_loop.channel());
let _pty_join_handle = pty_event_loop.spawn();
@ -876,6 +876,8 @@ impl Terminal {
impl Drop for Terminal {
fn drop(&mut self) {
// Ensure shutdown on terminal drop
self.notifier.0.send(Msg::Shutdown);
if let Err(err) = self.notifier.0.send(Msg::Shutdown) {
log::warn!("Failed to send shutdown message on dropped terminal: {err}");
}
}
}