angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-12 06:57:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

ScrollPane: improved/fixed calculation of left/right padding for rounded border

Browse Source
This commit is contained in:
Karl Tauber
2023-08-13 17:01:56 +02:00
parent 7bec5ec6dc
commit 5436ea88d8
4 changed files with 85 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollPaneBorder.java
View File

@@ -41,11 +41,8 @@ public class FlatScrollPaneBorder
// if view is rounded, increase left and right insets to avoid that the viewport
// is painted over the rounded border on the corners
int arc = getArc( c );
if( arc > 0 ) {
// increase insets by radius minus lineWidth because radius is measured
// from the outside of the line, but insets from super include lineWidth
int padding = UIScale.scale( (arc / 2) - getLineWidth( c ) );
int padding = getLeftRightPadding( c );
if( padding > 0 ) {
insets.left += padding;
insets.right += padding;
}
@@ -60,4 +57,22 @@ public class FlatScrollPaneBorder
return arc;
}
/**
* Returns the scaled left/right padding used when arc is larger than zero.
* <p>
* This is the distance from the inside of the left border to the left side of the view component.
* On the right side, this is the distance between the right side of the view component and
* the vertical scrollbar. Or the inside of the right border if the scrollbar is hidden.
*/
public int getLeftRightPadding( Component c ) {
// Subtract lineWidth from radius because radius is given for the outside
// of the painted line, but insets from super already include lineWidth.
// Reduce padding by 10% to make padding slightly smaller because it is not recognizable
// when the view is minimally painted over the beginning of the border curve.
int arc = getArc( c );
return (arc > 0)
? Math.max( Math.round( UIScale.scale( ((arc / 2f) - getLineWidth( c )) * 0.9f ) ), 0 )
: 0;
}
}

14
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollPaneUI.java
View File

@@ -521,17 +521,19 @@ public class FlatScrollPaneUI
super.layoutContainer( parent );
JScrollPane scrollPane = (JScrollPane) parent;
float arc = getBorderArc( scrollPane );
if( arc > 0 ) {
Border border = scrollPane.getBorder();
int padding;
if( border instanceof FlatScrollPaneBorder &&
(padding = ((FlatScrollPaneBorder)border).getLeftRightPadding( scrollPane )) > 0 )
{
JScrollBar vsb = getVerticalScrollBar();
if( vsb != null && vsb.isVisible() ) {
// move vertical scrollbar to trailing edge
int padding = Math.round( (arc / 2) - FlatUIUtils.getBorderLineWidth( scrollPane ) );
Insets insets = parent.getInsets();
Insets insets = scrollPane.getInsets();
Rectangle r = vsb.getBounds();
int y = Math.max( r.y, insets.top + padding );
int y2 = Math.min( r.y + r.height, parent.getHeight() - insets.bottom - padding );
boolean ltr = parent.getComponentOrientation().isLeftToRight();
int y2 = Math.min( r.y + r.height, scrollPane.getHeight() - insets.bottom - padding );
boolean ltr = scrollPane.getComponentOrientation().isLeftToRight();
vsb.setBounds( r.x + (ltr ? padding : -padding), y, r.width, y2 - y );
}