diff --git a/Cargo.lock b/Cargo.lock index d4eda07..5b8c901 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -740,22 +740,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossterm" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "libc", - "mio", - "parking_lot 0.12.1", - "signal-hook", - "signal-hook-mio", - "winapi", -] - [[package]] name = "crossterm" version = "0.27.0" @@ -2529,7 +2513,7 @@ dependencies = [ "anymap2", "arboard", "bitflags 2.4.2", - "crossterm 0.27.0", + "crossterm", "derive_more", "intervaltree", "keybindings", @@ -2547,7 +2531,7 @@ name = "modalkit-ratatui" version = "0.0.17" source = "git+https://github.com/ulyssa/modalkit?rev=cb8c8aeb9a499b9b16615ce144f9014d78036e01#cb8c8aeb9a499b9b16615ce144f9014d78036e01" dependencies = [ - "crossterm 0.27.0", + "crossterm", "intervaltree", "libc", "modalkit", @@ -3155,7 +3139,7 @@ checksum = "2e2e4cd95294a85c3b4446e63ef054eea43e0205b1fd60120c16b74ff7ff96ad" dependencies = [ "bitflags 2.4.2", "cassowary", - "crossterm 0.27.0", + "crossterm", "indoc", "itertools 0.11.0", "paste", @@ -3166,12 +3150,11 @@ dependencies = [ [[package]] name = "ratatui-image" -version = "0.4.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d864e8e24222cc289906cc53fede6f8751ce2935d636842a04dc65dfb9958e62" +checksum = "5b2b2c9623c63916694d56b7f27358ef81fd6232ffa4858444787ecbcda9f791" dependencies = [ "base64", - "crossterm 0.25.0", "dyn-clone", "icy_sixel", "image", diff --git a/Cargo.toml b/Cargo.toml index 84a596d..d19b9ec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ mime_guess = "^2.0.4" open = "3.2.0" rand = "0.8.5" ratatui = "0.23" -ratatui-image = { version = "0.4.3", features = ["serde"] } +ratatui-image = { version = "0.8.1", features = ["serde"] } regex = "^1.5" rpassword = "^7.2" serde = "^1.0" @@ -85,7 +85,3 @@ pretty_assertions = "1.4.0" inherits = "release" incremental = false lto = true - -[features] -default = ["sixel"] -sixel = ["ratatui-image/sixel"] diff --git a/src/windows/room/scrollback.rs b/src/windows/room/scrollback.rs index 4a88e78..d51bc69 100644 --- a/src/windows/room/scrollback.rs +++ b/src/windows/room/scrollback.rs @@ -1,6 +1,6 @@ //! Message scrollback -use ratatui_image::FixedImage; +use ratatui_image::Image; use regex::Regex; use matrix_sdk::ruma::OwnedRoomId; @@ -1323,7 +1323,7 @@ impl<'a> StatefulWidget for Scrollback<'a> { // Render image previews after all text lines have been drawn, as the render might draw below the current // line. for (x, y, backend) in image_previews { - let image_widget = FixedImage::new(backend); + let image_widget = Image::new(backend); let mut rect = backend.rect(); rect.x = x; rect.y = y;