feat: improvements to appbar implementation (#150)

packages/client-api/src/config/dock-config.ts

@@ -0,0 +1,5 @@
+export type DockConfig = {
+  enabled: boolean;
+  edge: 'top' | 'bottom' | 'left' | 'right' | null;
+  windowMargin: string;
+};

packages/client-api/src/config/index.ts

@@ -1,5 +1,5 @@
 export * from './monitor-selection';
-export * from './reserve-space-config';
+export * from './dock-config';
 export * from './widget-config';
 export * from './widget-placement';
 export * from './widget-preset';

packages/client-api/src/config/widget-placement.ts

@@ -1,5 +1,5 @@
 import type { MonitorSelection } from './monitor-selection';
-import type { ReserveSpaceConfig } from './reserve-space-config';
+import type { DockConfig } from './dock-config';
 
 export type WidgetPlacement = {
   anchor:
@@ -15,5 +15,5 @@ export type WidgetPlacement = {
   width: string;
   height: string;
   monitorSelection: MonitorSelection;
-  reserveSpace: ReserveSpaceConfig;
+  dockToEdge: DockConfig;
 };

packages/desktop/src/commands.rs

@@ -2,8 +2,11 @@ use std::{collections::HashMap, path::PathBuf, sync::Arc};
 
 use tauri::{State, Window};
 
+#[cfg(target_os = "macos")]
+use crate::common::macos::WindowExtMacOs;
+#[cfg(target_os = "windows")]
+use crate::common::windows::WindowExtWindows;
 use crate::{
-  common::WindowExt,
   config::{Config, WidgetConfig, WidgetPlacement},
   providers::{ProviderConfig, ProviderManager},
   widget_factory::{WidgetFactory, WidgetOpenOptions, WidgetState},

packages/desktop/src/common/length_value.rs

@@ -96,3 +96,12 @@ impl<'de> Deserialize<'de> for LengthValue {
     LengthValue::from_str(&s).map_err(serde::de::Error::custom)
   }
 }
+
+impl Default for LengthValue {
+  fn default() -> Self {
+    Self {
+      amount: 0.,
+      unit: LengthUnit::Pixel,
+    }
+  }
+}

packages/desktop/src/common/macos/mod.rs

@@ -0,0 +1,3 @@
+mod window_ext_macos;
+
+pub use window_ext_macos::*;

packages/desktop/src/common/macos/window_ext_macos.rs

@@ -0,0 +1,27 @@
+use anyhow::Context;
+use cocoa::{
+  appkit::{NSMainMenuWindowLevel, NSWindow},
+  base::id,
+};
+use tauri::{Runtime, Window};
+
+pub trait WindowExtMacOs {
+  fn set_above_menu_bar(&self) -> anyhow::Result<()>;
+}
+
+impl<R: Runtime> WindowExtMacOs for Window<R> {
+  fn set_above_menu_bar(&self) -> anyhow::Result<()> {
+    let ns_win =
+      self.ns_window().context("Failed to get window handle.")? as id;
+
+    unsafe {
+      ns_win.setLevel_(
+        ((NSMainMenuWindowLevel + 1) as u64)
+          .try_into()
+          .context("Failed to cast `NSMainMenuWindowLevel`.")?,
+      );
+    }
+
+    Ok(())
+  }
+}

packages/desktop/src/common/mod.rs

@@ -1,15 +1,13 @@
-#[cfg(target_os = "windows")]
-mod app_bar;
 mod format_bytes;
 mod fs_util;
 mod length_value;
+#[cfg(target_os = "macos")]
+pub mod macos;
 mod path_ext;
-mod window_ext;
-
 #[cfg(target_os = "windows")]
-pub use app_bar::remove_app_bar;
+pub mod windows;
+
 pub use format_bytes::*;
 pub use fs_util::*;
 pub use length_value::*;
 pub use path_ext::*;
-pub use window_ext::*;