Rename Un/Set/ToggleUrgent to Un/Set/ToggleWindowUrgent

Overlooked this when reviewing. This change is not cfg-breaking (since you
can't bind these directly), but it does break calling these actions through
IPC. I don't imagine they are widely used though, and the original PR author
who also implemented urgency for bars said he didn't use these actions either.
This commit is contained in:
Ivan Molodetskikh
2025-05-25 08:41:33 +03:00
parent e6bd60fbb1
commit 126ca37d96
3 changed files with 12 additions and 12 deletions
+6 -6
View File
@@ -1888,11 +1888,11 @@ pub enum Action {
OpenOverview, OpenOverview,
CloseOverview, CloseOverview,
#[knuffel(skip)] #[knuffel(skip)]
ToggleUrgent(u64), ToggleWindowUrgent(u64),
#[knuffel(skip)] #[knuffel(skip)]
SetUrgent(u64), SetWindowUrgent(u64),
#[knuffel(skip)] #[knuffel(skip)]
UnsetUrgent(u64), UnsetWindowUrgent(u64),
} }
impl From<niri_ipc::Action> for Action { impl From<niri_ipc::Action> for Action {
@@ -2165,9 +2165,9 @@ impl From<niri_ipc::Action> for Action {
niri_ipc::Action::ToggleOverview {} => Self::ToggleOverview, niri_ipc::Action::ToggleOverview {} => Self::ToggleOverview,
niri_ipc::Action::OpenOverview {} => Self::OpenOverview, niri_ipc::Action::OpenOverview {} => Self::OpenOverview,
niri_ipc::Action::CloseOverview {} => Self::CloseOverview, niri_ipc::Action::CloseOverview {} => Self::CloseOverview,
niri_ipc::Action::ToggleUrgent { id } => Self::ToggleUrgent(id), niri_ipc::Action::ToggleWindowUrgent { id } => Self::ToggleWindowUrgent(id),
niri_ipc::Action::SetUrgent { id } => Self::SetUrgent(id), niri_ipc::Action::SetWindowUrgent { id } => Self::SetWindowUrgent(id),
niri_ipc::Action::UnsetUrgent { id } => Self::UnsetUrgent(id), niri_ipc::Action::UnsetWindowUrgent { id } => Self::UnsetWindowUrgent(id),
} }
} }
} }
+3 -3
View File
@@ -823,19 +823,19 @@ pub enum Action {
/// Close the Overview. /// Close the Overview.
CloseOverview {}, CloseOverview {},
/// Toggle urgent status of a window. /// Toggle urgent status of a window.
ToggleUrgent { ToggleWindowUrgent {
/// Id of the window to toggle urgent. /// Id of the window to toggle urgent.
#[cfg_attr(feature = "clap", arg(long))] #[cfg_attr(feature = "clap", arg(long))]
id: u64, id: u64,
}, },
/// Set urgent status of a window. /// Set urgent status of a window.
SetUrgent { SetWindowUrgent {
/// Id of the window to set urgent. /// Id of the window to set urgent.
#[cfg_attr(feature = "clap", arg(long))] #[cfg_attr(feature = "clap", arg(long))]
id: u64, id: u64,
}, },
/// Unset urgent status of a window. /// Unset urgent status of a window.
UnsetUrgent { UnsetWindowUrgent {
/// Id of the window to unset urgent. /// Id of the window to unset urgent.
#[cfg_attr(feature = "clap", arg(long))] #[cfg_attr(feature = "clap", arg(long))]
id: u64, id: u64,
+3 -3
View File
@@ -1982,7 +1982,7 @@ impl State {
self.niri.queue_redraw_all(); self.niri.queue_redraw_all();
} }
} }
Action::ToggleUrgent(id) => { Action::ToggleWindowUrgent(id) => {
let window = self let window = self
.niri .niri
.layout .layout
@@ -1994,7 +1994,7 @@ impl State {
} }
self.niri.queue_redraw_all(); self.niri.queue_redraw_all();
} }
Action::SetUrgent(id) => { Action::SetWindowUrgent(id) => {
let window = self let window = self
.niri .niri
.layout .layout
@@ -2005,7 +2005,7 @@ impl State {
} }
self.niri.queue_redraw_all(); self.niri.queue_redraw_all();
} }
Action::UnsetUrgent(id) => { Action::UnsetWindowUrgent(id) => {
let window = self let window = self
.niri .niri
.layout .layout