bisq-network · alejandrogarcia83 · Nov 29, 2022 · Nov 21, 2022
diff --git a/desktop/src/main/java/bisq/desktop/components/BisqScrollPane.java b/desktop/src/main/java/bisq/desktop/components/BisqScrollPane.java
@@ -0,0 +1,72 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.desktop.components;
+
+import bisq.common.util.Utilities;
+
+import javafx.scene.Node;
+import javafx.scene.control.ScrollPane;
+
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+
+/**
+ * Custom scroll pane that uses a workaround to fix slow vertical scrolling.
+ */
+public class BisqScrollPane extends ScrollPane {
+
+    private final double BASE_DELTA_Y_MULTIPLIER = 0.8;
+    private double deltaYMultiplier = BASE_DELTA_Y_MULTIPLIER;
+
+    public BisqScrollPane() {
+        super();
+        if (Utilities.isLinux() || Utilities.isWindows()) {
+            if (getContent() == null) {
+                contentProperty().addListener(new ChangeListener<>() {
+                    @Override
+                    public void changed(ObservableValue<? extends Node> o, Node oldVal, Node newVal) {
+                        contentProperty().removeListener(this);
+                        changeScrollingSpeed();
+                    }
+                });
+            } else {
+                changeScrollingSpeed();
+            }
+        }
+    }
+
+    private void changeScrollingSpeed() {
+        getContent().setOnScroll(scrollEvent -> {
+            double deltaY = scrollEvent.getDeltaY() * deltaYMultiplier;
+            double fullHeight = getContent().getBoundsInLocal().getHeight();
+            double visibleHeight = getBoundsInLocal().getHeight();
+            double heightDiff = fullHeight - visibleHeight;
+            double diff = heightDiff > 1 ? heightDiff : 1;
+            setVvalue(getVvalue() - deltaY / diff);
+        });
+    }
+
+    /**
+     * Sets the vertical scroll amount's multiplier. Any value below BASE_DELTA_Y_MULTIPLIER
+     * will decrease the scrolling speed whereas any value above will accelerate it.
+     * @param deltaYMultiplier the value by which deltaY will be multiplied
+     */
+    public void setDeltaYMultiplier(double deltaYMultiplier) {
+        this.deltaYMultiplier = deltaYMultiplier;
+    }
+}
diff --git a/desktop/src/main/java/bisq/desktop/main/account/AccountView.fxml b/desktop/src/main/java/bisq/desktop/main/account/AccountView.fxml
@@ -18,41 +18,41 @@
   -->
 
 <?import com.jfoenix.controls.JFXTabPane?>
-<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.control.Tab?>
 <?import javafx.scene.layout.AnchorPane?>
+<?import bisq.desktop.components.BisqScrollPane?>
 <JFXTabPane fx:id="root" fx:controller="bisq.desktop.main.account.AccountView"
             prefHeight="630.0" prefWidth="1000.0"
             AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
             AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
             xmlns:fx="http://javafx.com/fxml">
     <Tab fx:id="fiatAccountsTab" closable="false">
-        <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
-                    fitToHeight="true"
-                    AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
-                    AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
+        <BisqScrollPane fitToWidth="true" hbarPolicy="NEVER"
+                        fitToHeight="true"
+                        AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
+                        AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
     </Tab>
     <Tab fx:id="altcoinAccountsTab" closable="false">
-        <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
-                    fitToHeight="true"
-                    AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
-                    AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
+        <BisqScrollPane fitToWidth="true" hbarPolicy="NEVER"
+                        fitToHeight="true"
+                        AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
+                        AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
     </Tab>
     <Tab fx:id="notificationTab" closable="false">
-        <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
-                    AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
-                    AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
+        <BisqScrollPane fitToWidth="true" hbarPolicy="NEVER"
+                        AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
+                        AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
     </Tab>
     <Tab fx:id="passwordTab" closable="false"/>
     <Tab fx:id="seedWordsTab" closable="false">
-        <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
-                    AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
-                    AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
+        <BisqScrollPane fitToWidth="true" hbarPolicy="NEVER"
+                        AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
+                        AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
     </Tab>
     <Tab fx:id="walletInfoTab" closable="false">
-        <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
-                    AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
-                    AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
+        <BisqScrollPane fitToWidth="true" hbarPolicy="NEVER"
+                        AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
+                        AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
     </Tab>
     <Tab fx:id="backupTab" closable="false"/>
 

diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingView.fxml b/desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingView.fxml
@@ -17,22 +17,22 @@
   ~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
