Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-06 05:50:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

JIDE: JideTabbedPane: tab layout fixes for compact resize mode

Browse Source
This commit is contained in:
Karl Tauber
2021-03-27 17:03:49 +01:00
parent 2a00de11f1
commit d7b0754327
8 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJideTabbedPaneUI.java
View File

@@ -507,6 +507,29 @@ public class FlatJideTabbedPaneUI
return lastTabInRun( _tabPane.getTabCount(), run ) == tabIndex;
}
@Override
protected void ensureCurrentRects( int leftMargin, int tabCount ) {
int oldFitStyleBoundSize = _fitStyleBoundSize;
int oldFitStyleFirstTabMargin = _fitStyleFirstTabMargin;
int oldCompressedStyleNoIconRectSize = _compressedStyleNoIconRectSize;
int oldCompressedStyleIconMargin = _compressedStyleIconMargin;
int oldFixedStyleRectSize = _fixedStyleRectSize;
_fitStyleBoundSize = scale( _fitStyleBoundSize );
_fitStyleFirstTabMargin = scale( _fitStyleFirstTabMargin );
_compressedStyleNoIconRectSize = scale( _compressedStyleNoIconRectSize );
_compressedStyleIconMargin = scale( _compressedStyleIconMargin );
_fixedStyleRectSize = scale( _fixedStyleRectSize );
super.ensureCurrentRects( leftMargin, tabCount );
_fitStyleBoundSize = oldFitStyleBoundSize;
_fitStyleFirstTabMargin = oldFitStyleFirstTabMargin;
_compressedStyleNoIconRectSize = oldCompressedStyleNoIconRectSize;
_compressedStyleIconMargin = oldCompressedStyleIconMargin;
_fixedStyleRectSize = oldFixedStyleRectSize;
}
@Override
public void ensureCloseButtonCreated() {
super.ensureCloseButtonCreated();

2
flatlaf-jide-oss/src/main/resources/com/formdev/flatlaf/jideoss/FlatLaf.properties
View File

@@ -84,3 +84,5 @@ JideTabbedPane.shadow = $TabbedPane.shadow
JideTabbedPane.closeButtonLeftMargin = 0
JideTabbedPane.closeButtonRightMargin = 0
JideTabbedPane.fitStyleBoundSize = {integer}0
JideTabbedPane.fitStyleFirstTabMargin = 0

2
flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt
View File

@@ -492,6 +492,8 @@ JideTabbedPane.background #3c3f41 javax.swing.plaf.ColorUIResource [UI]
JideTabbedPane.closeButtonLeftMargin 0
JideTabbedPane.closeButtonRightMargin 0
JideTabbedPane.contentBorderInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
JideTabbedPane.fitStyleBoundSize 0
JideTabbedPane.fitStyleFirstTabMargin 0
JideTabbedPane.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
JideTabbedPane.shadow #3c3f41 javax.swing.plaf.ColorUIResource [UI]
JideTabbedPane.tabAreaBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]

2
flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt
View File

@@ -497,6 +497,8 @@ JideTabbedPane.background #f2f2f2 javax.swing.plaf.ColorUIResource [UI]
JideTabbedPane.closeButtonLeftMargin 0
JideTabbedPane.closeButtonRightMargin 0
JideTabbedPane.contentBorderInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
JideTabbedPane.fitStyleBoundSize 0
JideTabbedPane.fitStyleFirstTabMargin 0
JideTabbedPane.foreground #000000 javax.swing.plaf.ColorUIResource [UI]
JideTabbedPane.shadow #f2f2f2 javax.swing.plaf.ColorUIResource [UI]
JideTabbedPane.tabAreaBackground #f2f2f2 javax.swing.plaf.ColorUIResource [UI]

2
flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt
View File

@@ -488,6 +488,8 @@ JideTabbedPane.background #ccffcc javax.swing.plaf.ColorUIResource [UI]
JideTabbedPane.closeButtonLeftMargin 0
JideTabbedPane.closeButtonRightMargin 0
JideTabbedPane.contentBorderInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
JideTabbedPane.fitStyleBoundSize 0
JideTabbedPane.fitStyleFirstTabMargin 0
JideTabbedPane.foreground #ff0000 javax.swing.plaf.ColorUIResource [UI]
JideTabbedPane.shadow #ccffcc javax.swing.plaf.ColorUIResource [UI]
JideTabbedPane.tabAreaBackground #ccffcc javax.swing.plaf.ColorUIResource [UI]

2
flatlaf-testing/dumps/uidefaults/JIDE-FlatDarkLaf_1.8.0_202.txt
View File

@@ -121,8 +121,6 @@
+ JideTabbedPane.defaultTabBorderShadowColor #736d63 javax.swing.plaf.ColorUIResource [UI]
+ JideTabbedPane.defaultTabColorTheme 3
+ JideTabbedPane.defaultTabShape 2
+ JideTabbedPane.fitStyleBoundSize 8
+ JideTabbedPane.fitStyleFirstTabMargin 4
+ JideTabbedPane.fitStyleIconMinWidth 24
+ JideTabbedPane.fitStyleTextMinWidth 16
+ JideTabbedPane.fixedStyleRectSize 60

2
flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_1.8.0_202.txt
View File

@@ -121,8 +121,6 @@
+ JideTabbedPane.defaultTabBorderShadowColor #736d63 javax.swing.plaf.ColorUIResource [UI]
+ JideTabbedPane.defaultTabColorTheme 3
+ JideTabbedPane.defaultTabShape 2
+ JideTabbedPane.fitStyleBoundSize 8
+ JideTabbedPane.fitStyleFirstTabMargin 4
+ JideTabbedPane.fitStyleIconMinWidth 24
+ JideTabbedPane.fitStyleTextMinWidth 16
+ JideTabbedPane.fixedStyleRectSize 60

2
flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt
View File

@@ -346,6 +346,8 @@ JideTabbedPane.background
JideTabbedPane.closeButtonLeftMargin
JideTabbedPane.closeButtonRightMargin
JideTabbedPane.contentBorderInsets
JideTabbedPane.fitStyleBoundSize
JideTabbedPane.fitStyleFirstTabMargin
JideTabbedPane.foreground
JideTabbedPane.shadow
JideTabbedPane.tabAreaBackground