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

TabbedPane: Adjustements

Browse Source
This commit is contained in:
DUDSS
2021-06-20 02:10:51 +02:00
parent d3c917eac1
commit 04bb6a5275
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java
View File

@@ -98,6 +98,7 @@ import com.formdev.flatlaf.util.UIScale;
* *
* @clientProperty JTabbedPane.showTabSeparators boolean * @clientProperty JTabbedPane.showTabSeparators boolean
* @clientProperty JTabbedPane.hasFullBorder boolean * @clientProperty JTabbedPane.hasFullBorder boolean
* @clientProperty JTabbedPane.activeTabBorder boolean
* *
* <!-- BasicTabbedPaneUI --> * <!-- BasicTabbedPaneUI -->
* *
@@ -135,6 +136,7 @@ import com.formdev.flatlaf.util.UIScale;
* @uiDefault TabbedPane.showTabSeparators boolean * @uiDefault TabbedPane.showTabSeparators boolean
* @uiDefault TabbedPane.tabSeparatorsFullHeight boolean * @uiDefault TabbedPane.tabSeparatorsFullHeight boolean
* @uiDefault TabbedPane.hasFullBorder boolean * @uiDefault TabbedPane.hasFullBorder boolean
* @uiDefault TabbedPane.activeTabBorder boolean
* *
* @uiDefault TabbedPane.tabLayoutPolicy String wrap (default) or scroll * @uiDefault TabbedPane.tabLayoutPolicy String wrap (default) or scroll
* @uiDefault TabbedPane.tabsPopupPolicy String never or asNeeded (default) * @uiDefault TabbedPane.tabsPopupPolicy String never or asNeeded (default)
@@ -1014,10 +1016,19 @@ public class FlatTabbedPaneUI
{ {
// paint tab separators // paint tab separators
if( clientPropertyBoolean( tabPane, TABBED_PANE_SHOW_TAB_SEPARATORS, showTabSeparators ) && if( clientPropertyBoolean( tabPane, TABBED_PANE_SHOW_TAB_SEPARATORS, showTabSeparators ) &&
!isLastInRun( tabIndex ) ) !isLastInRun( tabIndex ) ) {
if( clientPropertyBoolean( tabPane, TABBED_PANE_ACTIVE_TAB_BORDER, activeTabBorder ) ) {
// Some separators need to be omitted when activeTabBorder is enabled
int selectedIndex = tabPane.getSelectedIndex();
if (tabIndex != selectedIndex - 1 && tabIndex != selectedIndex) {
paintTabSeparator( g, tabPlacement, x, y, w, h ); paintTabSeparator( g, tabPlacement, x, y, w, h );
}
} else {
paintTabSeparator( g, tabPlacement, x, y, w, h );
}
}
// paint tab border // paint active tab border
if ( clientPropertyBoolean( tabPane, TABBED_PANE_ACTIVE_TAB_BORDER, activeTabBorder ) && isSelected) { if ( clientPropertyBoolean( tabPane, TABBED_PANE_ACTIVE_TAB_BORDER, activeTabBorder ) && isSelected) {
paintActiveTabBorder(g, tabPlacement, tabIndex, x, y, w, h); paintActiveTabBorder(g, tabPlacement, tabIndex, x, y, w, h);
} }
@@ -1101,7 +1112,7 @@ public class FlatTabbedPaneUI
case BOTTOM: case BOTTOM:
if ( clientPropertyBoolean( tabPane, TABBED_PANE_ACTIVE_TAB_BORDER, activeTabBorder )) { if ( clientPropertyBoolean( tabPane, TABBED_PANE_ACTIVE_TAB_BORDER, activeTabBorder )) {
g.fillRect( x, y + h + contentInsets.top - tabSelectionHeight, w, tabSelectionHeight ); g.fillRect( x, y + h - tabSelectionHeight, w, tabSelectionHeight );
} else { } else {
g.fillRect( x, y - contentInsets.bottom, w, tabSelectionHeight ); g.fillRect( x, y - contentInsets.bottom, w, tabSelectionHeight );
} }
@@ -1119,7 +1130,7 @@ public class FlatTabbedPaneUI
case RIGHT: case RIGHT:
if ( clientPropertyBoolean( tabPane, TABBED_PANE_ACTIVE_TAB_BORDER, activeTabBorder )) { if ( clientPropertyBoolean( tabPane, TABBED_PANE_ACTIVE_TAB_BORDER, activeTabBorder )) {
g.fillRect( x + w + contentInsets.left - tabSelectionHeight, y, tabSelectionHeight, h ); g.fillRect( x + w - tabSelectionHeight, y, tabSelectionHeight, h );
} else { } else {
g.fillRect( x - contentInsets.right, y, tabSelectionHeight, h ); g.fillRect( x - contentInsets.right, y, tabSelectionHeight, h );
} }