mirror of
https://github.com/Zedfrigg/ironbar.git
synced 2025-08-16 22:31:03 +02:00
build: fix even more coupling issues with keyboard/workspace/sway
damn it
This commit is contained in:
parent
557ef4c898
commit
bfb9f04afd
1 changed files with 3 additions and 3 deletions
|
@ -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() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue