Skip to content

Treat false as disabling a command in config #1736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 25, 2025
Merged

Treat false as disabling a command in config #1736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef6ab7d
Treat as disabling a command in config
ianyh Jan 25, 2025
599d87a
Add command disabling to config file docs
ianyh Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Amethyst/Preferences/UserConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
case windowMinimumWidth = "window-minimum-width"
case windowMaxCount = "window-max-count"
case floatingBundleIdentifiers = "floating"
case floatingBundleIdentifiersIsBlacklist = "floating-is-blacklist"

Check warning on line 79 in Amethyst/Preferences/UserConfiguration.swift

View workflow job for this annotation

GitHub Actions / Build and run unit tests 

Inclusive Language Violation: Declaration floatingBundleIdentifiersIsBlacklist contains the term "blacklist" which is not considered inclusive (inclusive_language)
case ignoreMenuBar = "ignore-menu-bar"
case floatSmallWindows = "float-small-windows"
case mouseFollowsFocus = "mouse-follows-focus"
Expand Down Expand Up @@ -415,6 +415,9 @@
var command: [String: String]? = configurationValue(forKeyValue: commandKey, fallbackToDefault: false)
if command != nil {
override = true
} else if let enabled: Bool = configurationValue(forKeyValue: commandKey, fallbackToDefault: false), !enabled {
override = true
command = nil
} else {
let mod1: [String]? = configurationValueForKey(.mod1, fallbackToDefault: false)
let mod2: [String]? = configurationValueForKey(.mod2, fallbackToDefault: false)
Expand Down
2 changes: 1 addition & 1 deletion docs/configuration-files.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Amethyst will pick up a config file located at `~/.amethyst.yml` or `~/.config/a

## Commands

Commands are defined at the root of the config file, and have a `mod` and a `key`.
Commands are defined at the root of the config file, as either an object with `mod` and `key` values to customize the command or is `false` to entirely disable it.

| Key | Description |
| --- | ----------- |
Expand Down
Loading