From 8ba7f7f96184f868b6606f1f38b003a6bf1a1c0d Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Thu, 24 Jun 2021 17:53:19 +0200 Subject: [PATCH] Styling: reduce duplicate code in list and table cell borders --- .../com/formdev/flatlaf/ui/FlatEmptyBorder.java | 6 ++++++ .../com/formdev/flatlaf/ui/FlatListCellBorder.java | 14 ++++---------- .../formdev/flatlaf/ui/FlatTableCellBorder.java | 14 ++++---------- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEmptyBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEmptyBorder.java index 55d08c72..455d7445 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEmptyBorder.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEmptyBorder.java @@ -50,6 +50,12 @@ public class FlatEmptyBorder @Override public Insets getBorderInsets( Component c, Insets insets ) { + return scaleInsets( c, insets, top, left, bottom, right ); + } + + protected static Insets scaleInsets( Component c, Insets insets, + int top, int left, int bottom, int right ) + { boolean leftToRight = left == right || c.getComponentOrientation().isLeftToRight(); insets.left = scale( leftToRight ? left : right ); insets.top = scale( top ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListCellBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListCellBorder.java index f70c071a..4e87570e 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListCellBorder.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListCellBorder.java @@ -16,7 +16,6 @@ package com.formdev.flatlaf.ui; -import static com.formdev.flatlaf.util.UIScale.scale; import java.awt.Color; import java.awt.Component; import java.awt.Graphics; @@ -48,15 +47,10 @@ public class FlatListCellBorder @Override public Insets getBorderInsets( Component c, Insets insets ) { - Insets margins = getStyleFromListUI( c, ui -> ui.cellMargins ); - if( margins != null ) { - boolean leftToRight = margins.left == margins.right || c.getComponentOrientation().isLeftToRight(); - insets.left = scale( leftToRight ? margins.left : margins.right ); - insets.top = scale( margins.top ); - insets.right = scale( leftToRight ? margins.right : margins.left ); - insets.bottom = scale( margins.bottom ); - return insets; - } + Insets m = getStyleFromListUI( c, ui -> ui.cellMargins ); + if( m != null ) + return scaleInsets( c, insets, m.top, m.left, m.bottom, m.right ); + return super.getBorderInsets( c, insets ); } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableCellBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableCellBorder.java index 71427496..76263b12 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableCellBorder.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableCellBorder.java @@ -16,7 +16,6 @@ package com.formdev.flatlaf.ui; -import static com.formdev.flatlaf.util.UIScale.scale; import java.awt.Color; import java.awt.Component; import java.awt.Graphics; @@ -48,15 +47,10 @@ public class FlatTableCellBorder @Override public Insets getBorderInsets( Component c, Insets insets ) { - Insets margins = getStyleFromTableUI( c, ui -> ui.cellMargins ); - if( margins != null ) { - boolean leftToRight = margins.left == margins.right || c.getComponentOrientation().isLeftToRight(); - insets.left = scale( leftToRight ? margins.left : margins.right ); - insets.top = scale( margins.top ); - insets.right = scale( leftToRight ? margins.right : margins.left ); - insets.bottom = scale( margins.bottom ); - return insets; - } + Insets m = getStyleFromTableUI( c, ui -> ui.cellMargins ); + if( m != null ) + return scaleInsets( c, insets, m.top, m.left, m.bottom, m.right ); + return super.getBorderInsets( c, insets ); }