Rework

app/src/main/java/io/xpipe/app/core/window/ModifiedStage.java

@@ -20,7 +20,7 @@ import org.apache.commons.lang3.SystemUtils;
 public class ModifiedStage extends Stage {
 
     public static boolean mergeFrame() {
-        return SystemUtils.IS_OS_WINDOWS_11;
+        return SystemUtils.IS_OS_WINDOWS_11 || SystemUtils.IS_OS_MAC;
     }
 
     @SneakyThrows
@@ -62,24 +62,37 @@ public class ModifiedStage extends Stage {
             return;
         }
 
-        if (OsType.getLocal() != OsType.WINDOWS || AppPrefs.get() == null || AppPrefs.get().theme.getValue() == null) {
+        if (OsType.getLocal() == OsType.LINUX || AppPrefs.get() == null || AppPrefs.get().theme.getValue() == null) {
             stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("seamless-frame"), false);
             stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("separate-frame"), true);
             return;
         }
 
-        var ctrl = new NativeWinWindowControl(stage);
+        switch (OsType.getLocal()) {
-        ctrl.setWindowAttribute(
+            case OsType.Linux linux -> {
-                NativeWinWindowControl.DmwaWindowAttribute.DWMWA_USE_IMMERSIVE_DARK_MODE.get(),
+            }
-                AppPrefs.get().theme.getValue().isDark());
+            case OsType.MacOs macOs -> {
-        boolean seamlessFrame;
+                var ctrl = new NativeMacOsWindowControl(stage);
-        if (AppPrefs.get().performanceMode().get() || !mergeFrame()) {
+                ctrl.setWindowDarkMode(AppPrefs.get().theme.getValue().isDark());
-            seamlessFrame = false;
+                var seamlessFrame = !AppPrefs.get().performanceMode().get() && mergeFrame();
-        } else {
+                stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("seamless-frame"), seamlessFrame);
-            seamlessFrame = ctrl.setWindowBackdrop(NativeWinWindowControl.DwmSystemBackDropType.MICA_ALT);
+                stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("separate-frame"), !seamlessFrame);
+            }
+            case OsType.Windows windows -> {
+                var ctrl = new NativeWinWindowControl(stage);
+                ctrl.setWindowAttribute(
+                        NativeWinWindowControl.DmwaWindowAttribute.DWMWA_USE_IMMERSIVE_DARK_MODE.get(),
+                        AppPrefs.get().theme.getValue().isDark());
+                boolean seamlessFrame;
+                if (AppPrefs.get().performanceMode().get() || !mergeFrame()) {
+                    seamlessFrame = false;
+                } else {
+                    seamlessFrame = ctrl.setWindowBackdrop(NativeWinWindowControl.DwmSystemBackDropType.MICA_ALT);
+                }
+                stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("seamless-frame"), seamlessFrame);
+                stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("separate-frame"), !seamlessFrame);
+            }
         }
-        stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("seamless-frame"), seamlessFrame);
-        stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("separate-frame"), !seamlessFrame);
     }
 
     private static void updateStage(Stage stage) {

app/src/main/java/io/xpipe/app/core/window/NativeMacOsWindowControl.java

@@ -0,0 +1,38 @@
+package io.xpipe.app.core.window;
+
+import com.sun.jna.NativeLong;
+import io.xpipe.app.util.NativeBridge;
+import io.xpipe.core.util.ModuleHelper;
+import javafx.stage.Window;
+import lombok.Getter;
+import lombok.SneakyThrows;
+
+import java.lang.reflect.Method;
+
+@Getter
+public class NativeMacOsWindowControl {
+
+    private final long nsWindow;
+
+    @SneakyThrows
+    public NativeMacOsWindowControl(Window stage) {
+        Method tkStageGetter = Window.class.getDeclaredMethod("getPeer");
+        tkStageGetter.setAccessible(true);
+        Object tkStage = tkStageGetter.invoke(stage);
+        Method getPlatformWindow = tkStage.getClass().getDeclaredMethod("getPlatformWindow");
+        getPlatformWindow.setAccessible(true);
+        Object platformWindow = getPlatformWindow.invoke(tkStage);
+        Method getNativeHandle = platformWindow.getClass().getMethod("getNativeHandle");
+        getNativeHandle.setAccessible(true);
+        Object nativeHandle = getNativeHandle.invoke(platformWindow);
+        this.nsWindow = (long) nativeHandle;
+    }
+
+    public void setWindowDarkMode(boolean darkMode) {
+        if (!ModuleHelper.isImage()) {
+            return;
+        }
+
+        NativeBridge.MacOsLibrary.INSTANCE.setAppearance(new NativeLong(nsWindow), darkMode);
+    }
+}

app/src/main/java/io/xpipe/app/util/NativeBridge.java

@@ -0,0 +1,18 @@
+package io.xpipe.app.util;
+
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+import com.sun.jna.NativeLong;
+import io.xpipe.app.issue.ErrorEvent;
+
+import java.util.Map;
+
+public class NativeBridge {
+
+    public static interface MacOsLibrary extends Library {
+
+        public static MacOsLibrary INSTANCE = Native.load("xpipe_bridge", MacOsLibrary.class, Map.of());
+
+        public abstract void setAppearance(NativeLong window, boolean dark);
+    }
+}

app/src/main/resources/io/xpipe/app/resources/style/style.css

@@ -9,6 +9,10 @@
     -fx-background-color: transparent;
 }
 
+.root:seamless-frame {
+    -fx-padding: 0 0 27 0;
+}
+
 .root:dark:separate-frame .background {
     -fx-background-color: derive(-color-bg-default, 1%);
 }

dist/base.gradle

@@ -229,6 +229,18 @@ if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
                     commandLine "$projectDir/misc/mac/sign_and_notarize.sh", "$projectDir", rootProject.arch.toString(), rootProject.productName
                 }
             }
+
+            if (fullVersion) {
+                def nativeLib = "$projectDir/native_lib/macos"
+                def proj = "$nativeLib/xpipe_bridge.xcodeproj"
+                exec {
+                    commandLine 'xcodebuild', proj, '-scheme', 'xpipe_bridge', "CONFIGURATION_BUILD_DIR=${project.getLayout().getBuildDirectory().dir("native_lib")}", 'build'
+                }
+                copy {
+                    from project.getLayout().getBuildDirectory().dir("native_lib").get().file('xpipe_bridge.dylib')
+                    into "$distDir/$app/Contents/runtime/Contents/Home/bin/"
+                }
+            }
         }
     }
 }