diff --git a/.gitignore b/.gitignore index 2686b7cb..d3dd278b 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ yarn-error.log* # Turbo .turbo +/.vs diff --git a/packages/client-api/src/providers/komorebi/create-komorebi-provider.ts b/packages/client-api/src/providers/komorebi/create-komorebi-provider.ts index 4d4c8bbf..b17b67ec 100644 --- a/packages/client-api/src/providers/komorebi/create-komorebi-provider.ts +++ b/packages/client-api/src/providers/komorebi/create-komorebi-provider.ts @@ -99,6 +99,7 @@ export type KomorebiLayout = | 'ultrawide_vertical_stack' | 'rows' | 'grid' + | 'right_main_vertical_stack' | 'custom'; export type KomorebiLayoutFlip = diff --git a/packages/desktop/Cargo.toml b/packages/desktop/Cargo.toml index 36454774..5d8547bc 100644 --- a/packages/desktop/Cargo.toml +++ b/packages/desktop/Cargo.toml @@ -33,7 +33,7 @@ netdev = "0.24" regex = "1" [target.'cfg(all(target_os = "windows", target_arch = "x86_64"))'.dependencies] -komorebi-client = { git = "https://github.com/LGUG2Z/komorebi", tag = "v0.1.23" } +komorebi-client = { git = "https://github.com/LGUG2Z/komorebi", tag = "v0.1.26" } [target.'cfg(target_os = "macos")'.dependencies] cocoa = "0.25" diff --git a/packages/desktop/src/providers/komorebi/provider.rs b/packages/desktop/src/providers/komorebi/provider.rs index 0ee2ffeb..b3126d16 100644 --- a/packages/desktop/src/providers/komorebi/provider.rs +++ b/packages/desktop/src/providers/komorebi/provider.rs @@ -59,7 +59,7 @@ impl KomorebiProvider { KomorebiMonitor { id: monitor.id(), name: monitor.name().to_string(), - device_id: monitor.device_id().clone(), + device_id: Some(monitor.device_id().clone()), focused_workspace_index: monitor.focused_workspace_idx(), size: *monitor.size(), work_area_size: *monitor.work_area_size(), diff --git a/packages/desktop/src/providers/komorebi/variables.rs b/packages/desktop/src/providers/komorebi/variables.rs index 64555ee3..53d81a06 100644 --- a/packages/desktop/src/providers/komorebi/variables.rs +++ b/packages/desktop/src/providers/komorebi/variables.rs @@ -62,6 +62,7 @@ pub enum KomorebiLayout { UltrawideVerticalStack, Rows, Grid, + RightMainVerticalStack, Custom, } @@ -78,6 +79,7 @@ impl From for KomorebiLayout { KomorebiLayout::UltrawideVerticalStack } DefaultLayout::Grid => KomorebiLayout::Grid, + DefaultLayout::RightMainVerticalStack => KomorebiLayout::RightMainVerticalStack, }, _ => KomorebiLayout::Custom, }