mirror of
https://github.com/itsjunetime/tdf.git
synced 2026-06-02 08:01:47 -04:00
fmt
This commit is contained in:
+7
-5
@@ -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| {
|
||||||
|
img_id
|
||||||
.map(|id| *img = MaybeTransferred::Transferred(id))
|
.map(|id| *img = MaybeTransferred::Transferred(id))
|
||||||
.ok_or(DisplayErrSource::KittageReturnedNoId)
|
.ok_or(DisplayErrSource::KittageReturnedNoId)
|
||||||
)
|
})
|
||||||
}
|
}
|
||||||
MaybeTransferred::Transferred(image_id) => run_action(
|
MaybeTransferred::Transferred(image_id) => run_action(
|
||||||
Action::Display {
|
Action::Display {
|
||||||
|
|||||||
+2
-1
@@ -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,
|
||||||
|
|||||||
Reference in New Issue
Block a user