From 137623bfd673d48ffe7e4de2750c384123e6cd7e Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 5 Sep 2018 18:31:49 +0200 Subject: [PATCH] Fix rebase errors --- desktop/build.gradle | 2 +- .../components/JFXRadioButtonSkinBisqStyle.java | 4 ++-- .../src}/main/resources/images/nav/nav-selected.png | Bin .../main/resources/images/nav/nav-selected@2x.png | Bin 4 files changed, 3 insertions(+), 3 deletions(-) rename {src => desktop/src}/main/java/bisq/desktop/components/JFXRadioButtonSkinBisqStyle.java (99%) rename {src => desktop/src}/main/resources/images/nav/nav-selected.png (100%) rename {src => desktop/src}/main/resources/images/nav/nav-selected@2x.png (100%) diff --git a/desktop/build.gradle b/desktop/build.gradle index 5480cb388e..3f6bdb4de8 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -55,7 +55,7 @@ dependencies { compile 'de.jensd:fontawesomefx-materialdesignfont:2.0.26-9.1.2' compile 'com.googlecode.jcsv:jcsv:1.4.0' compile 'com.github.sarxos:webcam-capture:0.3.12' - + compile 'com.jfoenix:jfoenix:8.0.7' compileOnly 'org.projectlombok:lombok:1.18.2' annotationProcessor 'org.projectlombok:lombok:1.18.2' diff --git a/src/main/java/bisq/desktop/components/JFXRadioButtonSkinBisqStyle.java b/desktop/src/main/java/bisq/desktop/components/JFXRadioButtonSkinBisqStyle.java similarity index 99% rename from src/main/java/bisq/desktop/components/JFXRadioButtonSkinBisqStyle.java rename to desktop/src/main/java/bisq/desktop/components/JFXRadioButtonSkinBisqStyle.java index fc0cfab245..fa478c8d36 100644 --- a/src/main/java/bisq/desktop/components/JFXRadioButtonSkinBisqStyle.java +++ b/desktop/src/main/java/bisq/desktop/components/JFXRadioButtonSkinBisqStyle.java @@ -54,7 +54,7 @@ public class JFXRadioButtonSkinBisqStyle extends RadioButtonSkin { public JFXRadioButtonSkinBisqStyle(JFXRadioButton control) { super(control); - final double radioRadius = 8; + final double radioRadius = 7; radio = new Circle(radioRadius); radio.getStyleClass().setAll("radio"); radio.setStrokeWidth(1); @@ -200,7 +200,7 @@ public class JFXRadioButtonSkinBisqStyle extends RadioButtonSkin { final double labelHeight = Math.min(radioButton.prefHeight(labelWidth), h); final double maxHeight = Math.max(contHeight, labelHeight); final double xOffset = computeXOffset(w, labelWidth + contWidth, radioButton.getAlignment().getHpos()) + x; - final double yOffset = computeYOffset(h, maxHeight, radioButton.getAlignment().getVpos()) + x; + final double yOffset = computeYOffset(h, maxHeight, radioButton.getAlignment().getVpos()) + x + 5; layoutLabelInArea(xOffset + contWidth + padding/3, yOffset, labelWidth, maxHeight, radioButton.getAlignment()); ((Text) getChildren().get((getChildren().get(0) instanceof Text) ? 0 : 1)). diff --git a/src/main/resources/images/nav/nav-selected.png b/desktop/src/main/resources/images/nav/nav-selected.png similarity index 100% rename from src/main/resources/images/nav/nav-selected.png rename to desktop/src/main/resources/images/nav/nav-selected.png diff --git a/src/main/resources/images/nav/nav-selected@2x.png b/desktop/src/main/resources/images/nav/nav-selected@2x.png similarity index 100% rename from src/main/resources/images/nav/nav-selected@2x.png rename to desktop/src/main/resources/images/nav/nav-selected@2x.png