From 87b73f26f596ef2c0a2062a5b96fc3acd69c841a Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Wed, 20 May 2020 14:24:22 +0200 Subject: [PATCH] replaced FlatUIUtils.setColor() with deriveColor() for more flexibility --- .../java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java | 4 ++-- .../com/formdev/flatlaf/icons/FlatHelpButtonIcon.java | 4 ++-- .../flatlaf/icons/FlatInternalFrameAbstractIcon.java | 2 +- .../main/java/com/formdev/flatlaf/ui/FlatButtonUI.java | 2 +- .../src/main/java/com/formdev/flatlaf/ui/FlatMenuUI.java | 2 +- .../main/java/com/formdev/flatlaf/ui/FlatSliderUI.java | 6 +++--- .../src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java index 993a003f..fa4199e9 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java @@ -111,13 +111,13 @@ public class FlatCheckBoxIcon paintBorder( g2 ); // paint background - FlatUIUtils.setColor( g2, FlatButtonUI.buttonStateColor( c, + g2.setColor( FlatUIUtils.deriveColor( FlatButtonUI.buttonStateColor( c, selected ? selectedBackground : background, disabledBackground, focusedBackground, selected && selectedHoverBackground != null ? selectedHoverBackground : hoverBackground, selected && selectedPressedBackground != null ? selectedPressedBackground : pressedBackground ), - background ); + background ) ); paintBackground( g2 ); // paint checkmark diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatHelpButtonIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatHelpButtonIcon.java index 13e404b8..bc904470 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatHelpButtonIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatHelpButtonIcon.java @@ -100,12 +100,12 @@ public class FlatHelpButtonIcon g2.fill( new Ellipse2D.Float( focusWidth + 0.5f, focusWidth + 0.5f, 21, 21 ) ); // paint background - FlatUIUtils.setColor( g2, FlatButtonUI.buttonStateColor( c, + g2.setColor( FlatUIUtils.deriveColor( FlatButtonUI.buttonStateColor( c, background, disabledBackground, focusedBackground, hoverBackground, - pressedBackground ), background ); + pressedBackground ), background ) ); g2.fill( new Ellipse2D.Float( focusWidth + 1.5f, focusWidth + 1.5f, 19, 19 ) ); // paint question mark diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatInternalFrameAbstractIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatInternalFrameAbstractIcon.java index cc455c6a..edf0dd7d 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatInternalFrameAbstractIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatInternalFrameAbstractIcon.java @@ -53,7 +53,7 @@ public abstract class FlatInternalFrameAbstractIcon protected void paintBackground( Component c, Graphics2D g ) { Color background = FlatButtonUI.buttonStateColor( c, null, null, null, hoverBackground, pressedBackground ); if( background != null ) { - FlatUIUtils.setColor( g, background, c.getBackground() ); + g.setColor( FlatUIUtils.deriveColor( background, c.getBackground() ) ); g.fillRect( 0, 0, width, height ); } } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java index 32d42b31..1efad7dc 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java @@ -312,7 +312,7 @@ public class FlatButtonUI if( background == startBg && endBg != null && !startBg.equals( endBg ) ) g2.setPaint( new GradientPaint( 0, 0, startBg, 0, height, endBg ) ); else - FlatUIUtils.setColor( g2, background, def ? defaultBackground : c.getBackground() ); + g2.setColor( FlatUIUtils.deriveColor( background, def ? defaultBackground : c.getBackground() ) ); FlatUIUtils.paintComponentBackground( g2, x, y, width, height, focusWidth, arc ); } finally { diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuUI.java index 7ceae19c..5b3cae88 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuUI.java @@ -151,7 +151,7 @@ public class FlatMenuUI if( model.isRollover() && !model.isArmed() && !model.isSelected() && model.isEnabled() && ((JMenu)menuItem).isTopLevelMenu() ) { - FlatUIUtils.setColor( g, hoverBackground, menuItem.getBackground() ); + g.setColor( FlatUIUtils.deriveColor( hoverBackground, menuItem.getBackground() ) ); g.fillRect( 0, 0, menuItem.getWidth(), menuItem.getHeight() ); } else super.paintBackground( g, selectionBackground ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java index 6467f0a0..9115a87e 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java @@ -201,7 +201,7 @@ public class FlatSliderUI } if( coloredTrack != null ) { - FlatUIUtils.setColor( g, FlatUIUtils.isPermanentFocusOwner( slider ) ? focusColor : (hover ? hoverColor : thumbColor), thumbColor ); + g.setColor( FlatUIUtils.deriveColor( FlatUIUtils.isPermanentFocusOwner( slider ) ? focusColor : (hover ? hoverColor : thumbColor), thumbColor ) ); ((Graphics2D)g).fill( coloredTrack ); } @@ -211,10 +211,10 @@ public class FlatSliderUI @Override public void paintThumb( Graphics g ) { - FlatUIUtils.setColor( g, slider.isEnabled() + g.setColor( FlatUIUtils.deriveColor( slider.isEnabled() ? (FlatUIUtils.isPermanentFocusOwner( slider ) ? focusColor : (hover ? hoverColor : thumbColor)) : disabledForeground, - thumbColor ); + thumbColor ) ); if( isRoundThumb() ) g.fillOval( thumbRect.x, thumbRect.y, thumbRect.width, thumbRect.height ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java index f2f34c8d..492f6ba3 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java @@ -194,10 +194,10 @@ public class FlatUIUtils MAC_USE_QUARTZ ? RenderingHints.VALUE_STROKE_PURE : RenderingHints.VALUE_STROKE_NORMALIZE ); } - public static void setColor( Graphics g, Color color, Color baseColor ) { - if( color instanceof DerivedColor ) - color = ((DerivedColor)color).derive( baseColor ); - g.setColor( color ); + public static Color deriveColor( Color color, Color baseColor ) { + return (color instanceof DerivedColor) + ? ((DerivedColor)color).derive( baseColor ) + : color; } /**