Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-23 06:14:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

add styling to number of offers in pulldown menus

Browse source
This commit is contained in:
woodser 2025-06-05 17:23:01 -04:00
parent 6a132b2daf
commit b3d6bc77ef
No known key found for this signature in database
GPG key ID: 55A10DD48ADEE5EF
2 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
desktop/src/main/java/haveno/desktop/haveno.css
View file

@ -1697,6 +1697,15 @@ textfield */
-fx-pref-height: 35px; -fx-pref-height: 35px;
} }
.offer-label {
-fx-background-color: rgb(50, 95, 182);
-fx-text-fill: white;
-fx-font-weight: normal;
-fx-background-radius: 999;
-fx-border-radius: 999;
-fx-padding: 0 6 0 6;
}
/* Offer */ /* Offer */
.percentage-label { .percentage-label {
-fx-alignment: center; -fx-alignment: center;

30
desktop/src/main/java/haveno/desktop/util/GUIUtil.java
View file

@ -149,10 +149,9 @@ public class GUIUtil {
public final static int NUM_DECIMALS_PRECISE = 7; public final static int NUM_DECIMALS_PRECISE = 7;
public final static int AMOUNT_DECIMALS_WITH_ZEROS = 3; public final static int AMOUNT_DECIMALS_WITH_ZEROS = 3;
public final static int AMOUNT_DECIMALS = 4; public final static int AMOUNT_DECIMALS = 4;
private final static String NUM_OFFERS_SPACING = " "; public static final double NUM_OFFERS_TRANSLATE_X = -13.0;
public static final boolean disablePaymentUriLabel = true; // universally disable payment uri labels, allowing bigger xmr logo overlays public static final boolean disablePaymentUriLabel = true; // universally disable payment uri labels, allowing bigger xmr logo overlays
private static Preferences preferences; private static Preferences preferences;
public static void setPreferences(Preferences preferences) { public static void setPreferences(Preferences preferences) {
@ -331,9 +330,11 @@ public class GUIUtil {
Label label2 = new AutoTooltipLabel(CurrencyUtil.isCryptoCurrency(code) ? item.tradeCurrency.getNameAndCode() : code); Label label2 = new AutoTooltipLabel(CurrencyUtil.isCryptoCurrency(code) ? item.tradeCurrency.getNameAndCode() : code);
label2.getStyleClass().add("currency-label"); label2.getStyleClass().add("currency-label");
Label label3 = new AutoTooltipLabel(CurrencyUtil.isCryptoCurrency(code) ? "" : item.tradeCurrency.getName()); Label label3 = new AutoTooltipLabel(CurrencyUtil.isCryptoCurrency(code) ? "" : item.tradeCurrency.getName());
label3.getStyleClass().add("currency-label"); if (!CurrencyUtil.isCryptoCurrency(code)) label3.getStyleClass().add("currency-label");
Label label4 = new AutoTooltipLabel();
box.getChildren().addAll(label1, label2, label3); box.getChildren().addAll(label1, label2, label3);
if (!CurrencyUtil.isCryptoCurrency(code)) box.getChildren().add(label4);
switch (code) { switch (code) {
case GUIUtil.SHOW_ALL_FLAG: case GUIUtil.SHOW_ALL_FLAG:
@ -353,11 +354,12 @@ public class GUIUtil {
label1.setGraphic(iconWrapper); label1.setGraphic(iconWrapper);
} }
if (preferences.isSortMarketCurrenciesNumerically()) { if (preferences.isSortMarketCurrenciesNumerically() && item.numTrades > 0) {
boolean isCrypto = CurrencyUtil.isCryptoCurrency(code); boolean isCrypto = CurrencyUtil.isCryptoCurrency(code);
Label offersTarget = isCrypto ? label2 : label3; Label offersTarget = isCrypto ? label3 : label4;
offersTarget.setText((!offersTarget.getText().isEmpty() ? offersTarget.getText() + NUM_OFFERS_SPACING : "") + "(" + item.numTrades + " " + HBox.setMargin(offersTarget, new Insets(0, 0, 0, NUM_OFFERS_TRANSLATE_X));
(item.numTrades == 1 ? postFixSingle : postFixMulti) + ")"); offersTarget.getStyleClass().add("offer-label");
offersTarget.setText(item.numTrades + " " + (item.numTrades == 1 ? postFixSingle : postFixMulti));
} }
} }
@ -460,13 +462,15 @@ public class GUIUtil {
HBox box = new HBox(); HBox box = new HBox();
box.setSpacing(20); box.setSpacing(20);
box.setAlignment(Pos.CENTER_LEFT);
Label label1 = new AutoTooltipLabel(getCurrencyType(item.getCode())); Label label1 = new AutoTooltipLabel(getCurrencyType(item.getCode()));
label1.getStyleClass().add("currency-label-small"); label1.getStyleClass().add("currency-label-small");
Label label2 = new AutoTooltipLabel(CurrencyUtil.isCryptoCurrency(code) ? item.getNameAndCode() : code); Label label2 = new AutoTooltipLabel(CurrencyUtil.isCryptoCurrency(code) ? item.getNameAndCode() : code);
label2.getStyleClass().add("currency-label"); label2.getStyleClass().add("currency-label");
Label label3 = new AutoTooltipLabel(CurrencyUtil.isCryptoCurrency(code) ? "" : item.getName()); Label label3 = new AutoTooltipLabel(CurrencyUtil.isCryptoCurrency(code) ? "" : item.getName());
label3.getStyleClass().add("currency-label"); if (!CurrencyUtil.isCryptoCurrency(code)) label3.getStyleClass().add("currency-label");
Label label4 = new AutoTooltipLabel();
Optional<Integer> offerCountOptional = Optional.ofNullable(offerCounts.get(code)); Optional<Integer> offerCountOptional = Optional.ofNullable(offerCounts.get(code));
@ -488,12 +492,16 @@ public class GUIUtil {
} }
boolean isCrypto = CurrencyUtil.isCryptoCurrency(code); boolean isCrypto = CurrencyUtil.isCryptoCurrency(code);
Label offersTarget = isCrypto ? label2 : label3; Label offersTarget = isCrypto ? label3 : label4;
offerCountOptional.ifPresent(numOffer -> offersTarget.setText((!offersTarget.getText().isEmpty() ? offersTarget.getText() + NUM_OFFERS_SPACING : "") + "(" + numOffer + " " + offerCountOptional.ifPresent(numOffers -> {
(numOffer == 1 ? postFixSingle : postFixMulti) + ")")); HBox.setMargin(offersTarget, new Insets(0, 0, 0, NUM_OFFERS_TRANSLATE_X));
offersTarget.getStyleClass().add("offer-label");
offersTarget.setText(numOffers + " " + (numOffers == 1 ? postFixSingle : postFixMulti));
});
} }
box.getChildren().addAll(label1, label2, label3); box.getChildren().addAll(label1, label2, label3);
if (!CurrencyUtil.isCryptoCurrency(code)) box.getChildren().add(label4);
setGraphic(box); setGraphic(box);