Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-09 16:25:10 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Table and TableHeader: renamed UI keys Table[Header].showLastVerticalLine to Table[Header].showTrailingVerticalLine (issue #332)

Browse Source
This commit is contained in:
Karl Tauber
2021-09-14 14:31:17 +02:00
parent 7c9f550d4c
commit 578379fd00
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ public class FlatTableHeaderBorder
{ {
protected Color separatorColor = UIManager.getColor( "TableHeader.separatorColor" ); protected Color separatorColor = UIManager.getColor( "TableHeader.separatorColor" );
protected Color bottomSeparatorColor = UIManager.getColor( "TableHeader.bottomSeparatorColor" ); protected Color bottomSeparatorColor = UIManager.getColor( "TableHeader.bottomSeparatorColor" );
protected boolean showLastVerticalLine = UIManager.getBoolean( "TableHeader.showLastVerticalLine" ); /** @since 1.6 */ protected boolean showTrailingVerticalLine = UIManager.getBoolean( "TableHeader.showTrailingVerticalLine" );
public FlatTableHeaderBorder() { public FlatTableHeaderBorder() {
super( UIManager.getInsets( "TableHeader.cellMargins" ) ); super( UIManager.getInsets( "TableHeader.cellMargins" ) );
@@ -110,7 +110,7 @@ public class FlatTableHeaderBorder
} }
protected boolean hideTrailingVerticalLine( JTableHeader header ) { protected boolean hideTrailingVerticalLine( JTableHeader header ) {
if( showLastVerticalLine ) if( showTrailingVerticalLine )
return false; return false;
// do not hide if table header is not a child of a scroll pane // do not hide if table header is not a child of a scroll pane

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

@@ -62,7 +62,7 @@ import com.formdev.flatlaf.util.UIScale;
* @uiDefault TableHeader.cellMargins Insets * @uiDefault TableHeader.cellMargins Insets
* @uiDefault TableHeader.separatorColor Color * @uiDefault TableHeader.separatorColor Color
* @uiDefault TableHeader.bottomSeparatorColor Color * @uiDefault TableHeader.bottomSeparatorColor Color
* @uiDefault TableHeader.showLastVerticalLine boolean * @uiDefault TableHeader.showTrailingVerticalLine boolean
* *
* @author Karl Tauber * @author Karl Tauber
*/ */

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

@@ -71,7 +71,7 @@ import com.formdev.flatlaf.util.UIScale;
* @uiDefault Table.rowHeight int * @uiDefault Table.rowHeight int
* @uiDefault Table.showHorizontalLines boolean * @uiDefault Table.showHorizontalLines boolean
* @uiDefault Table.showVerticalLines boolean * @uiDefault Table.showVerticalLines boolean
* @uiDefault Table.showLastVerticalLine boolean * @uiDefault Table.showTrailingVerticalLine boolean
* @uiDefault Table.intercellSpacing Dimension * @uiDefault Table.intercellSpacing Dimension
* @uiDefault Table.selectionInactiveBackground Color * @uiDefault Table.selectionInactiveBackground Color
* @uiDefault Table.selectionInactiveForeground Color * @uiDefault Table.selectionInactiveForeground Color
@@ -93,7 +93,7 @@ public class FlatTableUI
{ {
protected boolean showHorizontalLines; protected boolean showHorizontalLines;
protected boolean showVerticalLines; protected boolean showVerticalLines;
protected boolean showLastVerticalLine; /** @since 1.6 */ protected boolean showTrailingVerticalLine;
protected Dimension intercellSpacing; protected Dimension intercellSpacing;
protected Color selectionBackground; protected Color selectionBackground;
@@ -117,7 +117,7 @@ public class FlatTableUI
showHorizontalLines = UIManager.getBoolean( "Table.showHorizontalLines" ); showHorizontalLines = UIManager.getBoolean( "Table.showHorizontalLines" );
showVerticalLines = UIManager.getBoolean( "Table.showVerticalLines" ); showVerticalLines = UIManager.getBoolean( "Table.showVerticalLines" );
showLastVerticalLine = UIManager.getBoolean( "Table.showLastVerticalLine" ); showTrailingVerticalLine = UIManager.getBoolean( "Table.showTrailingVerticalLine" );
intercellSpacing = UIManager.getDimension( "Table.intercellSpacing" ); intercellSpacing = UIManager.getDimension( "Table.intercellSpacing" );
selectionBackground = UIManager.getColor( "Table.selectionBackground" ); selectionBackground = UIManager.getColor( "Table.selectionBackground" );
@@ -318,7 +318,7 @@ public class FlatTableUI
} }
protected boolean hideLastVerticalLine() { protected boolean hideLastVerticalLine() {
if( showLastVerticalLine ) if( showTrailingVerticalLine )
return false; return false;
// do not hide if table is not a child of a scroll pane // do not hide if table is not a child of a scroll pane

4
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
View File

@@ -628,7 +628,7 @@ TabbedPane.closeCrossLineWidth = {float}1
Table.rowHeight = 20 Table.rowHeight = 20
Table.showHorizontalLines = false Table.showHorizontalLines = false
Table.showVerticalLines = false Table.showVerticalLines = false
Table.showLastVerticalLine = false Table.showTrailingVerticalLine = false
Table.consistentHomeEndKeyBehavior = true Table.consistentHomeEndKeyBehavior = true
Table.intercellSpacing = {dimension}0,0 Table.intercellSpacing = {dimension}0,0
Table.scrollPaneBorder = com.formdev.flatlaf.ui.FlatBorder Table.scrollPaneBorder = com.formdev.flatlaf.ui.FlatBorder
@@ -658,7 +658,7 @@ TableHeader.cellBorder = com.formdev.flatlaf.ui.FlatTableHeaderBorder
TableHeader.cellMargins = 2,3,2,3 TableHeader.cellMargins = 2,3,2,3
TableHeader.focusCellBackground = $TableHeader.background TableHeader.focusCellBackground = $TableHeader.background
TableHeader.background = @textComponentBackground TableHeader.background = @textComponentBackground
TableHeader.showLastVerticalLine = false TableHeader.showTrailingVerticalLine = false
#---- TextArea ---- #---- TextArea ----

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

@@ -1078,7 +1078,7 @@ Table.selectionForeground #bbbbbb HSL 0 0 73 javax.swing.plaf.Colo
Table.selectionInactiveBackground #0d293e HSL 206 65 15 javax.swing.plaf.ColorUIResource [UI] Table.selectionInactiveBackground #0d293e HSL 206 65 15 javax.swing.plaf.ColorUIResource [UI]
Table.selectionInactiveForeground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] Table.selectionInactiveForeground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI]
Table.showHorizontalLines false Table.showHorizontalLines false
Table.showLastVerticalLine false Table.showTrailingVerticalLine false
Table.showVerticalLines false Table.showVerticalLines false
Table.sortIconColor #adadad HSL 0 0 68 javax.swing.plaf.ColorUIResource [UI] Table.sortIconColor #adadad HSL 0 0 68 javax.swing.plaf.ColorUIResource [UI]
@@ -1094,7 +1094,7 @@ TableHeader.font [active] $defaultFont [UI]
TableHeader.foreground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] TableHeader.foreground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI]
TableHeader.height 25 TableHeader.height 25
TableHeader.separatorColor #5e6364 HSL 190 3 38 javax.swing.plaf.ColorUIResource [UI] TableHeader.separatorColor #5e6364 HSL 190 3 38 javax.swing.plaf.ColorUIResource [UI]
TableHeader.showLastVerticalLine false TableHeader.showTrailingVerticalLine false
TableHeaderUI com.formdev.flatlaf.ui.FlatTableHeaderUI TableHeaderUI com.formdev.flatlaf.ui.FlatTableHeaderUI

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

@@ -1083,7 +1083,7 @@ Table.selectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.Colo
Table.selectionInactiveBackground #d4d4d4 HSL 0 0 83 javax.swing.plaf.ColorUIResource [UI] Table.selectionInactiveBackground #d4d4d4 HSL 0 0 83 javax.swing.plaf.ColorUIResource [UI]
Table.selectionInactiveForeground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] Table.selectionInactiveForeground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI]
Table.showHorizontalLines false Table.showHorizontalLines false
Table.showLastVerticalLine false Table.showTrailingVerticalLine false
Table.showVerticalLines false Table.showVerticalLines false
Table.sortIconColor #afafaf HSL 0 0 69 javax.swing.plaf.ColorUIResource [UI] Table.sortIconColor #afafaf HSL 0 0 69 javax.swing.plaf.ColorUIResource [UI]
@@ -1099,7 +1099,7 @@ TableHeader.font [active] $defaultFont [UI]
TableHeader.foreground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] TableHeader.foreground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI]
TableHeader.height 25 TableHeader.height 25
TableHeader.separatorColor #e6e6e6 HSL 0 0 90 javax.swing.plaf.ColorUIResource [UI] TableHeader.separatorColor #e6e6e6 HSL 0 0 90 javax.swing.plaf.ColorUIResource [UI]
TableHeader.showLastVerticalLine false TableHeader.showTrailingVerticalLine false
TableHeaderUI com.formdev.flatlaf.ui.FlatTableHeaderUI TableHeaderUI com.formdev.flatlaf.ui.FlatTableHeaderUI

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

