apply rustfmt

Author: FreddyFunk

src/components/app.rs

@@ -16,14 +16,16 @@ use cosmic::{
         alignment::Horizontal,
         event::{
             self, listen_with,
-            wayland::{self, LayerEvent, OverlapNotifyEvent, OutputEvent},
+            wayland::{self, LayerEvent, OutputEvent, OverlapNotifyEvent},
         },
         keyboard::{Key, key::Named},
         platform_specific::shell::commands::activation::request_token,
         time,
         window::Id as SurfaceId,
     },
-    iced_runtime::platform_specific::wayland::layer_surface::{IcedOutput, SctkLayerSurfaceSettings},
+    iced_runtime::platform_specific::wayland::layer_surface::{
+        IcedOutput, SctkLayerSurfaceSettings,
+    },
     iced_winit::commands::layer_surface::{
         Anchor, KeyboardInteractivity, destroy_layer_surface, get_layer_surface,
     },
@@ -67,8 +69,8 @@ pub struct Args {
 pub enum OsdTask {
     #[clap(about = "Display external display toggle indicator")]
     Display,
-    #[clap(about = "Show numbers on all displays for identification", name = "identify-displays")]
-    DisplayIdentifier,
+    #[clap(about = "Show numbers on all displays for identification")]
+    IdentifyDisplays,
     #[clap(about = "Toggle the on screen display and start the log out timer")]
     LogOut,
     #[clap(about = "Toggle the on screen display and start the restart timer")]
@@ -117,7 +119,7 @@ impl OsdTask {
             .map(msg),
             OsdTask::Touchpad => Task::none(),
             OsdTask::Display => Task::none(),
-            OsdTask::DisplayIdentifier => Task::none(),
+            OsdTask::IdentifyDisplays => Task::none(),
         }
     }
 }
@@ -515,7 +517,9 @@ impl cosmic::Application for App {
                     if let Some(state) = state {
                         self.surfaces.insert(id, Surface::OsdIndicator(state));
                     }
-                    return cmd.map(move |msg| cosmic::action::app(Msg::DisplayIdentifierSurface((id, msg))));
+                    return cmd.map(move |msg| {
+                        cosmic::action::app(Msg::DisplayIdentifierSurface((id, msg)))
+                    });
                 }
                 Task::none()
             }
@@ -766,7 +770,9 @@ impl cosmic::Application for App {
                     );
 
                     self.surfaces.insert(id, Surface::OsdIndicator(state));
-                    tasks.push(cmd.map(move |msg| cosmic::action::app(Msg::DisplayIdentifierSurface((id, msg)))));
+                    tasks.push(cmd.map(move |msg| {
+                        cosmic::action::app(Msg::DisplayIdentifierSurface((id, msg)))
+                    }));
                 }
 
                 Task::batch(tasks)
@@ -840,10 +846,16 @@ impl cosmic::Application for App {
             _ => None,
         }));
 
-        subscriptions.extend(self.surfaces.iter().filter_map(|(id, surface)| match surface {
-            Surface::PolkitDialog(state) => Some(state.subscription().with(*id).map(Msg::PolkitDialog)),
-            Surface::OsdIndicator(_) => None, // OSD indicators don't have subscriptions
-        }));
+        subscriptions.extend(
+            self.surfaces
+                .iter()
+                .filter_map(|(id, surface)| match surface {
+                    Surface::PolkitDialog(state) => {
+                        Some(state.subscription().with(*id).map(Msg::PolkitDialog))
+                    }
+                    Surface::OsdIndicator(_) => None, // OSD indicators don't have subscriptions
+                }),
+        );
         if self.action_to_confirm.is_some() {
             subscriptions.push(time::every(Duration::from_millis(1000)).map(|_| Msg::Countdown));
         }
