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);
}
WaylandUpdate::Toplevel(event) => match event {
ToplevelUpdate::AddToplevel(handle, info) => {
ToplevelUpdate::Add(handle, info) => {
if info.app_id.is_empty() {
return Command::none();
}
@ -747,7 +747,7 @@ impl cosmic::Application for CosmicAppList {
});
}
}
ToplevelUpdate::RemoveToplevel(handle) => {
ToplevelUpdate::Remove(handle) => {
for t in self
.active_list
.iter_mut()
@ -757,7 +757,7 @@ impl cosmic::Application for CosmicAppList {
}
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
if info.app_id.is_empty() {
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) {
let _ = self
.tx
.unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::AddToplevel(
.unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::Add(
toplevel.clone(),
info.clone(),
)));
@ -149,12 +149,12 @@ impl ToplevelInfoHandler for AppData {
toplevel: &zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1,
) {
if let Some(info) = self.toplevel_info_state.info(toplevel) {
let _ =
self.tx
.unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::UpdateToplevel(
toplevel.clone(),
info.clone(),
)));
let _ = self
.tx
.unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::Update(
toplevel.clone(),
info.clone(),
)));
}
}
@ -166,7 +166,7 @@ impl ToplevelInfoHandler for AppData {
) {
let _ = self
.tx
.unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::RemoveToplevel(
.unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::Remove(
toplevel.clone(),
)));
}

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

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