Skip to content

Commit 45e54b6

Browse files
authored
fix sorting of trigger price icon with open offer row (#1874)
1 parent 7fb7504 commit 45e54b6

File tree

1 file changed

+18
-22
lines changed

1 file changed

+18
-22
lines changed

desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.java

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,35 +1010,31 @@ private void setTriggerIconColumnCellFactory() {
10101010
@Override
10111011
public TableCell<OpenOfferListItem, OpenOfferListItem> call(TableColumn<OpenOfferListItem, OpenOfferListItem> column) {
10121012
return new TableCell<>() {
1013-
Button button;
1013+
private final Button button = getRegularIconButton(MaterialDesignIcon.SHIELD_HALF_FULL);
10141014

10151015
@Override
1016-
public void updateItem(final OpenOfferListItem item, boolean empty) {
1016+
protected void updateItem(final OpenOfferListItem item, boolean empty) {
10171017
super.updateItem(item, empty);
10181018

1019-
if (item != null && !empty) {
1020-
if (button == null) {
1021-
button = getRegularIconButton(MaterialDesignIcon.SHIELD_HALF_FULL);
1022-
boolean triggerPriceSet = item.getOpenOffer().getTriggerPrice() > 0;
1023-
button.setVisible(triggerPriceSet);
1019+
if (item == null || empty) {
1020+
setGraphic(null);
1021+
button.setOnAction(null);
1022+
return;
1023+
}
10241024

1025-
if (model.dataModel.isTriggered(item.getOpenOffer())) {
1026-
button.getGraphic().getStyleClass().add("warning");
1027-
button.setTooltip(new Tooltip(Res.get("openOffer.triggered")));
1028-
} else {
1029-
button.getGraphic().getStyleClass().remove("warning");
1030-
button.setTooltip(new Tooltip(Res.get("openOffer.triggerPrice", model.getTriggerPrice(item))));
1031-
}
1032-
setGraphic(button);
1033-
}
1034-
button.setOnAction(event -> onEditOpenOffer(item.getOpenOffer()));
1025+
boolean triggerPriceSet = item.getOpenOffer().getTriggerPrice() > 0;
1026+
button.setVisible(triggerPriceSet);
1027+
1028+
if (model.dataModel.isTriggered(item.getOpenOffer())) {
1029+
button.getGraphic().getStyleClass().add("warning");
1030+
button.setTooltip(new Tooltip(Res.get("openOffer.triggered")));
10351031
} else {
1036-
setGraphic(null);
1037-
if (button != null) {
1038-
button.setOnAction(null);
1039-
button = null;
1040-
}
1032+
button.getGraphic().getStyleClass().remove("warning");
1033+
button.setTooltip(new Tooltip(Res.get("openOffer.triggerPrice", model.getTriggerPrice(item))));
10411034
}
1035+
1036+
button.setOnAction(e -> onEditOpenOffer(item.getOpenOffer()));
1037+
setGraphic(button);
10421038
}
10431039
};
10441040
}

0 commit comments

Comments
 (0)