leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

graphics: Fix clippy lints

Browse source
This commit is contained in:
Ian Douglas Scott 2023-01-05 10:11:38 -08:00
parent f2affe52fb
commit 3ccfee3c45
1 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
cosmic-applet-graphics/src/window.rs
View file

@ -79,13 +79,13 @@ impl Application for Window {
let mut window = Window::default(); let mut window = Window::default();
let pixels = std::env::var("COSMIC_PANEL_SIZE") let pixels = std::env::var("COSMIC_PANEL_SIZE")
.ok() .ok()
.and_then(|size| match size.parse::<PanelSize>() { .map(|size| match size.parse::<PanelSize>() {
Ok(PanelSize::XL) => Some(64), Ok(PanelSize::XL) => 64,
Ok(PanelSize::L) => Some(36), Ok(PanelSize::L) => 36,
Ok(PanelSize::M) => Some(24), Ok(PanelSize::M) => 24,
Ok(PanelSize::S) => Some(16), Ok(PanelSize::S) => 16,
Ok(PanelSize::XS) => Some(12), Ok(PanelSize::XS) => 12,
Err(_) => Some(12), Err(_) => 12,
}) })
.unwrap_or(16); .unwrap_or(16);
window.icon_size = pixels; window.icon_size = pixels;
@ -96,10 +96,7 @@ impl Application for Window {
Err(_) => PanelAnchor::Top, Err(_) => PanelAnchor::Top,
}) })
.unwrap_or(PanelAnchor::Top); .unwrap_or(PanelAnchor::Top);
( (window, Command::perform(dbus::init(), Message::DBusInit))
window,
Command::perform(dbus::init(), |dbus_init| Message::DBusInit(dbus_init)),
)
} }
fn title(&self) -> String { fn title(&self) -> String {
@ -202,28 +199,28 @@ impl Application for Window {
"Integrated Graphics", "Integrated Graphics",
Graphics::Integrated, Graphics::Integrated,
self.graphics_mode.map(|g| g.inner()), self.graphics_mode.map(|g| g.inner()),
|g| Message::SelectGraphicsMode(g), Message::SelectGraphicsMode,
) )
.into(), .into(),
radio( radio(
"Nvidia Graphics", "Nvidia Graphics",
Graphics::Nvidia, Graphics::Nvidia,
self.graphics_mode.map(|g| g.inner()), self.graphics_mode.map(|g| g.inner()),
|g| Message::SelectGraphicsMode(g), Message::SelectGraphicsMode,
) )
.into(), .into(),
radio( radio(
"Hybrid Graphics", "Hybrid Graphics",
Graphics::Hybrid, Graphics::Hybrid,
self.graphics_mode.map(|g| g.inner()), self.graphics_mode.map(|g| g.inner()),
|g| Message::SelectGraphicsMode(g), Message::SelectGraphicsMode,
) )
.into(), .into(),
radio( radio(
"Compute Graphics", "Compute Graphics",
Graphics::Compute, Graphics::Compute,
self.graphics_mode.map(|g| g.inner()), self.graphics_mode.map(|g| g.inner()),
|g| Message::SelectGraphicsMode(g), Message::SelectGraphicsMode,
) )
.into(), .into(),
]; ];