ui: screens: make draw_border take a DisplayExclusive instead of Display

Currently draw_border does its own locking of the display,
but most callees also lock the screen to draw UI elements or
will do so soon when button legends are introduced.

Make draw_border use the already locked display instead of doing
its own locking.

This is mostly an esthetic change, as the framebuffer backend is
not at all concerned with the locking we do here and performance-wise
it should not make a difference.

Signed-off-by: Leonard Göhrs <[email protected]>

Author: hnez

src/ui/screens.rs

@@ -134,31 +134,29 @@ pub(super) trait ActivatableScreen: Sync + Send {
 
 /// Draw static screen border containing a title and an indicator for the
 /// position of the screen in the list of screens.
-fn draw_border(text: &str, screen: NormalScreen, display: &Display) {
-    display.with_lock(|target| {
-        Text::new(
-            text,
-            Point::new(8, 17),
-            MonoTextStyle::new(&UI_TEXT_FONT, BinaryColor::On),
-        )
+fn draw_border(target: &mut DisplayExclusive, text: &str, screen: NormalScreen) {
+    Text::new(
+        text,
+        Point::new(8, 17),
+        MonoTextStyle::new(&UI_TEXT_FONT, BinaryColor::On),
+    )
+    .draw(target)
+    .unwrap();
+
+    Line::new(Point::new(0, 23), Point::new(240, 23))
+        .into_styled(PrimitiveStyle::with_stroke(BinaryColor::On, 2))
         .draw(target)
         .unwrap();
 
-        Line::new(Point::new(0, 24), Point::new(240, 24))
-            .into_styled(PrimitiveStyle::with_stroke(BinaryColor::On, 2))
-            .draw(target)
-            .unwrap();
-
-        let screen_idx = screen as i32;
-        let num_screens = (NormalScreen::Uart as i32) + 1;
-        let x_start = screen_idx * 240 / num_screens;
-        let x_end = (screen_idx + 1) * 240 / num_screens;
-
-        Line::new(Point::new(x_start, 240), Point::new(x_end, 240))
-            .into_styled(PrimitiveStyle::with_stroke(BinaryColor::On, 4))
-            .draw(target)
-            .unwrap();
-    });
+    let screen_idx = screen as i32;
+    let num_screens = (NormalScreen::Uart as i32) + 1;
+    let x_start = screen_idx * 240 / num_screens;
+    let x_end = (screen_idx + 1) * 240 / num_screens;
+
+    Line::new(Point::new(x_start, 240), Point::new(x_end, 240))
+        .into_styled(PrimitiveStyle::with_stroke(BinaryColor::On, 4))
+        .draw(target)
+        .unwrap();
 }
 
 const fn row_anchor(row_num: u8) -> Point {

src/ui/screens/dig_out.rs

@@ -60,8 +60,6 @@ impl ActivatableScreen for DigOutScreen {
     }
 
     fn activate(&mut self, ui: &Ui, display: Display) -> Box<dyn ActiveScreen> {
-        draw_border("Digital Out", SCREEN_TYPE, &display);
-
         let ports = [
             (
                 0,
@@ -81,6 +79,8 @@ impl ActivatableScreen for DigOutScreen {
             MonoTextStyle::new(&UI_TEXT_FONT, BinaryColor::On);
 
         display.with_lock(|target| {
+            draw_border(target, "Digital Out", SCREEN_TYPE);
+
             for (idx, name, _, _) in ports {
                 let anchor_name = row_anchor(idx * 4);
 

src/ui/screens/iobus.rs

@@ -51,12 +51,12 @@ impl ActivatableScreen for IoBusScreen {
     }
 
     fn activate(&mut self, ui: &Ui, display: Display) -> Box<dyn ActiveScreen> {
-        draw_border("IOBus", SCREEN_TYPE, &display);
-
         let ui_text_style: MonoTextStyle<BinaryColor> =
             MonoTextStyle::new(&UI_TEXT_FONT, BinaryColor::On);
 
         display.with_lock(|target| {
+            draw_border(target, "IOBus", SCREEN_TYPE);
+
             Text::new("CAN Status:", row_anchor(0), ui_text_style)
                 .draw(target)
                 .unwrap();

src/ui/screens/power.rs

@@ -56,7 +56,7 @@ impl ActivatableScreen for PowerScreen {
     }
 
     fn activate(&mut self, ui: &Ui, display: Display) -> Box<dyn ActiveScreen> {
-        draw_border("DUT Power", SCREEN_TYPE, &display);
+        display.with_lock(|target| draw_border(target, "DUT Power", SCREEN_TYPE));
 
         let mut widgets = WidgetContainer::new(display);
 

src/ui/screens/system.rs

@@ -73,7 +73,7 @@ impl ActivatableScreen for SystemScreen {
     }
 
     fn activate(&mut self, ui: &Ui, display: Display) -> Box<dyn ActiveScreen> {
-        draw_border("System Status", SCREEN_TYPE, &display);
+        display.with_lock(|target| draw_border(target, "System Status", SCREEN_TYPE));
 
         let mut widgets = WidgetContainer::new(display);
         let highlighted = Topic::anonymous(Some(Action::Reboot));

src/ui/screens/uart.rs

@@ -51,7 +51,7 @@ impl ActivatableScreen for UartScreen {
     }
 
     fn activate(&mut self, ui: &Ui, display: Display) -> Box<dyn ActiveScreen> {
-        draw_border("DUT UART", SCREEN_TYPE, &display);
+        display.with_lock(|target| draw_border(target, "DUT UART", SCREEN_TYPE));
 
         let mut widgets = WidgetContainer::new(display);
 

src/ui/screens/usb.rs

@@ -61,12 +61,12 @@ impl ActivatableScreen for UsbScreen {
     }
 
     fn activate(&mut self, ui: &Ui, display: Display) -> Box<dyn ActiveScreen> {
-        draw_border("USB Host", SCREEN_TYPE, &display);
-
         let ui_text_style: MonoTextStyle<BinaryColor> =
             MonoTextStyle::new(&UI_TEXT_FONT, BinaryColor::On);
 
         display.with_lock(|target| {
+            draw_border(target, "USB Host", SCREEN_TYPE);
+
             Text::new("Total", row_anchor(0), ui_text_style)
                 .draw(target)
                 .unwrap();