zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-08-17 14:51:04 +02:00
Code Activity

build: fix even more coupling issues with keyboard/workspace/sway

Browse source 
damn it
This commit is contained in:
Jake Stanger 2025-03-28 20:51:26 +00:00
parent 557ef4c898
commit bfb9f04afd
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/clients/compositor/mod.rs
View file

@ -32,7 +32,7 @@ impl Display for Compositor {
match self {
#[cfg(any(feature = "keyboard+sway", feature = "workspaces+sway"))]
Self::Sway => "Sway",
#[cfg(any(feature = "keyboard+sway", feature = "workspaces+hyprland"))]
#[cfg(any(feature = "keyboard+hyprland", feature = "workspaces+hyprland"))]
Self::Hyprland => "Hyprland",
#[cfg(feature = "workspaces+niri")]
Self::Niri => "Niri",
@ -48,12 +48,12 @@ impl Compositor {
fn get_current() -> Self {
if std::env::var("SWAYSOCK").is_ok() {
cfg_if! {
if #[cfg(feature = "workspaces+sway")] { Self::Sway }
if #[cfg(any(feature = "keyboard+sway", feature = "workspaces+sway"))] { Self::Sway }
else { tracing::error!("Not compiled with Sway support"); Self::Unsupported }
}
} else if std::env::var("HYPRLAND_INSTANCE_SIGNATURE").is_ok() {
cfg_if! {
if #[cfg(feature = "workspaces+hyprland")] { Self::Hyprland }
if #[cfg(any(feature = "keyboard+hyprland", feature = "workspaces+hyprland"))] { Self::Hyprland }
else { tracing::error!("Not compiled with Hyprland support"); Self::Unsupported }
}
} else if std::env::var("NIRI_SOCKET").is_ok() {