Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-01 19:26:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix table roundedness in portfolio

Browse source
This commit is contained in:
woodser 2025-05-14 10:24:37 -04:00
parent 6b811f076d
commit 2b47505df8
No known key found for this signature in database
GPG key ID: 55A10DD48ADEE5EF
3 changed files with 5 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -172,7 +172,7 @@
} }
.compact-button, .table-cell .jfx-button, .action-button.compact-button { .compact-button, .table-cell .jfx-button, .action-button.compact-button {
-fx-padding: 0 10 0 10; -fx-padding: 0 7 0 7;
} }
.tiny-button, .tiny-button,
@ -1170,14 +1170,10 @@ textfield */
.table-view .column-header.first-column { .table-view .column-header.first-column {
-fx-padding: 0 0 0 15; -fx-padding: 0 0 0 15;
-fx-background-radius: 15 0 0 0;
-fx-border-radius: 15 0 0 0;
} }
.table-view .column-header.last-column { .table-view .column-header.last-column {
-fx-padding: 0 15 0 0; -fx-padding: 0 15 0 0;
-fx-background-radius: 0 15 0 0;
-fx-border-radius: 0 15 0 0;
} }
.number-column.table-cell { .number-column.table-cell {
@ -1191,13 +1187,11 @@ textfield */
.table-view { .table-view {
-fx-control-inner-background-alt: -fx-control-inner-background; -fx-control-inner-background-alt: -fx-control-inner-background;
-fx-background-radius: 15;
-fx-border-radius: 15;
-fx-padding: 0; -fx-padding: 0;
} }
.table-view .column-header-background { .table-view .column-header-background {
-fx-background-color: transparent; -fx-background-color: -bs-color-background-pane;
-fx-border-color: -bs-color-border-form-field; -fx-border-color: -bs-color-border-form-field;
-fx-border-width: 0 0 1 0; -fx-border-width: 0 0 1 0;
} }

2
desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java
View file

@ -978,6 +978,8 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
HBox hBox = new HBox(); HBox hBox = new HBox();
hBox.setSpacing(0); hBox.setSpacing(0);
hBox.setAlignment(Pos.CENTER);
hBox.setTranslateX(7); // correlates with .compact-button, .table-cell .jfx-button, .action-button.compact-button
hBox.getChildren().addAll(warnIconButton, trashIconButton); hBox.getChildren().addAll(warnIconButton, trashIconButton);
setGraphic(hBox); setGraphic(hBox);
} else { } else {

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

@ -1113,7 +1113,6 @@ public class GUIUtil {
tableView.skinProperty().addListener((obs, oldSkin, newSkin) -> { tableView.skinProperty().addListener((obs, oldSkin, newSkin) -> {
if (newSkin != null) { if (newSkin != null) {
Platform.runLater(() -> { Platform.runLater(() -> {
addScrollBarVisibilityListener(tableView);
updateEdgeColumnStyleClasses(tableView); updateEdgeColumnStyleClasses(tableView);
}); });
} }
@ -1141,25 +1140,9 @@ public class GUIUtil {
first.getStyleClass().add("first-column"); first.getStyleClass().add("first-column");
} }
boolean hasVerticalScrollBar = tableView.lookupAll(".scroll-bar") if (!last.getStyleClass().contains("last-column")) {
.stream()
.filter(node -> node instanceof ScrollBar)
.map(node -> (ScrollBar) node)
.anyMatch(scrollBar -> scrollBar.getOrientation() == Orientation.VERTICAL
&& scrollBar.isVisible());
if (!last.getStyleClass().contains("last-column") && !hasVerticalScrollBar) {
last.getStyleClass().add("last-column"); last.getStyleClass().add("last-column");
} }
} }
} }
private static void addScrollBarVisibilityListener(TableView<?> tableView) {
for (Node node : tableView.lookupAll(".scroll-bar")) {
if (node instanceof ScrollBar sb && sb.getOrientation() == Orientation.VERTICAL) {
sb.visibleProperty().addListener((obs, wasVisible, isNowVisible) ->
Platform.runLater(() -> updateEdgeColumnStyleClasses(tableView)));
}
}
}
} }