sawyer/picocalc-os-rs
1
1
Fork 0
mirror of https://github.com/LegitCamper/picocalc-os-rs.git synced 2025-12-27 07:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

clippy

Browse Source
This commit is contained in:
sawyer bristol
2025-11-18 15:20:03 -07:00
parent 49c11978d5
commit cc31cb4711
20 changed files with 182 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
selection_ui/src/lib.rs
View File

@@ -51,15 +51,14 @@ impl<'a> SelectionUi<'a> {
let selection;
loop {
let key = get_key();
if key.state == KeyState::Pressed {
if let Some(s) = self.update(display, key.key)? {
if key.state == KeyState::Pressed
&& let Some(s) = self.update(display, key.key)? {
selection = Some(s);
display
.clear(Rgb565::BLACK)
.map_err(|e| SelectionUiError::DisplayError(e))?;
.map_err(SelectionUiError::DisplayError)?;
break;
}
}
}
Ok(selection)
}
@@ -100,7 +99,7 @@ impl<'a> SelectionUi<'a> {
Rectangle::new(bounds.top_left, bounds.size)
.into_styled(PrimitiveStyle::with_fill(Rgb565::BLACK))
.draw(display)
.map_err(|e| SelectionUiError::DisplayError(e))?;
.map_err(SelectionUiError::DisplayError)?;
}
let mut views: Vec<Text<MonoTextStyle<Rgb565>>> = Vec::new();
@@ -119,7 +118,7 @@ impl<'a> SelectionUi<'a> {
layout
.draw(display)
.map_err(|e| SelectionUiError::DisplayError(e))?;
.map_err(SelectionUiError::DisplayError)?;
// draw selected box
if let Some(selected_bounds) = layout.inner().get(self.selection) {
@@ -127,7 +126,7 @@ impl<'a> SelectionUi<'a> {
Rectangle::new(selected_bounds.top_left, selected_bounds.size)
.into_styled(PrimitiveStyle::with_stroke(Rgb565::WHITE, 1))
.draw(display)
.map_err(|e| SelectionUiError::DisplayError(e))?;
.map_err(SelectionUiError::DisplayError)?;
self.last_bounds = Some(selected_bounds);
}
@@ -136,9 +135,9 @@ impl<'a> SelectionUi<'a> {
}
}
pub fn draw_text_center<'a, S>(
pub fn draw_text_center<S>(
display: &mut Display,
text: &'a str,
text: &str,
style: S,
) -> Result<Point, <Display as DrawTarget>::Error>
where