From 8e47bfdba6dc1a52e5da9b7b86142407e9f5b7dc Mon Sep 17 00:00:00 2001 From: LGUG2Z Date: Mon, 5 Jun 2023 08:21:58 -0700 Subject: [PATCH] fix(wm): allow any id to override a float rule --- .czrc | 2 +- komorebi.generated.ahk | 2 -- komorebi.generated.ps1 | 2 -- komorebi/src/window.rs | 15 +++------------ 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/.czrc b/.czrc index d48bc66a..d1bcc209 100644 --- a/.czrc +++ b/.czrc @@ -1,3 +1,3 @@ -{: +{ "path": "cz-conventional-changelog" } diff --git a/komorebi.generated.ahk b/komorebi.generated.ahk index 6f6c917c..f0e89921 100644 --- a/komorebi.generated.ahk +++ b/komorebi.generated.ahk @@ -358,13 +358,11 @@ RunWait('komorebic.exe identify-tray-application exe "sirikali.exe"', , "Hide") ; Slack RunWait('komorebic.exe identify-border-overflow-application exe "Slack.exe"', , "Hide") -RunWait('komorebic.exe manage-rule exe "Slack.exe"', , "Hide") ; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line RunWait('komorebic.exe identify-tray-application exe "Slack.exe"', , "Hide") ; Slack RunWait('komorebic.exe identify-border-overflow-application exe "slack.exe"', , "Hide") -RunWait('komorebic.exe manage-rule exe "slack.exe"', , "Hide") ; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line RunWait('komorebic.exe identify-tray-application exe "slack.exe"', , "Hide") diff --git a/komorebi.generated.ps1 b/komorebi.generated.ps1 index 276da7bf..f22360c3 100644 --- a/komorebi.generated.ps1 +++ b/komorebi.generated.ps1 @@ -358,13 +358,11 @@ komorebic.exe identify-tray-application exe "sirikali.exe" # Slack komorebic.exe identify-border-overflow-application exe "Slack.exe" -komorebic.exe manage-rule exe "Slack.exe" # If you have disabled minimize/close to tray for this application, you can delete/comment out the next line komorebic.exe identify-tray-application exe "Slack.exe" # Slack komorebic.exe identify-border-overflow-application exe "slack.exe" -komorebic.exe manage-rule exe "slack.exe" # If you have disabled minimize/close to tray for this application, you can delete/comment out the next line komorebic.exe identify-tray-application exe "slack.exe" diff --git a/komorebi/src/window.rs b/komorebi/src/window.rs index 3835ac0c..b383e148 100644 --- a/komorebi/src/window.rs +++ b/komorebi/src/window.rs @@ -485,18 +485,9 @@ fn window_is_eligible( let managed_override = { let manage_identifiers = MANAGE_IDENTIFIERS.lock(); - matched_identifier.map_or_else( - || { - manage_identifiers.contains(exe_name) - || manage_identifiers.contains(class) - || manage_identifiers.contains(title) - }, - |matched_identifier| match matched_identifier { - ApplicationIdentifier::Exe => manage_identifiers.contains(exe_name), - ApplicationIdentifier::Class => manage_identifiers.contains(class), - ApplicationIdentifier::Title => manage_identifiers.contains(title), - }, - ) + manage_identifiers.contains(exe_name) + || manage_identifiers.contains(class) + || manage_identifiers.contains(title) }; if should_float && !managed_override {