This commit is contained in:
itsjunetime
2026-04-23 22:21:08 -05:00
parent 2fbf7b3ef2
commit 8d73a38c51
2 changed files with 11 additions and 8 deletions
+9 -7
View File
@@ -140,11 +140,12 @@ impl Display for DisplayErrSource<'_> {
pub async fn display_kitty_images<'es>( pub async fn display_kitty_images<'es>(
display: KittyDisplay<'_>, display: KittyDisplay<'_>,
ev_stream: &'es mut EventStream, ev_stream: &'es mut EventStream,
last_z_index: &mut i32, last_z_index: &mut i32
) -> Result<(), DisplayErr<'es>> { ) -> Result<(), DisplayErr<'es>> {
let images = match display { let images = match display {
KittyDisplay::NoChange => return Ok(()), KittyDisplay::NoChange => return Ok(()),
KittyDisplay::ClearImages => return run_action( KittyDisplay::ClearImages =>
return run_action(
Action::Delete(DeleteConfig { Action::Delete(DeleteConfig {
effect: ClearOrDelete::Clear, effect: ClearOrDelete::Clear,
which: WhichToDelete::All which: WhichToDelete::All
@@ -154,7 +155,7 @@ pub async fn display_kitty_images<'es>(
.await .await
.map_err(|e| DisplayErr::empty("Couldn't clear previous images", e)) .map_err(|e| DisplayErr::empty("Couldn't clear previous images", e))
.map(|_: Option<ImageId>| ()), .map(|_: Option<ImageId>| ()),
KittyDisplay::DisplayImages(imgs) => imgs, KittyDisplay::DisplayImages(imgs) => imgs
}; };
let new_z_index = last_z_index.wrapping_add_unsigned(1); let new_z_index = last_z_index.wrapping_add_unsigned(1);
@@ -208,10 +209,11 @@ pub async fn display_kitty_images<'es>(
) )
.await .await
.map_err(DisplayErrSource::Transmission) .map_err(DisplayErrSource::Transmission)
.and_then(|img_id| img_id .and_then(|img_id| {
.map(|id| *img = MaybeTransferred::Transferred(id)) img_id
.ok_or(DisplayErrSource::KittageReturnedNoId) .map(|id| *img = MaybeTransferred::Transferred(id))
) .ok_or(DisplayErrSource::KittageReturnedNoId)
})
} }
MaybeTransferred::Transferred(image_id) => run_action( MaybeTransferred::Transferred(image_id) => run_action(
Action::Display { Action::Display {
+2 -1
View File
@@ -464,7 +464,8 @@ async fn enter_redraw_loop(
to_display = tui.render(f, &main_area, font_size); to_display = tui.render(f, &main_area, font_size);
})?; })?;
let maybe_err = display_kitty_images(to_display, &mut ev_stream, &mut kitty_z_idx).await; let maybe_err =
display_kitty_images(to_display, &mut ev_stream, &mut kitty_z_idx).await;
if let Err(DisplayErr { if let Err(DisplayErr {
failed_pages, failed_pages,