diff --git a/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJideTabbedPaneUI.java b/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJideTabbedPaneUI.java index 3b6f63e8..14a94add 100644 --- a/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJideTabbedPaneUI.java +++ b/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJideTabbedPaneUI.java @@ -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(); diff --git a/flatlaf-jide-oss/src/main/resources/com/formdev/flatlaf/jideoss/FlatLaf.properties b/flatlaf-jide-oss/src/main/resources/com/formdev/flatlaf/jideoss/FlatLaf.properties index a4c48098..f52999cd 100644 --- a/flatlaf-jide-oss/src/main/resources/com/formdev/flatlaf/jideoss/FlatLaf.properties +++ b/flatlaf-jide-oss/src/main/resources/com/formdev/flatlaf/jideoss/FlatLaf.properties @@ -84,3 +84,5 @@ JideTabbedPane.shadow = $TabbedPane.shadow JideTabbedPane.closeButtonLeftMargin = 0 JideTabbedPane.closeButtonRightMargin = 0 +JideTabbedPane.fitStyleBoundSize = {integer}0 +JideTabbedPane.fitStyleFirstTabMargin = 0 diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt index a383c63e..3a8e60ef 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt @@ -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] diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt index 6f41d1e7..c2f80570 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt @@ -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] diff --git a/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt index 152930fa..42e64115 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt @@ -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] diff --git a/flatlaf-testing/dumps/uidefaults/JIDE-FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/JIDE-FlatDarkLaf_1.8.0_202.txt index 9c228198..96cf9d80 100644 --- a/flatlaf-testing/dumps/uidefaults/JIDE-FlatDarkLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/JIDE-FlatDarkLaf_1.8.0_202.txt @@ -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 diff --git a/flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_1.8.0_202.txt index 57f4bb8f..0aa742d0 100644 --- a/flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_1.8.0_202.txt @@ -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 diff --git a/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt b/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt index 4cafd761..f0d734c3 100644 --- a/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt +++ b/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt @@ -346,6 +346,8 @@ JideTabbedPane.background JideTabbedPane.closeButtonLeftMargin JideTabbedPane.closeButtonRightMargin JideTabbedPane.contentBorderInsets +JideTabbedPane.fitStyleBoundSize +JideTabbedPane.fitStyleFirstTabMargin JideTabbedPane.foreground JideTabbedPane.shadow JideTabbedPane.tabAreaBackground