diff --git a/Cargo.lock b/Cargo.lock index 1fd8bf7..61db159 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -170,9 +170,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", @@ -255,9 +255,9 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" dependencies = [ "async-io", "async-lock", @@ -279,9 +279,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", @@ -1919,13 +1919,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.5.0", "cfg-if", - "cfg_aliases 0.1.1", + "cfg_aliases 0.2.1", "libc", "memoffset", ] @@ -4073,9 +4073,9 @@ checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" [[package]] name = "zbus" -version = "4.3.0" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" +checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" dependencies = [ "async-broadcast", "async-executor", @@ -4111,9 +4111,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.3.0" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" +checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4161,9 +4161,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" dependencies = [ "endi", "enumflags2", @@ -4174,9 +4174,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" dependencies = [ "proc-macro-crate", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 0168a53..5a1ecf1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ strum_macros = "0.26.4" [dependencies.iced] git = "https://github.com/iced-rs/iced.git" version = "0.13.0-dev" -features = ["advanced", "multi-window"] +features = ["advanced"] [dependencies.iced_aw] git = "https://github.com/iced-rs/iced_aw.git" diff --git a/src/conversions/energy.rs b/src/conversions/energy.rs index 28a8262..2e56942 100644 --- a/src/conversions/energy.rs +++ b/src/conversions/energy.rs @@ -62,7 +62,7 @@ pub static GIGAJOULE: Unit = Unit { // Imperial units pub static BRITISH_THERMAL_UNIT: Unit = Unit { - name: "British thermal unit", + name: "BTU", dimension: Dimension::Energy, system: System::Imperial, to_base: Some(|v| v * 1055.05585262), diff --git a/src/ui/menu.rs b/src/ui/menu.rs index 79509c6..b280610 100644 --- a/src/ui/menu.rs +++ b/src/ui/menu.rs @@ -162,7 +162,7 @@ fn menu_unit_from(dimension: &Dimension) -> Menu<'static, Message, Theme, Rende menu_unit_to(dimension, *unit) )); } - Menu::new(items).offset(0.0).spacing(2.0).max_width(160.0) + Menu::new(items).offset(0.0).spacing(2.0).max_width(150.0) } @@ -174,7 +174,7 @@ fn menu_unit_to(dimension: &Dimension, from: &'static Unit) -> Menu<'static, Mes menu_item(unit.to_string(), Message::ConvertPerform(&from, *to)), )); } - Menu::new(items).offset(0.0).spacing(2.0).max_width(150.0) + Menu::new(items).offset(0.0).spacing(2.0).max_width(140.0) } fn menu_item(label: String, msg: Message) -> Element<'static, Message> {