-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6424 from Android-X13/speed-up-scrolling
Increase mouse-wheel vertical scrolling speed in ScrollPane
- Loading branch information
Showing
15 changed files
with
151 additions
and
86 deletions.
There are no files selected for viewing
72 changes: 72 additions & 0 deletions
72
desktop/src/main/java/bisq/desktop/components/BisqScrollPane.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.