From bc3aed4aeb1ffd3556c332e1ffeb2152f72b8c2b Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 10 Apr 2019 15:52:45 +0200 Subject: [PATCH 1/3] Adapt update popup to general information popup and darken blurred background for regular popups --- desktop/src/main/java/bisq/desktop/main/MainView.java | 2 +- .../windows/downloadupdate/DisplayUpdateDownloadWindow.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/MainView.java b/desktop/src/main/java/bisq/desktop/main/MainView.java index c71bdede63c..56916d51d12 100644 --- a/desktop/src/main/java/bisq/desktop/main/MainView.java +++ b/desktop/src/main/java/bisq/desktop/main/MainView.java @@ -122,7 +122,7 @@ public static void blur() { @SuppressWarnings("PointlessBooleanExpression") public static void blurLight() { - transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.1, false, 5); + transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.3, false, 5); } @SuppressWarnings("PointlessBooleanExpression") diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java index 4646e39969c..7e40953099a 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java @@ -90,8 +90,9 @@ public DisplayUpdateDownloadWindow(Alert alert) { public void show() { width = 968; // need to set headLine, otherwise the fields will not be created in addHeadLine - headLine = Res.get("displayUpdateDownloadWindow.headline"); createGridPane(); + information(""); // to set regular information styling + headLine = Res.get("displayUpdateDownloadWindow.headline"); addHeadLine(); addContent(); addButtons(); @@ -104,9 +105,6 @@ public void show() { /////////////////////////////////////////////////////////////////////////////////////////// private void addContent() { - headLine = "Important update information!"; - headLineLabel.getStyleClass().addAll("headline-label", "highlight"); - checkNotNull(alert, "alertMessage must not be null"); addMultilineLabel(gridPane, ++rowIndex, alert.getMessage(), 10); From 3a3a11ed26bd5bad2adcfb953bb95448e9a7fb1d Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 10 Apr 2019 16:15:03 +0200 Subject: [PATCH 2/3] Make blurred background even darker based on #2337. --- desktop/src/main/java/bisq/desktop/main/MainView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/MainView.java b/desktop/src/main/java/bisq/desktop/main/MainView.java index 56916d51d12..63cfa4c21eb 100644 --- a/desktop/src/main/java/bisq/desktop/main/MainView.java +++ b/desktop/src/main/java/bisq/desktop/main/MainView.java @@ -122,12 +122,12 @@ public static void blur() { @SuppressWarnings("PointlessBooleanExpression") public static void blurLight() { - transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.3, false, 5); + transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.8, false, 5); } @SuppressWarnings("PointlessBooleanExpression") public static void blurUltraLight() { - transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.1, false, 2); + transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.8, false, 2); } @SuppressWarnings("PointlessBooleanExpression") From bbfe663f5225fccfe87bacee1280dd161d0ce012 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 10 Apr 2019 16:38:25 +0200 Subject: [PATCH 3/3] Darken background less, to feel less dark. --- desktop/src/main/java/bisq/desktop/main/MainView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/MainView.java b/desktop/src/main/java/bisq/desktop/main/MainView.java index 63cfa4c21eb..c43ba6d11a2 100644 --- a/desktop/src/main/java/bisq/desktop/main/MainView.java +++ b/desktop/src/main/java/bisq/desktop/main/MainView.java @@ -122,12 +122,12 @@ public static void blur() { @SuppressWarnings("PointlessBooleanExpression") public static void blurLight() { - transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.8, false, 5); + transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.6, false, 5); } @SuppressWarnings("PointlessBooleanExpression") public static void blurUltraLight() { - transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.8, false, 2); + transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.6, false, 2); } @SuppressWarnings("PointlessBooleanExpression")