sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 05:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

create installers, fix about border

Browse source
This commit is contained in:
Craig Raw 2020-08-25 17:18:45 +02:00
parent 5be1f066df
commit 2cca6049be
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/package.yaml vendored
View file

@ -7,7 +7,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [macos-latest, windows-latest, ubuntu-latest] os: [windows-latest, ubuntu-latest]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

2
build.gradle
View file

@ -137,7 +137,7 @@ jlink {
imageName = "Sparrow" imageName = "Sparrow"
installerName = "Sparrow" installerName = "Sparrow"
appVersion = "${sparrowVersion}" appVersion = "${sparrowVersion}"
skipInstaller = true skipInstaller = os.macOsX
imageOptions = [] imageOptions = []
installerOptions = [ installerOptions = [
'--file-associations', 'src/main/resources/associations.properties', '--file-associations', 'src/main/resources/associations.properties',

4
src/main/java/com/sparrowwallet/sparrow/AppController.java
View file

@ -336,7 +336,7 @@ public class AppController implements Initializable {
} }
private void setOsxApplicationMenu() { 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(); MenuToolkit tk = MenuToolkit.toolkit();
MenuItem preferences = new MenuItem("Preferences..."); MenuItem preferences = new MenuItem("Preferences...");
preferences.setOnAction(this::openPreferences); preferences.setOnAction(this::openPreferences);
@ -364,7 +364,7 @@ public class AppController implements Initializable {
Stage stage = new Stage(); Stage stage = new Stage();
stage.setTitle("About " + MainApp.APP_NAME); 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.setResizable(false);
stage.setScene(new Scene(root)); stage.setScene(new Scene(root));
controller.setStage(stage); controller.setStage(stage);