Fixed session end buttons
Moorly CI / windows-build (push) Successful in 3m30s
Moorly CI / linux-build (push) Successful in 4m15s

This commit is contained in:
Squid committed 2026-11-17 20:56:40 +01:00
1 parent a85c57c8e7
commit ce917ced9f
3 files changed
+188 -47

No files matched your search

Generated
+131 -46
View File
@@ -30,7 +30,7 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1973cfbc1a2daf9cf550e74e1f088c28e7f7d8c1e1418fb6c9dc5184b7e84c99"
dependencies = [
"crypto-common",
"crypto-common 0.2.2",
"inout",
]
@@ -42,7 +42,7 @@ checksum = "35f0f96ce78e38c3dc6d8948aa8163d06385be74000f3c7a95bf1eef35d3ea32"
dependencies = [
"cipher",
"cpubits",
"cpufeatures",
"cpufeatures 0.3.1",
"zeroize",
]
@@ -134,7 +134,7 @@ checksum = "134c52ddac6d63c576bef8168db10c83c49c26444ecbc68060fef078925a901c"
dependencies = [
"base64ct",
"blake2",
"cpufeatures",
"cpufeatures 0.3.1",
"password-hash",
]
@@ -366,7 +366,7 @@ checksum = "144e573728da132683b9488acd528274c790e07fc06ff81ee29f9d8f8b1041e0"
dependencies = [
"blowfish",
"pbkdf2",
"sha2",
"sha2 0.11.1",
]
[[package]]
@@ -405,7 +405,7 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b5d4d889834ee8ecfc0f8426ad30faf7cdcb10f741a8e6d7224d95325479f6f"
dependencies = [
"digest",
"digest 0.11.3",
]
[[package]]
@@ -414,6 +414,15 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
[[package]]
name = "block-buffer"
version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
dependencies = [
"generic-array 0.14.7",
]
[[package]]
name = "block-buffer"
version = "0.12.1"
@@ -603,7 +612,7 @@ checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06"
dependencies = [
"cfg-if",
"cipher",
"cpufeatures",
"cpufeatures 0.3.1",
"rand_core",
"zeroize",
]
@@ -627,8 +636,8 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8cf2a2c93cd704877c0858356ed03480ff301ee950b43f1cbe4573b088bfa6c"
dependencies = [
"block-buffer",
"crypto-common",
"block-buffer 0.12.1",
"crypto-common 0.2.2",
"inout",
"zeroize",
]
@@ -823,6 +832,15 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15b85f9c39137c3a891689859392b1bd49812121d0d61c9caf00d46ed5ce06ae"
[[package]]
name = "cpufeatures"
version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
dependencies = [
"libc",
]
[[package]]
name = "cpufeatures"
version = "0.3.1"
@@ -901,6 +919,16 @@ dependencies = [
"zeroize",
]
[[package]]
name = "crypto-common"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
dependencies = [
"generic-array 0.14.7",
"typenum",
]
[[package]]
name = "crypto-common"
version = "0.2.2"
@@ -963,9 +991,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5eed333089e2e1c1ac8c6c0398e5e2497b4c9926ca6d0365ed1e099afa5bc23"
dependencies = [
"cfg-if",
"cpufeatures",
"cpufeatures 0.3.1",
"curve25519-dalek-derive",
"digest",
"digest 0.11.3",
"fiat-crypto",
"rand_core",
"rustc_version",
@@ -1035,15 +1063,25 @@ dependencies = [
"cipher",
]
[[package]]
name = "digest"
version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer 0.10.4",
"crypto-common 0.1.7",
]
[[package]]
name = "digest"
version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
dependencies = [
"block-buffer",
"block-buffer 0.12.1",
"const-oid",
"crypto-common",
"crypto-common 0.2.2",
"ctutils",
]
@@ -1112,7 +1150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0681a4fc24c767085329728d8dfba959af91228aa4610cca4f8ce317ba46ae0"
dependencies = [
"der",
"digest",
"digest 0.11.3",
"elliptic-curve",
"rfc6979",
"signature",
@@ -1140,7 +1178,7 @@ dependencies = [
"ed25519",
"rand_core",
"serde",
"sha2",
"sha2 0.11.1",
"signature",
"subtle",
"zeroize",
@@ -1154,8 +1192,8 @@ checksum = "900f37e7e18d74a2347389af6cd69e3a30d5cc9e697f40004865679aa75e9c7c"
dependencies = [
"base16ct",
"crypto-bigint",
"crypto-common",
"digest",
"crypto-common 0.2.2",
"digest 0.11.3",
"ff",
"group",
"hkdf",
@@ -1511,9 +1549,9 @@ dependencies = [
[[package]]
name = "generic-array"
version = "0.14.9"
version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
dependencies = [
"typenum",
"version_check",
@@ -1525,7 +1563,7 @@ version = "1.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "337d46834ee672ab3e48caca2cb0c78cc174fb12b3a68d0d88f99a0519a5e36e"
dependencies = [
"generic-array 0.14.9",
"generic-array 0.14.7",
"rustversion",
"typenum",
]
@@ -1809,7 +1847,7 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f"
dependencies = [
"digest",
"digest 0.11.3",
]
[[package]]
@@ -1998,6 +2036,32 @@ dependencies = [
"thiserror 2.0.21",
]
[[package]]
name = "iced_selector"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1442ccc30959cc48b3a624233521ef7f3bc3e06528b6fe306c3a775fbddc4fe"
dependencies = [
"iced_core",
]
[[package]]
name = "iced_test"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b56c26cc6e63958ce6be06a68fa3136fd5f646da6302ee12abf1a0f311dd0166"
dependencies = [
"iced_futures",
"iced_program",
"iced_renderer",
"iced_runtime",
"iced_selector",
"nom",
"png",
"sha2 0.10.9",
"thiserror 2.0.21",
]
[[package]]
name = "iced_tiny_skia"
version = "0.14.1"
@@ -2192,7 +2256,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8f198d1db720e4940b5a493201d199d9f24f568f8f746bd13706243a2f71598"
dependencies = [
"cfg-if",
"cpufeatures",
"cpufeatures 0.3.1",
]
[[package]]
@@ -2201,7 +2265,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01737161ba802849cfd486b5bd209d38ba4943494c249a8126005170c7621edd"
dependencies = [
"crypto-common",
"crypto-common 0.2.2",
"rand_core",
]
@@ -2521,6 +2585,7 @@ dependencies = [
"global-hotkey",
"iced",
"iced_aw",
"iced_test",
"instance-handoff",
"nix",
"png",
@@ -2648,6 +2713,15 @@ dependencies = [
"libc",
]
[[package]]
name = "nom"
version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
dependencies = [
"memchr",
]
[[package]]
name = "num-bigint"
version = "0.5.1"
@@ -3114,7 +3188,7 @@ dependencies = [
"elliptic-curve",
"primefield",
"primeorder",
"sha2",
"sha2 0.11.1",
]
[[package]]
@@ -3128,7 +3202,7 @@ dependencies = [
"fiat-crypto",
"primefield",
"primeorder",
"sha2",
"sha2 0.11.1",
]
[[package]]
@@ -3142,7 +3216,7 @@ dependencies = [
"elliptic-curve",
"primefield",
"primeorder",
"sha2",
"sha2 0.11.1",
]
[[package]]
@@ -3158,7 +3232,7 @@ dependencies = [
"futures",
"log",
"rand",
"sha2",
"sha2 0.11.1",
"thiserror 2.0.21",
"tokio",
"windows 0.62.2",
@@ -3221,7 +3295,7 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "112d82ceb8c5bf524d9af484d4e4970c9fd5a0cc15ba14ad93dccd28873b0629"
dependencies = [
"digest",
"digest 0.11.3",
"hmac",
]
@@ -3316,7 +3390,7 @@ dependencies = [
"pbkdf2",
"rand_core",
"scrypt",
"sha2",
"sha2 0.11.1",
"spki",
]
@@ -3377,7 +3451,7 @@ version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e2d0073b297041425c7c3df6eb4792d598a15323fe63346852b092eca02904c"
dependencies = [
"cpufeatures",
"cpufeatures 0.3.1",
"universal-hash",
"zeroize",
]
@@ -3389,7 +3463,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0fa31d631f2b2cb2a544d0aa321ce847a94764d701ca2becc411138b93d49cd"
dependencies = [
"cpubits",
"cpufeatures",
"cpufeatures 0.3.1",
"universal-hash",
"zeroize",
]
@@ -3422,7 +3496,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c555a6e4eb7d4e158fcb028c835c3b8642206ddc279b5c6b202ef9a8bdb592f4"
dependencies = [
"crypto-bigint",
"crypto-common",
"crypto-common 0.2.2",
"ff",
"rand_core",
"subtle",
@@ -3611,11 +3685,11 @@ dependencies = [
"const-oid",
"crypto-bigint",
"crypto-primes",
"digest",
"digest 0.11.3",
"pkcs1",
"pkcs8",
"rand_core",
"sha2",
"sha2 0.11.1",
"signature",
"spki",
"zeroize",
@@ -3641,7 +3715,7 @@ dependencies = [
"data-encoding",
"delegate",
"der",
"digest",
"digest 0.11.3",
"ecdsa",
"ed25519-dalek",
"elliptic-curve",
@@ -3678,7 +3752,7 @@ dependencies = [
"scrypt",
"sec1",
"sha1",
"sha2",
"sha2 0.11.1",
"sha3",
"signature",
"spki",
@@ -3829,7 +3903,7 @@ dependencies = [
"cfg-if",
"pbkdf2",
"salsa20",
"sha2",
"sha2 0.11.1",
]
[[package]]
@@ -3957,8 +4031,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214"
dependencies = [
"cfg-if",
"cpufeatures",
"digest",
"cpufeatures 0.3.1",
"digest 0.11.3",
]
[[package]]
name = "sha2"
version = "0.10.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
dependencies = [
"cfg-if",
"cpufeatures 0.2.17",
"digest 0.10.7",
]
[[package]]
@@ -3968,8 +4053,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47d7069beb7d6ac7b9acd1039986e73443f24234f41074da099d6f994ac9ad19"
dependencies = [
"cfg-if",
"cpufeatures",
"digest",
"cpufeatures 0.3.1",
"digest 0.11.3",
]
[[package]]
@@ -3978,7 +4063,7 @@ version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc9bad02c26382724b2d2692c6f179285e4b54eeecd7968f52a50059c3c11759"
dependencies = [
"digest",
"digest 0.11.3",
"keccak",
"sponge-cursor",
]
@@ -3989,7 +4074,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09057cb2149ad4cbd2da1e26b351f9a4c354219421229c69c3063e6f61947c4a"
dependencies = [
"digest",
"digest 0.11.3",
"keccak",
"sponge-cursor",
]
@@ -4016,7 +4101,7 @@ version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28d567dcbaf0049cb8ac2608a76cd95ff9e4412e1899d389ee400918ca7537f5"
dependencies = [
"digest",
"digest 0.11.3",
"rand_core",
]
@@ -4249,7 +4334,7 @@ dependencies = [
"bytes",
"crypto-bigint",
"ctutils",
"digest",
"digest 0.11.3",
"pem-rfc7468",
"zeroize",
]
@@ -4273,7 +4358,7 @@ dependencies = [
"rsa",
"sec1",
"sha1",
"sha2",
"sha2 0.11.1",
"signature",
"ssh-cipher",
"ssh-encoding",
@@ -4715,7 +4800,7 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4987bdc12753382e0bec4a65c50738ffaabc998b9cdd1f952fb5f39b0048a96"
dependencies = [
"crypto-common",
"crypto-common 0.2.2",
"ctutils",
]
+3
View File
@@ -39,3 +39,6 @@ windows-sys = { version = "0.61.2", features = [
[build-dependencies]
winresource = "0.1"
[dev-dependencies]
iced_test = "0.14"
+54 -1
View File
@@ -11889,6 +11889,9 @@ impl canvas::Program<Message> for TerminalCanvas<'_> {
)))
}
canvas::Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left)) => {
if !*dragging {
return None;
}
*dragging = false;
Some(canvas::Action::capture())
}
@@ -12194,7 +12197,9 @@ fn terminal_page<'a>(state: &'a Moorly, window: window::Id, id: u32) -> Element<
text_color: Some(theme.foreground),
..container::Style::default()
})
];
]
.width(Length::Fill)
.height(Length::Fill);
if let Some(exit) = terminal_session.exit {
let status = match (exit.code, exit.signal) {
@@ -15485,6 +15490,54 @@ start_path = "/tmp"
state.terminal_sessions.clear();
}
#[test]
fn kept_terminal_footer_buttons_restart_and_close() {
use super::terminal::ExitInfo;
let ended = || ExitInfo {
code: Some(0),
signal: None,
};
let (mut state, window, id) = terminal_for_session_end(super::SessionEnd::Keep);
state.terminal_sessions.get_mut(&id).unwrap().exit = Some(ended());
let _ = update(&mut state, Message::RestartTerminal(id));
assert!(state.terminal_sessions[&id].exit.is_none());
assert!(state.windows[&window].tabs.contains(&Tab::Terminal(id)));
state.terminal_sessions.get_mut(&id).unwrap().exit = Some(ended());
let _ = update(&mut state, Message::CloseTab(window, Tab::Terminal(id)));
assert!(
state
.windows
.get(&window)
.is_none_or(|window| !window.tabs.contains(&Tab::Terminal(id)))
);
assert!(!state.terminal_sessions.contains_key(&id));
state.terminal_sessions.clear();
}
#[test]
fn kept_terminal_footer_buttons_are_clickable() {
use super::terminal::ExitInfo;
let (mut state, window, id) = terminal_for_session_end(super::SessionEnd::Keep);
state.terminal_sessions.get_mut(&id).unwrap().exit = Some(ExitInfo {
code: Some(0),
signal: None,
});
let mut ui = iced_test::simulator(super::terminal_page(&state, window, id));
ui.click("Close").unwrap();
assert!(
ui.into_messages()
.any(|message| matches!(message, Message::CloseTab(_, Tab::Terminal(_))))
);
}
#[test]
fn running_a_terminal_profile_opens_and_closes_a_session() {
let mut state = state();