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

ToolBar:

Browse Source 
- swap margins if orientation changes when floating
- include toolbar margin in grip position calculation
This commit is contained in:
Karl Tauber
2019-09-08 12:13:08 +02:00
parent c69e9e12c6
commit 7b1eda45cd
4 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarBorder.java
View File

@@ -63,12 +63,24 @@ public class FlatToolBarBorder
int gapSize = dotSize;
int gripSize = (dotSize * DOT_COUNT) + ((gapSize * (DOT_COUNT - 1)));
boolean horizontal = ((JToolBar)c).getOrientation() == SwingConstants.HORIZONTAL;
if( horizontal && !c.getComponentOrientation().isLeftToRight() )
x += width - scale( GRIP_WIDTH );
x += horizontal ? dotSize : Math.round( (width - gripSize) / 2f );
y += horizontal ? Math.round( (height - gripSize) / 2f ) : dotSize;
// include toolbar margin in grip position calculation
Insets insets = getBorderInsets( c );
// calculate grip position
boolean horizontal = ((JToolBar)c).getOrientation() == SwingConstants.HORIZONTAL;
if( horizontal ) {
if( c.getComponentOrientation().isLeftToRight() )
x += insets.left - (dotSize * 2);
else
x += width - insets.right + dotSize;
y += Math.round( (height - gripSize) / 2f );
} else {
// vertical
x += Math.round( (width - gripSize) / 2f );
y += insets.top - (dotSize * 2);
}
// paint dots
for( int i = 0; i < DOT_COUNT; i++ ) {
g.fillOval( x, y, dotSize, dotSize );
if( horizontal )

13
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarUI.java
View File

@@ -74,6 +74,19 @@ public class FlatToolBarUI
return rolloverBorder;
}
@Override
public void setOrientation( int orientation ) {
if( orientation != toolBar.getOrientation() ) {
// swap margins if orientation changes when floating
Insets margin = toolBar.getMargin();
Insets newMargin = new Insets( margin.left, margin.top, margin.right, margin.bottom );
if( !newMargin.equals( margin ) )
toolBar.setMargin( newMargin );
}
super.setOrientation( orientation );
}
//---- class FlatRolloverMarginBorder -------------------------------------
/**