Always show 'Go to offer' button and add delay to highlight

bisq-network · Dec 4, 2024 · 61faf15 · 61faf15
1 parent 13c6d6d
commit 61faf15
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/.../main/java/bisq/desktop/main/content/bisq_easy/offerbook/BisqEasyOfferbookController.java b/.../main/java/bisq/desktop/main/content/bisq_easy/offerbook/BisqEasyOfferbookController.java
@@ -36,6 +36,7 @@
 import bisq.common.proto.ProtobufUtils;
 import bisq.desktop.ServiceProvider;
 import bisq.desktop.common.observable.FxBindings;
+import bisq.desktop.common.threading.UIScheduler;
 import bisq.desktop.common.threading.UIThread;
 import bisq.desktop.common.view.InitWithDataController;
 import bisq.desktop.common.view.Navigation;
@@ -121,7 +122,7 @@ public void initWithData(InitData initData) {
         BisqEasyOfferbookMessage chatMessage = initData.getChatMessage();
         bisqEasyOfferbookChannelService.findChannel(chatMessage.getChannelId()).ifPresent(channel -> {
             maybeUpdateSelectedChannel(channel);
-            chatMessageContainerController.highlightOfferChatMessage(initData.getChatMessage());
+            UIScheduler.run(() -> chatMessageContainerController.highlightOfferChatMessage(initData.getChatMessage())).after(110);
         });
     }
 

diff --git a/...c/main/java/bisq/desktop/main/content/user/profile_card/offers/ProfileCardOffersView.java b/...c/main/java/bisq/desktop/main/content/user/profile_card/offers/ProfileCardOffersView.java
@@ -37,13 +37,10 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableRow;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.util.Callback;
 import lombok.extern.slf4j.Slf4j;
-import org.fxmisc.easybind.EasyBind;
-import org.fxmisc.easybind.Subscription;
 
 import java.util.Comparator;
 
@@ -232,7 +229,6 @@ TableCell<OfferbookListItem, OfferbookListItem>> getGotToOfferCellFactory() {
         return column -> new TableCell<>() {
             private final BisqMenuItem goToOfferButton = new BisqMenuItem(
                     Res.get("user.profileCard.offers.table.columns.goToOffer.button"));
-            private Subscription selectedPin, hoverPin;
 
             {
                 goToOfferButton.setStyle("-fx-text-fill: -fx-mid-text-color;");
@@ -244,13 +240,6 @@ protected void updateItem(OfferbookListItem item, boolean empty) {
                 super.updateItem(item, empty);
 
                 if (item != null && !empty) {
-                    TableRow<OfferbookListItem> tableRow = getTableRow();
-                    if (tableRow != null) {
-                        selectedPin = EasyBind.subscribe(tableRow.selectedProperty(), isSelected ->
-                            goToOfferButton.setVisible(isSelected || tableRow.isHover()));
-                        hoverPin = EasyBind.subscribe(tableRow.hoverProperty(), isHover ->
-                            goToOfferButton.setVisible(isHover || tableRow.isSelected()));
-                    }
                     goToOfferButton.setOnAction(e ->
                         OverlayController.hide(() ->
                             Navigation.navigateTo(NavigationTarget.BISQ_EASY_OFFERBOOK,
@@ -260,13 +249,6 @@ protected void updateItem(OfferbookListItem item, boolean empty) {
                     goToOfferButton.setOnMouseExited(e -> goToOfferButton.setStyle("-fx-text-fill: -fx-mid-text-color;"));
                     setGraphic(goToOfferButton);
                 } else {
-                    if (selectedPin != null) {
-                        selectedPin.unsubscribe();
-                    }
-                    if (hoverPin != null) {
-                        hoverPin.unsubscribe();
-                    }
-                    goToOfferButton.setVisible(false);
                     goToOfferButton.setOnAction(null);
                     goToOfferButton.setOnMouseEntered(null);
                     goToOfferButton.setOnMouseClicked(null);