From 2cca6049be131b1c7606901d5a5103272cebf7c4 Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Tue, 25 Aug 2020 17:18:45 +0200
Subject: [PATCH] create installers, fix about border

---
 .github/workflows/package.yaml                             | 2 +-
 build.gradle                                               | 2 +-
 src/main/java/com/sparrowwallet/sparrow/AppController.java | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
index 0b4ab017..49b4773a 100644
--- a/.github/workflows/package.yaml
+++ b/.github/workflows/package.yaml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [windows-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v2
         with:
diff --git a/build.gradle b/build.gradle
index 464af3de..2dde4fb9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -137,7 +137,7 @@ jlink {
         imageName = "Sparrow"
         installerName = "Sparrow"
         appVersion = "${sparrowVersion}"
-        skipInstaller = true
+        skipInstaller = os.macOsX
         imageOptions = []
         installerOptions = [
                 '--file-associations', 'src/main/resources/associations.properties',
diff --git a/src/main/java/com/sparrowwallet/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java
index 37d39229..d26bd9a2 100644
--- a/src/main/java/com/sparrowwallet/sparrow/AppController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/AppController.java
@@ -336,7 +336,7 @@ public class AppController implements Initializable {
     }
 
     private void setOsxApplicationMenu() {
-        if(org.controlsfx.tools.Platform.getCurrent().getPlatformId().toLowerCase().equals("mac")) {
+        if(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.OSX) {
             MenuToolkit tk = MenuToolkit.toolkit();
             MenuItem preferences = new MenuItem("Preferences...");
             preferences.setOnAction(this::openPreferences);
@@ -364,7 +364,7 @@ public class AppController implements Initializable {
 
             Stage stage = new Stage();
             stage.setTitle("About " + MainApp.APP_NAME);
-            stage.initStyle(StageStyle.UNDECORATED);
+            stage.initStyle(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.OSX ? StageStyle.UNDECORATED : StageStyle.DECORATED);
             stage.setResizable(false);
             stage.setScene(new Scene(root));
             controller.setStage(stage);