mirror of
https://github.com/LGUG2Z/komorebi.git
synced 2026-11-16 22:01:22 +01:00
refactor(mac): converge animation/prefix.rs to the shared AnimationPrefix
macOS's AnimationPrefix gains Transparency (it had movement and workspace), so all three trees share the union {movement, transparency, workspace} (D15/D16); the macOS daemon ignores Transparency as before in practice. prefix.rs is now the Windows text plus module docs (this adds new_animation_key to macOS).
Intentional schema change: komorebi-for-mac/schema.json gets the same shape change as the KDE one (per-prefix animation settings become additionalProperties of the value type). Because a macOS komorebic cannot run here, the three PerAnimationPrefixConfig definitions were copied from the schema that the KDE komorebic generated from identical code (jq, the file round-trips byte-identically through jq --indent 2); not regenerated on macOS. The animation CLI docs list the three values.
Verified: fast-check macOS (fake CC) cargo check --workspace --all-targets: PASS. macOS tests and schema generation not run (cannot).
This commit is contained in:
1 parent
ad2281de19
commit
975f007af2
5 files changed
+20
-35
No files matched your search
@@ -13,7 +13,7 @@ Options:
|
|||||||
-a, --animation-type <ANIMATION_TYPE>
|
-a, --animation-type <ANIMATION_TYPE>
|
||||||
Animation type to apply the duration to. If not specified, sets global duration
|
Animation type to apply the duration to. If not specified, sets global duration
|
||||||
|
|
||||||
[possible values: movement, workspace]
|
[possible values: movement, transparency, workspace]
|
||||||
|
|
||||||
-h, --help
|
-h, --help
|
||||||
Print help
|
Print help
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ Options:
|
|||||||
-a, --animation-type <ANIMATION_TYPE>
|
-a, --animation-type <ANIMATION_TYPE>
|
||||||
Animation type to apply the style to. If not specified, sets global style
|
Animation type to apply the style to. If not specified, sets global style
|
||||||
|
|
||||||
[possible values: movement, workspace]
|
[possible values: movement, transparency, workspace]
|
||||||
|
|
||||||
-h, --help
|
-h, --help
|
||||||
Print help (see a summary with '-h')
|
Print help (see a summary with '-h')
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ Options:
|
|||||||
-a, --animation-type <ANIMATION_TYPE>
|
-a, --animation-type <ANIMATION_TYPE>
|
||||||
Animation type to apply the state to. If not specified, sets global state
|
Animation type to apply the state to. If not specified, sets global state
|
||||||
|
|
||||||
[possible values: movement, workspace]
|
[possible values: movement, transparency, workspace]
|
||||||
|
|
||||||
-h, --help
|
-h, --help
|
||||||
Print help
|
Print help
|
||||||
|
|||||||
@@ -15,6 +15,11 @@ use strum::EnumString;
|
|||||||
#[serde(rename_all = "snake_case")]
|
#[serde(rename_all = "snake_case")]
|
||||||
pub enum AnimationPrefix {
|
pub enum AnimationPrefix {
|
||||||
Movement,
|
Movement,
|
||||||
|
Transparency,
|
||||||
|
/// A workspace sliding in and out of a monitor when it is switched to
|
||||||
Workspace,
|
Workspace,
|
||||||
// Note: Transparency is not supported on macOS as there's no equivalent to Win32 layered windows
|
}
|
||||||
|
|
||||||
|
pub fn new_animation_key(prefix: AnimationPrefix, key: String) -> String {
|
||||||
|
format!("{prefix}:{key}")
|
||||||
}
|
}
|
||||||
@@ -3239,15 +3239,9 @@
|
|||||||
{
|
{
|
||||||
"description": "Animation configuration prefixed for a specific animation kind",
|
"description": "Animation configuration prefixed for a specific animation kind",
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"additionalProperties": {
|
||||||
"movement": {
|
"type": "boolean"
|
||||||
"type": "boolean"
|
}
|
||||||
},
|
|
||||||
"workspace": {
|
|
||||||
"type": "boolean"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"additionalProperties": false
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Animation configuration for all animation kinds",
|
"description": "Animation configuration for all animation kinds",
|
||||||
@@ -3261,19 +3255,11 @@
|
|||||||
{
|
{
|
||||||
"description": "Animation configuration prefixed for a specific animation kind",
|
"description": "Animation configuration prefixed for a specific animation kind",
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"additionalProperties": {
|
||||||
"movement": {
|
"type": "integer",
|
||||||
"type": "integer",
|
"format": "uint64",
|
||||||
"format": "uint64",
|
"minimum": 0
|
||||||
"minimum": 0
|
}
|
||||||
},
|
|
||||||
"workspace": {
|
|
||||||
"type": "integer",
|
|
||||||
"format": "uint64",
|
|
||||||
"minimum": 0
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"additionalProperties": false
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Animation configuration for all animation kinds",
|
"description": "Animation configuration for all animation kinds",
|
||||||
@@ -3289,15 +3275,9 @@
|
|||||||
{
|
{
|
||||||
"description": "Animation configuration prefixed for a specific animation kind",
|
"description": "Animation configuration prefixed for a specific animation kind",
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"additionalProperties": {
|
||||||
"movement": {
|
"$ref": "#/$defs/AnimationStyle"
|
||||||
"$ref": "#/$defs/AnimationStyle"
|
}
|
||||||
},
|
|
||||||
"workspace": {
|
|
||||||
"$ref": "#/$defs/AnimationStyle"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"additionalProperties": false
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Animation configuration for all animation kinds",
|
"description": "Animation configuration for all animation kinds",
|
||||||
|
|||||||
Reference in new issue
Block a user