+<?import bisq.desktop.components.BisqScrollPane?>
 <AnchorPane fx:id="root" fx:controller="bisq.desktop.main.dao.bonding.BondingView"
             xmlns:fx="http://javafx.com/fxml">
 
     <VBox fx:id="leftVBox" prefWidth="240" spacing="5" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="15"
           AnchorPane.topAnchor="15"/>
 
-    <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
-                fitToHeight="true"
-                AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
-                AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+    <BisqScrollPane fitToWidth="true" hbarPolicy="NEVER"
+                    fitToHeight="true"
+                    AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
+                    AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <AnchorPane fx:id="content" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
                     AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
-    </ScrollPane>
+    </BisqScrollPane>
 
 </AnchorPane>
 
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/burnbsq/BurnBsqView.fxml b/desktop/src/main/java/bisq/desktop/main/dao/burnbsq/BurnBsqView.fxml
@@ -17,22 +17,22 @@
   ~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
+<?import bisq.desktop.components.BisqScrollPane?>
 <AnchorPane fx:id="root" fx:controller="bisq.desktop.main.dao.burnbsq.BurnBsqView"
             xmlns:fx="http://javafx.com/fxml">
 
     <VBox fx:id="leftVBox" prefWidth="240" spacing="5" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="15"
           AnchorPane.topAnchor="15"/>
 
-    <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
-                fitToHeight="true"
-                AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
-                AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+    <BisqScrollPane fitToWidth="true" hbarPolicy="NEVER"
+                    fitToHeight="true"
+                    AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
+                    AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <AnchorPane fx:id="content" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
                     AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
-    </ScrollPane>
+    </BisqScrollPane>
 
 </AnchorPane>
 
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/economy/EconomyView.fxml b/desktop/src/main/java/bisq/desktop/main/dao/economy/EconomyView.fxml
@@ -17,20 +17,19 @@
   ~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-
-<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
+<?import bisq.desktop.components.BisqScrollPane?>
 <AnchorPane fx:id="root" fx:controller="bisq.desktop.main.dao.economy.EconomyView"
             xmlns:fx="http://javafx.com/fxml">
 
     <VBox fx:id="leftVBox" prefWidth="240" spacing="5" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="15"
           AnchorPane.topAnchor="15"/>
 
-    <ScrollPane fitToWidth="true" fitToHeight="true"
-                AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
-                AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+    <BisqScrollPane fitToWidth="true" fitToHeight="true"
+                    AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
+                    AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <AnchorPane fx:id="content"/>
-    </ScrollPane>
+    </BisqScrollPane>
 
 </AnchorPane>
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/GovernanceView.fxml b/desktop/src/main/java/bisq/desktop/main/dao/governance/GovernanceView.fxml
@@ -17,20 +17,20 @@
   ~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
+<?import bisq.desktop.components.BisqScrollPane?>
 <AnchorPane fx:id="root" fx:controller="bisq.desktop.main.dao.governance.GovernanceView"
             xmlns:fx="http://javafx.com/fxml">
 
     <VBox fx:id="leftVBox" prefWidth="240" spacing="5" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="15"
           AnchorPane.topAnchor="15"/>
 
-    <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
-                AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
-                AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+    <BisqScrollPane fitToWidth="true" hbarPolicy="NEVER"
+                    AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
+                    AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <AnchorPane fx:id="content" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
                     AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
-    </ScrollPane>
+    </BisqScrollPane>
 
 </AnchorPane>
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
@@ -18,6 +18,7 @@
 package bisq.desktop.main.dao.governance;
 
 import bisq.desktop.Navigation;
+import bisq.desktop.components.BisqScrollPane;
 import bisq.desktop.components.HyperlinkWithIcon;
 import bisq.desktop.components.InputTextField;
 import bisq.desktop.components.TitledGroupBg;
@@ -69,7 +70,6 @@
 
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TextField;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.layout.AnchorPane;
@@ -670,8 +670,8 @@ public int incrementAndGetGridRow() {
     }
 
     @SuppressWarnings("Duplicates")
