Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions mousefood/src/backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
use ratatui_core::style;

#[derive(Clone, Copy)]
pub enum DisplayAlignment {
pub enum TerminalAlignment {
Start,
Center,
End,
Expand All @@ -38,11 +38,11 @@

/// If the display isn't a prefect multiple of the font height, how should the view be
/// displayed in the space given.
pub vertical_alignment: DisplayAlignment,
pub vertical_alignment: TerminalAlignment,

/// If the display isn't a prefect multiple of the font width, how should the view be
/// displayed in the space given.
pub horizontal_alignment: DisplayAlignment,
pub horizontal_alignment: TerminalAlignment,
}

impl<D, C> Default for EmbeddedBackendConfig<D, C>
Expand All @@ -56,8 +56,8 @@
font_regular: default_font::regular,
font_bold: None,
font_italic: None,
vertical_alignment: DisplayAlignment::Start,
horizontal_alignment: DisplayAlignment::Start,
vertical_alignment: TerminalAlignment::Start,
horizontal_alignment: TerminalAlignment::Start,
}
}
}
Expand Down Expand Up @@ -105,8 +105,8 @@
font_regular: MonoFont<'static>,
font_bold: Option<MonoFont<'static>>,
font_italic: Option<MonoFont<'static>>,
vertical_alignment: DisplayAlignment,
horizontal_alignment: DisplayAlignment,
vertical_alignment: TerminalAlignment,
horizontal_alignment: TerminalAlignment,
) -> EmbeddedBackend<'display, D, C> {
let pixels = layout::Size {
width: display.bounding_box().size.width as u16,
Expand All @@ -117,14 +117,14 @@
let extra_y = pixels.height % font_regular.character_size.height as u16;

let off_x = match horizontal_alignment {
DisplayAlignment::Start => 0,
DisplayAlignment::Center => extra_x / 2, //best effort, might be 1/2 pixel off
DisplayAlignment::End => extra_x,
TerminalAlignment::Start => 0,
TerminalAlignment::Center => extra_x / 2, //best effort, might be 1/2 pixel off
TerminalAlignment::End => extra_x,
} as i32;
let off_y = match vertical_alignment {
DisplayAlignment::Start => 0,
DisplayAlignment::Center => extra_y / 2, //best effort, might be 1/2 pixel off
DisplayAlignment::End => extra_y,
TerminalAlignment::Start => 0,
TerminalAlignment::Center => extra_y / 2, //best effort, might be 1/2 pixel off
TerminalAlignment::End => extra_y,
} as i32;

let char_offset = geometry::Point::new(off_x, off_y);
Expand Down Expand Up @@ -262,7 +262,7 @@
| ClearType::BeforeCursor
| ClearType::CurrentLine
| ClearType::UntilNewLine => Err(crate::error::Error::ClearTypeUnsupported(
alloc::format!("{:?}", clear_type),

Check warning on line 265 in mousefood/src/backend.rs

View workflow job for this annotation

GitHub Actions / Run clippy

variables can be used directly in the `format!` string

warning: variables can be used directly in the `format!` string --> mousefood/src/backend.rs:265:17 | 265 | alloc::format!("{:?}", clear_type), | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#uninlined_format_args = note: `#[warn(clippy::uninlined_format_args)]` on by default help: change this to | 265 - alloc::format!("{:?}", clear_type), 265 + alloc::format!("{clear_type:?}"), |
)),
}
}
Expand Down