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

flatten tautological enum names

Browse source
This commit is contained in:
daniel.eades 2023-11-16 18:20:57 +00:00 • committed by Ashley Wulber
parent 0e28a940da
commit e9af664888
4 changed files with 27 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cosmic-app-list/src/app.rs
View file

@ -722,7 +722,7 @@ impl cosmic::Application for CosmicAppList {
.map(cosmic::app::message::app); .map(cosmic::app::message::app);
} }
WaylandUpdate::Toplevel(event) => match event { WaylandUpdate::Toplevel(event) => match event {
ToplevelUpdate::AddToplevel(handle, info) => { ToplevelUpdate::Add(handle, info) => {
if info.app_id.is_empty() { if info.app_id.is_empty() {
return Command::none(); return Command::none();
} }
@ -747,7 +747,7 @@ impl cosmic::Application for CosmicAppList {
}); });
} }
} }
ToplevelUpdate::RemoveToplevel(handle) => { ToplevelUpdate::Remove(handle) => {
for t in self for t in self
.active_list .active_list
.iter_mut() .iter_mut()
@ -757,7 +757,7 @@ impl cosmic::Application for CosmicAppList {
} }
self.active_list.retain(|t| !t.toplevels.is_empty()); self.active_list.retain(|t| !t.toplevels.is_empty());
} }
ToplevelUpdate::UpdateToplevel(handle, info) => { ToplevelUpdate::Update(handle, info) => {
// TODO probably want to make sure it is removed // TODO probably want to make sure it is removed
if info.app_id.is_empty() { if info.app_id.is_empty() {
return Command::none(); return Command::none();

16
cosmic-app-list/src/wayland_handler.rs
View file

@ -135,7 +135,7 @@ impl ToplevelInfoHandler for AppData {
if let Some(info) = self.toplevel_info_state.info(toplevel) { if let Some(info) = self.toplevel_info_state.info(toplevel) {
let _ = self let _ = self
.tx .tx
.unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::AddToplevel( .unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::Add(
toplevel.clone(), toplevel.clone(),
info.clone(), info.clone(),
))); )));
@ -149,12 +149,12 @@ impl ToplevelInfoHandler for AppData {
toplevel: &zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1, toplevel: &zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1,
) { ) {
if let Some(info) = self.toplevel_info_state.info(toplevel) { if let Some(info) = self.toplevel_info_state.info(toplevel) {
let _ = let _ = self
self.tx .tx
.unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::UpdateToplevel( .unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::Update(
toplevel.clone(), toplevel.clone(),
info.clone(), info.clone(),
))); )));
} }
} }
@ -166,7 +166,7 @@ impl ToplevelInfoHandler for AppData {
) { ) {
let _ = self let _ = self
.tx .tx
.unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::RemoveToplevel( .unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::Remove(
toplevel.clone(), toplevel.clone(),
))); )));
} }

6
cosmic-app-list/src/wayland_subscription.rs
View file