-    public ScrollPane getView() {
-        ScrollPane scrollPane = new ScrollPane();
+    public BisqScrollPane getView() {
+        BisqScrollPane scrollPane = new BisqScrollPane();
         scrollPane.setFitToWidth(true);
         scrollPane.setFitToHeight(true);
 

diff --git a/desktop/src/main/java/bisq/desktop/main/dao/monitor/MonitorView.fxml b/desktop/src/main/java/bisq/desktop/main/dao/monitor/MonitorView.fxml
@@ -17,21 +17,21 @@
   ~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
+<?import bisq.desktop.components.BisqScrollPane?>
 <AnchorPane fx:id="root" fx:controller="bisq.desktop.main.dao.monitor.MonitorView"
             xmlns:fx="http://javafx.com/fxml">
 
     <VBox fx:id="leftVBox" prefWidth="240" spacing="5" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="15"
           AnchorPane.topAnchor="15"/>
 
-    <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
-                fitToHeight="true"
-                AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
-                AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+    <BisqScrollPane fitToWidth="true" hbarPolicy="NEVER"
+                    fitToHeight="true"
+                    AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
+                    AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <AnchorPane fx:id="content" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
                     AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
-    </ScrollPane>
+    </BisqScrollPane>
 
 </AnchorPane>
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/wallet/BsqWalletView.fxml b/desktop/src/main/java/bisq/desktop/main/dao/wallet/BsqWalletView.fxml
@@ -17,20 +17,19 @@
   ~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-
-<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
+<?import bisq.desktop.components.BisqScrollPane?>
 <AnchorPane fx:id="root" fx:controller="bisq.desktop.main.dao.wallet.BsqWalletView"
             xmlns:fx="http://javafx.com/fxml">
 
     <VBox fx:id="leftVBox" prefWidth="240" spacing="5" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="15"
           AnchorPane.topAnchor="15"/>
 
-    <ScrollPane fitToWidth="true" fitToHeight="true"
-                AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
-                AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+    <BisqScrollPane fitToWidth="true" fitToHeight="true"
+                    AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
+                    AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <AnchorPane fx:id="content"/>
-    </ScrollPane>
+    </BisqScrollPane>
 
 </AnchorPane>
diff --git a/desktop/src/main/java/bisq/desktop/main/market/MarketView.fxml b/desktop/src/main/java/bisq/desktop/main/market/MarketView.fxml
@@ -18,24 +18,24 @@
   -->
 
 <?import com.jfoenix.controls.JFXTabPane?>
-<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.control.Tab?>
 <?import javafx.scene.layout.AnchorPane?>
+<?import bisq.desktop.components.BisqScrollPane?>
 <JFXTabPane fx:id="root" fx:controller="bisq.desktop.main.market.MarketView"
             AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
             AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
             xmlns:fx="http://javafx.com/fxml">
 
     <Tab fx:id="offerBookTab" closable="false">
-        <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
-                    AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
-                    AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
+        <BisqScrollPane fitToWidth="true" hbarPolicy="NEVER"
+                        AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
+                        AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
     </Tab>
     <Tab fx:id="spreadTab" closable="false"/>
     <Tab fx:id="spreadTabPaymentMethod" closable="false"/>
     <Tab fx:id="tradesTab" closable="false">
-        <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
-                    AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
-                    AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
+        <BisqScrollPane fitToWidth="true" hbarPolicy="NEVER"
+                        AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
+                        AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
     </Tab>
 </JFXTabPane>
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/bsq_swap/BsqSwapOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/bsq_swap/BsqSwapOfferView.java
@@ -215,15 +215,7 @@ protected void removeSubscriptions() {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     private void addScrollPane() {
-        scrollPane = new ScrollPane();
-        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
-        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
-        scrollPane.setFitToWidth(true);
-        scrollPane.setFitToHeight(true);
-        AnchorPane.setLeftAnchor(scrollPane, 0d);
-        AnchorPane.setTopAnchor(scrollPane, 0d);
-        AnchorPane.setRightAnchor(scrollPane, 0d);
-        AnchorPane.setBottomAnchor(scrollPane, 0d);
+        scrollPane = GUIUtil.createScrollPane();
         root.getChildren().add(scrollPane);
     }
 

diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java
@@ -18,6 +18,7 @@
 package bisq.desktop.main.overlays.windows;
 
 import bisq.desktop.components.AutoTooltipButton;
+import bisq.desktop.components.BisqScrollPane;
 import bisq.desktop.components.InputTextField;
 import bisq.desktop.main.overlays.Overlay;
 import bisq.desktop.main.overlays.popups.Popup;
@@ -97,7 +98,7 @@ public void show() {
 
         createGridPane();
 
-        scrollPane = new ScrollPane();
+        scrollPane = new BisqScrollPane();
         scrollPane.setContent(gridPane);
         scrollPane.setFitToWidth(true);
         scrollPane.setFitToHeight(true);