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

Styling: fixes and added missing @since tags

Browse Source
This commit is contained in:
Karl Tauber
2021-12-11 00:50:05 +01:00
parent 09d8d09aad
commit 959b3e46fa
12 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEditorPaneUI.java
View File

@@ -44,8 +44,8 @@ import com.formdev.flatlaf.util.LoggingFacade;
* <!-- BasicEditorPaneUI --> * <!-- BasicEditorPaneUI -->
* *
* @uiDefault EditorPane.font Font * @uiDefault EditorPane.font Font
* @uiDefault EditorPane.background Color also used if not editable * @uiDefault EditorPane.background Color
* @uiDefault EditorPane.foreground Color * @uiDefault EditorPane.foreground Color also used if not editable
* @uiDefault EditorPane.caretForeground Color * @uiDefault EditorPane.caretForeground Color
* @uiDefault EditorPane.selectionBackground Color * @uiDefault EditorPane.selectionBackground Color
* @uiDefault EditorPane.selectionForeground Color * @uiDefault EditorPane.selectionForeground Color

6
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListCellBorder.java
View File

@@ -37,7 +37,7 @@ import javax.swing.plaf.ListUI;
public class FlatListCellBorder public class FlatListCellBorder
extends FlatLineBorder extends FlatLineBorder
{ {
protected boolean showCellFocusIndicator = UIManager.getBoolean( "List.showCellFocusIndicator" ); /** @since 2 */ protected boolean showCellFocusIndicator = UIManager.getBoolean( "List.showCellFocusIndicator" );
private Component c; private Component c;
@@ -113,7 +113,7 @@ public class FlatListCellBorder
/** /**
* Border for selected cell that uses margins and paints focus indicator border * Border for selected cell that uses margins and paints focus indicator border
* if enabled (List.showCellFocusIndicator=true) and exactly one item is selected. * if enabled (List.showCellFocusIndicator=true) and multiple items are selected.
*/ */
public static class Selected public static class Selected
extends FlatListCellBorder extends FlatListCellBorder
@@ -125,7 +125,7 @@ public class FlatListCellBorder
if( !showCellFocusIndicator ) if( !showCellFocusIndicator )
return; return;
// paint focus indicator border only if exactly one item is selected // paint focus indicator border only if multiple items are selected
JList<?> list = (JList<?>) SwingUtilities.getAncestorOfClass( JList.class, c ); JList<?> list = (JList<?>) SwingUtilities.getAncestorOfClass( JList.class, c );
if( list != null && list.getMinSelectionIndex() == list.getMaxSelectionIndex() ) if( list != null && list.getMinSelectionIndex() == list.getMaxSelectionIndex() )
return; return;

6
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListUI.java
View File

@@ -78,9 +78,9 @@ public class FlatListUI
@Styleable protected Color selectionInactiveForeground; @Styleable protected Color selectionInactiveForeground;
// for FlatListCellBorder // for FlatListCellBorder
@Styleable protected Insets cellMargins; /** @since 2 */ @Styleable protected Insets cellMargins;
@Styleable protected Color cellFocusColor; /** @since 2 */ @Styleable protected Color cellFocusColor;
@Styleable protected boolean showCellFocusIndicator; /** @since 2 */ @Styleable protected Boolean showCellFocusIndicator;
private Map<String, Object> oldStyleValues; private Map<String, Object> oldStyleValues;

2
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemRenderer.java
View File

@@ -62,6 +62,8 @@ import com.formdev.flatlaf.util.SystemInfo;
* @uiDefault MenuItem.textNoAcceleratorGap int * @uiDefault MenuItem.textNoAcceleratorGap int
* @uiDefault MenuItem.acceleratorArrowGap int * @uiDefault MenuItem.acceleratorArrowGap int
* @uiDefault MenuItem.checkBackground Color * @uiDefault MenuItem.checkBackground Color
* @uiDefault MenuItem.checkMargins Insets
* @uiDefault MenuItem.selectionType String null (default) or underline
* @uiDefault MenuItem.underlineSelectionBackground Color * @uiDefault MenuItem.underlineSelectionBackground Color
* @uiDefault MenuItem.underlineSelectionCheckBackground Color * @uiDefault MenuItem.underlineSelectionCheckBackground Color
* @uiDefault MenuItem.underlineSelectionColor Color * @uiDefault MenuItem.underlineSelectionColor Color

2
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java
View File

@@ -47,7 +47,7 @@ import com.formdev.flatlaf.util.UIScale;
* <!-- BasicScrollBarUI --> * <!-- BasicScrollBarUI -->
* *
* @uiDefault ScrollBar.background Color * @uiDefault ScrollBar.background Color
* @uiDefault ScrollBar.foreground Color * @uiDefault ScrollBar.foreground Color unused
* @uiDefault ScrollBar.track Color * @uiDefault ScrollBar.track Color
* @uiDefault ScrollBar.thumb Color * @uiDefault ScrollBar.thumb Color
* @uiDefault ScrollBar.width int * @uiDefault ScrollBar.width int

2
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableCellBorder.java
View File

@@ -37,7 +37,7 @@ import javax.swing.plaf.TableUI;
public class FlatTableCellBorder public class FlatTableCellBorder
extends FlatLineBorder extends FlatLineBorder
{ {
protected boolean showCellFocusIndicator = UIManager.getBoolean( "Table.showCellFocusIndicator" ); /** @since 2 */ protected boolean showCellFocusIndicator = UIManager.getBoolean( "Table.showCellFocusIndicator" );
private Component c; private Component c;

4
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableHeaderBorder.java
View File

@@ -141,8 +141,8 @@ public class FlatTableHeaderBorder
protected boolean hideTrailingVerticalLine( JTableHeader header ) { protected boolean hideTrailingVerticalLine( JTableHeader header ) {
if( header.getUI() instanceof FlatTableHeaderUI ) { if( header.getUI() instanceof FlatTableHeaderUI ) {
FlatTableHeaderUI ui = (FlatTableHeaderUI) header.getUI(); FlatTableHeaderUI ui = (FlatTableHeaderUI) header.getUI();
if( ui.showTrailingVerticalLine ) if( ui.showTrailingVerticalLine != null )
return false; return !ui.showTrailingVerticalLine;
} }
if( showTrailingVerticalLine ) if( showTrailingVerticalLine )

10
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableHeaderUI.java
View File

@@ -84,14 +84,14 @@ public class FlatTableHeaderUI
@Styleable(type=String.class) protected int sortIconPosition; @Styleable(type=String.class) protected int sortIconPosition;
// for FlatTableHeaderBorder // for FlatTableHeaderBorder
@Styleable protected Insets cellMargins; /** @since 2 */ @Styleable protected Insets cellMargins;
@Styleable protected Color separatorColor; /** @since 2 */ @Styleable protected Color separatorColor;
/** @since 2 */ @Styleable protected boolean showTrailingVerticalLine; /** @since 2 */ @Styleable protected Boolean showTrailingVerticalLine;
// for FlatAscendingSortIcon and FlatDescendingSortIcon // for FlatAscendingSortIcon and FlatDescendingSortIcon
// (needs to be public because icon classes are in another package) // (needs to be public because icon classes are in another package)
@Styleable public String arrowType; /** @since 2 */ @Styleable public String arrowType;
@Styleable public Color sortIconColor; /** @since 2 */ @Styleable public Color sortIconColor;
private PropertyChangeListener propertyChangeListener; private PropertyChangeListener propertyChangeListener;
private Map<String, Object> oldStyleValues; private Map<String, Object> oldStyleValues;

6
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java
View File

@@ -108,9 +108,9 @@ public class FlatTableUI
@Styleable protected Color selectionInactiveForeground; @Styleable protected Color selectionInactiveForeground;
// for FlatTableCellBorder // for FlatTableCellBorder
@Styleable protected Insets cellMargins; /** @since 2 */ @Styleable protected Insets cellMargins;
@Styleable protected Color cellFocusColor; /** @since 2 */ @Styleable protected Color cellFocusColor;
@Styleable protected boolean showCellFocusIndicator; /** @since 2 */ @Styleable protected Boolean showCellFocusIndicator;
private boolean oldShowHorizontalLines; private boolean oldShowHorizontalLines;
private boolean oldShowVerticalLines; private boolean oldShowVerticalLines;

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

@@ -52,6 +52,7 @@ import com.formdev.flatlaf.util.UIScale;
* *
* @uiDefault Tree.font Font * @uiDefault Tree.font Font
* @uiDefault Tree.background Color * @uiDefault Tree.background Color
* @uiDefault Tree.foreground Color unused
* @uiDefault Tree.hash Color * @uiDefault Tree.hash Color
* @uiDefault Tree.dropLineColor Color * @uiDefault Tree.dropLineColor Color
* @uiDefault Tree.expandedIcon Icon * @uiDefault Tree.expandedIcon Icon
@@ -136,12 +137,12 @@ public class FlatTreeUI
// for icons // for icons
// (needs to be public because icon classes are in another package) // (needs to be public because icon classes are in another package)
@Styleable(dot=true) public String iconArrowType; /** @since 2 */ @Styleable(dot=true) public String iconArrowType;
@Styleable(dot=true) public Color iconExpandedColor; /** @since 2 */ @Styleable(dot=true) public Color iconExpandedColor;
@Styleable(dot=true) public Color iconCollapsedColor; /** @since 2 */ @Styleable(dot=true) public Color iconCollapsedColor;
@Styleable(dot=true) public Color iconLeafColor; /** @since 2 */ @Styleable(dot=true) public Color iconLeafColor;
@Styleable(dot=true) public Color iconClosedColor; /** @since 2 */ @Styleable(dot=true) public Color iconClosedColor;
@Styleable(dot=true) public Color iconOpenColor; /** @since 2 */ @Styleable(dot=true) public Color iconOpenColor;
// only used via styling (not in UI defaults, but has likewise client properties) // only used via styling (not in UI defaults, but has likewise client properties)
/** @since 2 */ @Styleable protected boolean paintSelection = true; /** @since 2 */ @Styleable protected boolean paintSelection = true;

6
flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyleableInfo.java
View File

@@ -257,7 +257,7 @@ public class TestFlatStyleableInfo
// FlatListCellBorder // FlatListCellBorder
"cellMargins", Insets.class, "cellMargins", Insets.class,
"cellFocusColor", Color.class, "cellFocusColor", Color.class,
"showCellFocusIndicator", boolean.class "showCellFocusIndicator", Boolean.class
); );
assertMapEquals( expected, ui.getStyleableInfos( c ) ); assertMapEquals( expected, ui.getStyleableInfos( c ) );
@@ -760,7 +760,7 @@ public class TestFlatStyleableInfo
// FlatTableCellBorder // FlatTableCellBorder
"cellMargins", Insets.class, "cellMargins", Insets.class,
"cellFocusColor", Color.class, "cellFocusColor", Color.class,
"showCellFocusIndicator", boolean.class "showCellFocusIndicator", Boolean.class
); );
assertMapEquals( expected, ui.getStyleableInfos( c ) ); assertMapEquals( expected, ui.getStyleableInfos( c ) );
@@ -779,7 +779,7 @@ public class TestFlatStyleableInfo
// FlatTableHeaderBorder // FlatTableHeaderBorder
"cellMargins", Insets.class, "cellMargins", Insets.class,
"separatorColor", Color.class, "separatorColor", Color.class,
"showTrailingVerticalLine", boolean.class, "showTrailingVerticalLine", Boolean.class,
// FlatAscendingSortIcon and FlatDescendingSortIcon // FlatAscendingSortIcon and FlatDescendingSortIcon
"arrowType", String.class, "arrowType", String.class,

13
flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java
View File

@@ -261,6 +261,7 @@ public class TestFlatStyling
// AbstractButton properties // AbstractButton properties
ui.applyStyle( b, "margin: 2,2,2,2" ); ui.applyStyle( b, "margin: 2,2,2,2" );
ui.applyStyle( b, "iconTextGap: 4" );
} }
@Test @Test
@@ -312,6 +313,9 @@ public class TestFlatStyling
ui.applyStyle( "foreground: #fff" ); ui.applyStyle( "foreground: #fff" );
ui.applyStyle( "border: 2,2,2,2,#f00" ); ui.applyStyle( "border: 2,2,2,2,#f00" );
ui.applyStyle( "font: italic 12 monospaced" ); ui.applyStyle( "font: italic 12 monospaced" );
// JComboBox properties
ui.applyStyle( "maximumRowCount: 20" );
} }
@Test @Test
@@ -335,6 +339,7 @@ public class TestFlatStyling
ui.applyStyle( "selectionColor: #fff" ); ui.applyStyle( "selectionColor: #fff" );
ui.applyStyle( "selectedTextColor: #fff" ); ui.applyStyle( "selectedTextColor: #fff" );
ui.applyStyle( "disabledTextColor: #fff" ); ui.applyStyle( "disabledTextColor: #fff" );
ui.applyStyle( "margin: 2,2,2,2" );
} }
@Test @Test
@@ -492,6 +497,7 @@ public class TestFlatStyling
// AbstractButton properties // AbstractButton properties
applyStyle.accept( "margin: 2,2,2,2" ); applyStyle.accept( "margin: 2,2,2,2" );
applyStyle.accept( "iconTextGap: 4" );
} }
private void menuItemRenderer( Consumer<String> applyStyle ) { private void menuItemRenderer( Consumer<String> applyStyle ) {
@@ -620,6 +626,7 @@ public class TestFlatStyling
// AbstractButton properties // AbstractButton properties
ui.applyStyle( b, "margin: 2,2,2,2" ); ui.applyStyle( b, "margin: 2,2,2,2" );
ui.applyStyle( b, "iconTextGap: 4" );
//---- icon ---- //---- icon ----
@@ -716,6 +723,7 @@ public class TestFlatStyling
ui.applyStyle( "background: #fff" ); ui.applyStyle( "background: #fff" );
ui.applyStyle( "foreground: #fff" ); ui.applyStyle( "foreground: #fff" );
ui.applyStyle( "border: 2,2,2,2,#f00" ); ui.applyStyle( "border: 2,2,2,2,#f00" );
ui.applyStyle( "viewportBorder: 2,2,2,2,#f00" );
} }
@Test @Test
@@ -933,7 +941,6 @@ public class TestFlatStyling
// JComponent properties // JComponent properties
ui.applyStyle( "background: #fff" ); ui.applyStyle( "background: #fff" );
ui.applyStyle( "foreground: #fff" ); ui.applyStyle( "foreground: #fff" );
ui.applyStyle( "border: 2,2,2,2,#f00" );
ui.applyStyle( "font: italic 12 monospaced" ); ui.applyStyle( "font: italic 12 monospaced" );
// JTable properties // JTable properties
@@ -965,7 +972,6 @@ public class TestFlatStyling
// JComponent properties // JComponent properties
ui.applyStyle( "background: #fff" ); ui.applyStyle( "background: #fff" );
ui.applyStyle( "foreground: #fff" ); ui.applyStyle( "foreground: #fff" );
ui.applyStyle( "border: 2,2,2,2,#f00" );
ui.applyStyle( "font: italic 12 monospaced" ); ui.applyStyle( "font: italic 12 monospaced" );
} }
@@ -990,6 +996,7 @@ public class TestFlatStyling
ui.applyStyle( "selectionColor: #fff" ); ui.applyStyle( "selectionColor: #fff" );
ui.applyStyle( "selectedTextColor: #fff" ); ui.applyStyle( "selectedTextColor: #fff" );
ui.applyStyle( "disabledTextColor: #fff" ); ui.applyStyle( "disabledTextColor: #fff" );
ui.applyStyle( "margin: 2,2,2,2" );
} }
@Test @Test
@@ -1024,6 +1031,7 @@ public class TestFlatStyling
ui.applyStyle( "selectionColor: #fff" ); ui.applyStyle( "selectionColor: #fff" );
ui.applyStyle( "selectedTextColor: #fff" ); ui.applyStyle( "selectedTextColor: #fff" );
ui.applyStyle( "disabledTextColor: #fff" ); ui.applyStyle( "disabledTextColor: #fff" );
ui.applyStyle( "margin: 2,2,2,2" );
} }
@Test @Test
@@ -1047,6 +1055,7 @@ public class TestFlatStyling
ui.applyStyle( "selectionColor: #fff" ); ui.applyStyle( "selectionColor: #fff" );
ui.applyStyle( "selectedTextColor: #fff" ); ui.applyStyle( "selectedTextColor: #fff" );
ui.applyStyle( "disabledTextColor: #fff" ); ui.applyStyle( "disabledTextColor: #fff" );
ui.applyStyle( "margin: 2,2,2,2" );
} }
@Test @Test