From b0683a461fcdb0060820c8d06178a0f075912efa Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 26 Nov 2018 11:46:33 +0100 Subject: [PATCH 1/4] Update tray icons for macos --- .../resources/images/system_tray_icon.png | Bin 1960 -> 730 bytes .../resources/images/system_tray_icon@2x.png | Bin 4566 -> 1513 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/desktop/src/main/resources/images/system_tray_icon.png b/desktop/src/main/resources/images/system_tray_icon.png index 3f1b6905ffec9179df10021dc84efa90a1fd4582..1f7cf9f17a0eee26bf34a2a4a571e6e10d291d0e 100644 GIT binary patch literal 730 zcmV<00ww*4P)6@FP4EdJT8W5-f`UR)2%<;|5y1qpv=j?L z3n9eLB7z8tL{tzAL5ZD8EL0E#Ekx}^3u9Ci-{K?w{^15E%YI*OFP}vq1OJm55Z^f1`L3GK=J=7ZLmKF!&PvL*lbX9nGa(hsCIK7>#lVL z4G=y`C_u%00yW!~xsW||1q@-I0x#W|Ujeg!6Q2$wbzswoRq}F?JR_FgmGjI&pABMu z-sODW0`y~`qSobONopIjJ@Hrk@WAb4>~%2j2EK}%3GTR9FLts#Aj22YUx7h4+z&dz z4q)4G1>5KU!e0ssi}uhH$UaawJIh)k`QkX5z>#%DNLD2fG&A>SgyTs9M|LkDc$Jcz z&)tZA7Vu~_Y`gMlmDP(Nd7$#ts*!0#+kqbHJxFR|-$+o^h8}DaHKFh=v6$EDF@+`8 z*>sYIKB^mF0bvB&~U&wWQJ!M&` zC$SaGN+F2-Kb(QU&V+GwU>wV_-39}_7hkWa9_n@wtLm;K`UCjYFp>tB*^aGOT5rM@ zH!gD#xC%Unib;~g%=QFk4>Im=*o5C0Fz?2H2Q0_*@nBvd_fmvNggP@P!7|`wJ&w+g z-PCK17jE00bOz433Z!-e^^f}?_T)B4+hY9&vz+Ktu5M|hMfG=bj)3vJS)~7y#hCgC z6)8r4Vm)957*onrsCKO%m(4(L(L$h=(aG08gT9*D{|{hNCf*AC1r)dfX{(TK?*IS* M07*qoM6N<$g1Bf$SO5S3 literal 1960 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 literal 4566 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 Date: Mon, 26 Nov 2018 11:56:47 +0100 Subject: [PATCH 2/4] Remove setting visiblity of a bound property --- .../java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java index 73cc823268..f78092b092 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java @@ -321,9 +321,6 @@ public class TakeOfferView extends ActivatableViewAndModel Date: Mon, 26 Nov 2018 16:02:32 +0100 Subject: [PATCH 3/4] Hide advanced options group immediately instead of animation --- .../java/bisq/desktop/main/offer/MutableOfferView.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java index 11d08d28cf..4d34ff0efb 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java @@ -404,13 +404,11 @@ public abstract class MutableOfferView extends tradeFeeInBtcToggle.setMouseTransparent(true); tradeFeeInBsqToggle.setMouseTransparent(true); - int delay = 500; - int diff = 100; + setDepositTitledGroupBg.setVisible(false); + setDepositTitledGroupBg.setManaged(false); - transitions.fadeOutAndRemove(setDepositTitledGroupBg, delay, (event) -> { - }); - delay -= diff; - transitions.fadeOutAndRemove(advancedOptionsBox, delay); + advancedOptionsBox.setVisible(false); + advancedOptionsBox.setManaged(false); model.onShowPayFundsScreen(); From 5f5f919ee08aaeddffcbe931adc9e5eeb3adc7df Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 26 Nov 2018 18:08:27 +0100 Subject: [PATCH 4/4] Remove unnecessary check --- .../java/bisq/desktop/main/offer/offerbook/OfferBookView.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java index 1a746a91b1..91d6cf7544 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java @@ -305,8 +305,7 @@ public class OfferBookView extends ActivatableViewAndModel