@ -82,9 +82,9 @@ pub enum WaylandUpdate {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum ToplevelUpdate { pub enum ToplevelUpdate {
AddToplevel(ZcosmicToplevelHandleV1, ToplevelInfo), Add(ZcosmicToplevelHandleV1, ToplevelInfo),
UpdateToplevel(ZcosmicToplevelHandleV1, ToplevelInfo), Update(ZcosmicToplevelHandleV1, ToplevelInfo),
RemoveToplevel(ZcosmicToplevelHandleV1), Remove(ZcosmicToplevelHandleV1),
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug)]

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

@ -22,17 +22,17 @@ const ID: &str = "com.system76.CosmicAppletGraphics";
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
enum GraphicsMode { enum GraphicsMode {
AppliedGraphicsMode(Graphics), Applied(Graphics),
SelectedGraphicsMode { prev: Graphics, new: Graphics }, Selected { prev: Graphics, new: Graphics },
CurrentGraphicsMode(Graphics), Current(Graphics),
} }
impl GraphicsMode { impl GraphicsMode {
fn inner(&self) -> Graphics { fn inner(&self) -> Graphics {
match self { match self {
GraphicsMode::SelectedGraphicsMode { new, .. } => *new, GraphicsMode::Selected { new, .. } => *new,
GraphicsMode::CurrentGraphicsMode(g) => *g, GraphicsMode::Current(g) => *g,
GraphicsMode::AppliedGraphicsMode(g) => *g, GraphicsMode::Applied(g) => *g,
} }
} }
} }
@ -98,7 +98,7 @@ impl cosmic::Application for Window {
.graphics_mode .graphics_mode
.map(|m| m.inner()) .map(|m| m.inner())
.unwrap_or_else(|| Graphics::Integrated); .unwrap_or_else(|| Graphics::Integrated);
self.graphics_mode = Some(GraphicsMode::SelectedGraphicsMode { prev, new }); self.graphics_mode = Some(GraphicsMode::Selected { prev, new });
return iced::Command::perform( return iced::Command::perform(
set_graphics(proxy.clone(), new), set_graphics(proxy.clone(), new),
move |success| { move |success| {
@ -157,9 +157,7 @@ impl cosmic::Application for Window {
Message::CurrentGraphics(g) => { Message::CurrentGraphics(g) => {
if let Some(g) = g { if let Some(g) = g {
self.graphics_mode = Some(match self.graphics_mode.take() { self.graphics_mode = Some(match self.graphics_mode.take() {
Some(GraphicsMode::CurrentGraphicsMode(_)) | None => { Some(GraphicsMode::Current(_)) | None => GraphicsMode::Current(g),
GraphicsMode::CurrentGraphicsMode(g)
}
Some(g) => g, Some(g) => g,
}); });
} }
@ -171,13 +169,13 @@ impl cosmic::Application for Window {
} }
Message::AppliedGraphics(g) => { Message::AppliedGraphics(g) => {
if let Some(g) = g { if let Some(g) = g {
self.graphics_mode = Some(GraphicsMode::AppliedGraphicsMode(g)); self.graphics_mode = Some(GraphicsMode::Applied(g));
} else { } else {
// Reset graphics // Reset graphics
match self.graphics_mode { match self.graphics_mode {
Some(GraphicsMode::SelectedGraphicsMode { prev, new }) => { Some(GraphicsMode::Selected { prev, new }) => {
// TODO send notification with error? // TODO send notification with error?
self.graphics_mode = Some(GraphicsMode::AppliedGraphicsMode(prev)); self.graphics_mode = Some(GraphicsMode::Applied(prev));
// Reset to prev after failing // Reset to prev after failing
// https://github.com/pop-os/system76-power/issues/387 // https://github.com/pop-os/system76-power/issues/387
if let Some((_, proxy)) = self.dbus.as_ref() { if let Some((_, proxy)) = self.dbus.as_ref() {
@ -342,7 +340,7 @@ fn button_icon<'a>(
button_mode: Graphics, button_mode: Graphics,
) -> Container<'a, Message, cosmic::Renderer> { ) -> Container<'a, Message, cosmic::Renderer> {
match cur_mode { match cur_mode {
Some(GraphicsMode::SelectedGraphicsMode { prev: _, new }) if new == button_mode => { Some(GraphicsMode::Selected { prev: _, new }) if new == button_mode => {
cosmic::widget::container( cosmic::widget::container(
icon::from_name("process-working-symbolic") icon::from_name("process-working-symbolic")
.size(12) .size(12)
@ -350,9 +348,7 @@ fn button_icon<'a>(
.prefer_svg(true), .prefer_svg(true),
) )
} }
Some(GraphicsMode::AppliedGraphicsMode(g) | GraphicsMode::CurrentGraphicsMode(g)) Some(GraphicsMode::Applied(g) | GraphicsMode::Current(g)) if g == button_mode => {
if g == button_mode =>
{
cosmic::widget::container( cosmic::widget::container(
icon::from_name("emblem-ok-symbolic") icon::from_name("emblem-ok-symbolic")
.size(12) .size(12)