@@ -1088,7 +1088,7 @@ Table.selectionForeground #ffff00 HSL 60 100 50 javax.swing.plaf.Colo
Table.selectionInactiveBackground #888888 HSL 0 0 53 javax.swing.plaf.ColorUIResource [UI] Table.selectionInactiveBackground #888888 HSL 0 0 53 javax.swing.plaf.ColorUIResource [UI]
Table.selectionInactiveForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] Table.selectionInactiveForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
Table.showHorizontalLines false Table.showHorizontalLines false
Table.showLastVerticalLine false Table.showTrailingVerticalLine false
Table.showVerticalLines false Table.showVerticalLines false
Table.sortIconColor #ffff00 HSL 60 100 50 javax.swing.plaf.ColorUIResource [UI] Table.sortIconColor #ffff00 HSL 60 100 50 javax.swing.plaf.ColorUIResource [UI]
@@ -1104,7 +1104,7 @@ TableHeader.font [active] $defaultFont [UI]
TableHeader.foreground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] TableHeader.foreground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
TableHeader.height 25 TableHeader.height 25
TableHeader.separatorColor #00ff00 HSL 120 100 50 javax.swing.plaf.ColorUIResource [UI] TableHeader.separatorColor #00ff00 HSL 120 100 50 javax.swing.plaf.ColorUIResource [UI]
TableHeader.showLastVerticalLine false TableHeader.showTrailingVerticalLine false
TableHeaderUI com.formdev.flatlaf.ui.FlatTableHeaderUI TableHeaderUI com.formdev.flatlaf.ui.FlatTableHeaderUI

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

@@ -830,7 +830,7 @@ Table.selectionForeground
Table.selectionInactiveBackground Table.selectionInactiveBackground
Table.selectionInactiveForeground Table.selectionInactiveForeground
Table.showHorizontalLines Table.showHorizontalLines
Table.showLastVerticalLine Table.showTrailingVerticalLine
Table.showVerticalLines Table.showVerticalLines
Table.sortIconColor Table.sortIconColor
TableHeader.ancestorInputMap TableHeader.ancestorInputMap
@@ -843,7 +843,7 @@ TableHeader.font
TableHeader.foreground TableHeader.foreground
TableHeader.height TableHeader.height
TableHeader.separatorColor TableHeader.separatorColor
TableHeader.showLastVerticalLine TableHeader.showTrailingVerticalLine
TableHeaderUI TableHeaderUI
TableUI TableUI
TaskPane.background TaskPane.background