@@ -861,9 +873,9 @@ impl cosmic::Application for App {
                 Surface::PolkitDialog(state) => {
                     state.view().map(move |msg| Msg::PolkitDialog((id, msg)))
                 }
-                Surface::OsdIndicator(state) => {
-                    state.view().map(move |msg| Msg::DisplayIdentifierSurface((id, msg)))
-                }
+                Surface::OsdIndicator(state) => state
+                    .view()
+                    .map(move |msg| Msg::DisplayIdentifierSurface((id, msg))),
             };
         } else if let Some((indicator_id, state)) = &self.indicator {
             if id == *indicator_id {
@@ -880,7 +892,7 @@ impl cosmic::Application for App {
                 OsdTask::ConfirmHeadphones { .. } => "confirm-device-type",
                 OsdTask::Touchpad => "touchpad",
                 OsdTask::Display => "external-display",
-                OsdTask::DisplayIdentifier => "display-identifier",
+                OsdTask::IdentifyDisplays => "identify-displays",
             };
 
             let title = fl!(
@@ -1185,7 +1197,7 @@ impl cosmic::Application for App {
 
                         Msg::Display(enabled)
                     });
-                } else if let OsdTask::DisplayIdentifier = cmd {
+                } else if let OsdTask::IdentifyDisplays = cmd {
                     return cosmic::task::future(async move {
                         let Ok(output_lists) = cosmic_randr_shell::list().await else {
                             log::error!("Failed to list displays with cosmic-randr");

src/components/osd_indicator.rs

@@ -5,7 +5,9 @@ use crate::{components::app::DisplayMode, config};
 use cosmic::{
     Apply, Element, Task,
     iced::{self, Alignment, Border, Length, window::Id as SurfaceId},
-    iced_runtime::platform_specific::wayland::layer_surface::{IcedOutput, SctkLayerSurfaceSettings},
+    iced_runtime::platform_specific::wayland::layer_surface::{
+        IcedOutput, SctkLayerSurfaceSettings,
+    },
     iced_winit::commands::{
         layer_surface::{
             Anchor, KeyboardInteractivity, Layer, destroy_layer_surface, get_layer_surface,
@@ -40,7 +42,9 @@ impl Params {
             Self::DisplayBrightness(_) => "display-brightness-symbolic",
             Self::DisplayToggle(DisplayMode::All) => "laptop-symbolic",
             Self::DisplayToggle(DisplayMode::External) => "display-symbolic",
-            Self::DisplayNumber(_) => unreachable!("DisplayNumber uses custom rendering and should not call icon_name()"),
+            Self::DisplayNumber(_) => {
+                unreachable!("DisplayNumber uses custom rendering and should not call icon_name()")
+            }
             Self::KeyboardBrightness(_) => "keyboard-brightness-symbolic",
             Self::AirplaneMode(true) => "airplane-mode-symbolic",
             Self::AirplaneMode(false) => "airplane-mode-disabled-symbolic",
@@ -87,7 +91,6 @@ impl Params {
             Self::DisplayNumber(_) => None,
         }
     }
-
 }
 
 #[derive(Clone, Debug)]
@@ -305,7 +308,9 @@ impl State {
         // Large number display
         let number_text = widget::text::title1(format!("{}", display_number))
             .size(240)
-            .line_height(cosmic::iced::widget::text::LineHeight::Absolute(cosmic::iced::Pixels(240.0)))
+            .line_height(cosmic::iced::widget::text::LineHeight::Absolute(
+                cosmic::iced::Pixels(240.0),
+            ))
             .width(Length::Shrink)
             .align_x(Alignment::Center)
             .align_y(Alignment::Center);
@@ -321,10 +326,10 @@ impl State {
 
         let container = widget::container(content)
             .padding([
-                vertical_padding,      // top
-                horizontal_padding,    // right
-                vertical_padding,      // bottom
-                horizontal_padding,    // left
+                vertical_padding,   // top
+                horizontal_padding, // right
+                vertical_padding,   // bottom
+                horizontal_padding, // left
             ])
             .width(Length::Shrink)
             .height(Length::Shrink)