Skip to content

Commit eb12b90

Browse files
committed
Use (Java21) Math.clamp instead of nested Math.max and Math.min
1 parent 9b8b655 commit eb12b90

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ScaledSliderRepresentation.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -521,13 +521,13 @@ else if (newval > max)
521521
for (Node node : skin.getChildren()) {
522522
if (node.getStyleClass().contains("thumb")) {
523523
// 7.6 seems to be default padding
524-
node.setStyle("-fx-padding: " + Math.min(20, Math.max(7.6, (size * 0.3))));
524+
node.setStyle("-fx-padding: " + Math.clamp(size * 0.3, 7.6, 20));
525525
} else if (node.getStyleClass().contains("track")) {
526526
// 3.3 seems to be default padding
527-
node.setStyle("-fx-padding: " + Math.min(13, Math.max(3.3, (size * 0.2))));
527+
node.setStyle("-fx-padding: " + Math.clamp(size * 0.2, 3.3, 13));
528528
} else if (node.getStyleClass().contains("axis")) {
529529
// 8 seems to be default major tick length
530-
node.setStyle("-fx-tick-length: " + Math.min(20, Math.max(8, (size * 0.1))));
530+
node.setStyle("-fx-tick-length: " + Math.clamp(size * 0.1, 8, 20));
531531
}
532532
}
533533
}

0 commit comments

Comments
 (0)