diff --git a/app/src/main/java/io/xpipe/app/util/DesktopShortcuts.java b/app/src/main/java/io/xpipe/app/util/DesktopShortcuts.java index 569e8dd47..f82c218aa 100644 --- a/app/src/main/java/io/xpipe/app/util/DesktopShortcuts.java +++ b/app/src/main/java/io/xpipe/app/util/DesktopShortcuts.java @@ -53,6 +53,7 @@ public class DesktopShortcuts { private static Path createMacOSShortcut(String executable, String args, String name) throws Exception { var icon = XPipeInstallation.getLocalDefaultInstallationIcon(); + var assets = icon.getParent().resolve("Assets.car"); var base = DesktopHelper.getDesktopDirectory().resolve(name + ".app"); var content = String.format( """ @@ -79,12 +80,15 @@ public class DesktopShortcuts { + CFBundleIconName + xpipe CFBundleIconFile - icon.icns + xpipe """); - pc.executeSimpleCommand("cp \"" + icon + "\" \"" + base + "/Contents/Resources/icon.icns\""); + pc.command("cp \"" + icon + "\" \"" + base + "/Contents/Resources/xpipe.icns\"").execute(); + pc.command("cp \"" + assets + "\" \"" + base + "/Contents/Resources/Assets.car\"").execute(); } return base; } diff --git a/app/src/main/resources/io/xpipe/app/resources/theme/cupertinoDark.css b/app/src/main/resources/io/xpipe/app/resources/theme/cupertinoDark.css index 29a880a7d..68a5846d6 100644 --- a/app/src/main/resources/io/xpipe/app/resources/theme/cupertinoDark.css +++ b/app/src/main/resources/io/xpipe/app/resources/theme/cupertinoDark.css @@ -1,6 +1,6 @@ .root:windows { -color-bg-default-transparent: #1C1C1ED5; } -.root:macos { -color-bg-default-transparent: #0d0d10D6; } +.root:macos { -color-bg-default-transparent: #0d0d10E6; } .root .button, .root .toggle-button { -fx-effect: NONE; diff --git a/app/src/main/resources/io/xpipe/app/resources/theme/cupertinoLight.css b/app/src/main/resources/io/xpipe/app/resources/theme/cupertinoLight.css index 0136d5a50..155ad3af7 100644 --- a/app/src/main/resources/io/xpipe/app/resources/theme/cupertinoLight.css +++ b/app/src/main/resources/io/xpipe/app/resources/theme/cupertinoLight.css @@ -1,4 +1,6 @@ -.root { -color-bg-default-transparent: #FFFFFFAF; } +.root:windows { -color-bg-default-transparent: #FFFFFFAF; } + +.root:macos { -color-bg-default-transparent: #FFFFFFBF; } .root .button, .root .toggle-button { -fx-effect: NONE; diff --git a/app/src/main/resources/io/xpipe/app/resources/theme/dark.css b/app/src/main/resources/io/xpipe/app/resources/theme/dark.css index da6d1dd08..6a33a2ae9 100644 --- a/app/src/main/resources/io/xpipe/app/resources/theme/dark.css +++ b/app/src/main/resources/io/xpipe/app/resources/theme/dark.css @@ -1,6 +1,6 @@ .root:windows { -color-bg-default-transparent: #0d1117c3; } -.root:macos { -color-bg-default-transparent: #080d13d3; } +.root:macos { -color-bg-default-transparent: #080d13e3; } .root .table-view { -color-cell-bg-odd: derive(-color-bg-subtle, -45%); diff --git a/app/src/main/resources/io/xpipe/app/resources/theme/dracula.css b/app/src/main/resources/io/xpipe/app/resources/theme/dracula.css index 345f9bf25..3f8e23a36 100644 --- a/app/src/main/resources/io/xpipe/app/resources/theme/dracula.css +++ b/app/src/main/resources/io/xpipe/app/resources/theme/dracula.css @@ -1,6 +1,6 @@ .root:windows { -color-bg-default-transparent: #282a36c2; } -.root:macos { -color-bg-default-transparent: #20212cD3; } +.root:macos { -color-bg-default-transparent: #20212ce3; } .root .table-view { -color-cell-bg-odd: derive(-color-bg-subtle, -35%); diff --git a/app/src/main/resources/io/xpipe/app/resources/theme/light.css b/app/src/main/resources/io/xpipe/app/resources/theme/light.css index 8568c7c9b..bd79f1e25 100644 --- a/app/src/main/resources/io/xpipe/app/resources/theme/light.css +++ b/app/src/main/resources/io/xpipe/app/resources/theme/light.css @@ -1,4 +1,6 @@ -.root { -color-bg-default-transparent: #FFFFFFAF; } +.root:windows { -color-bg-default-transparent: #FFFFFFAF; } + +.root:macos { -color-bg-default-transparent: #FFFFFFBF; } .root .table-view { -color-cell-bg-odd: derive(-color-bg-subtle, 35%); diff --git a/app/src/main/resources/io/xpipe/app/resources/theme/mocha.css b/app/src/main/resources/io/xpipe/app/resources/theme/mocha.css index b8cd7d96a..1a944f84c 100644 --- a/app/src/main/resources/io/xpipe/app/resources/theme/mocha.css +++ b/app/src/main/resources/io/xpipe/app/resources/theme/mocha.css @@ -87,7 +87,7 @@ -fx-background-color: -color-bg-default; } -.root:macos { -color-bg-default-transparent: #13171dd2; } +.root:macos { -color-bg-default-transparent: #13171de6; } .root:windows { -color-bg-default-transparent: #191c23b8; } diff --git a/app/src/main/resources/io/xpipe/app/resources/theme/nordDark.css b/app/src/main/resources/io/xpipe/app/resources/theme/nordDark.css index 95e8fd47f..24bcd6206 100644 --- a/app/src/main/resources/io/xpipe/app/resources/theme/nordDark.css +++ b/app/src/main/resources/io/xpipe/app/resources/theme/nordDark.css @@ -1,4 +1,4 @@ -.root:macos { -color-bg-default-transparent: #2E3440d2; } +.root:macos { -color-bg-default-transparent: #2E3440e6; } .root:windows { -color-bg-default-transparent: #2E3440c0; }