Merge branch 'master' into primary

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

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) => {