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

moved TestFlatIconNullComponent to other package and fixed file name (issue #483)

Browse Source
This commit is contained in:
Karl Tauber
2022-02-25 15:52:40 +01:00
parent c7fa475128
commit 016e515ae2
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -8,6 +8,7 @@ FlatLaf Change Log
bounds. (issue #477) bounds. (issue #477)
- Repaint component when setting client property `JComponent.outline` (issue - Repaint component when setting client property `JComponent.outline` (issue
#480). #480).
- macOS: Fixed NPE when using some icons in main menu items. (issue #483)
## 2.0.1 ## 2.0.1

7
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java
View File

@@ -573,7 +573,10 @@ public class FlatButtonUI
public static Color buttonStateColor( Component c, Color enabledColor, Color disabledColor, public static Color buttonStateColor( Component c, Color enabledColor, Color disabledColor,
Color focusedColor, Color hoverColor, Color pressedColor ) Color focusedColor, Color hoverColor, Color pressedColor )
{ {
if(c != null && !c.isEnabled() ) if( c == null )
return enabledColor;
if( !c.isEnabled() )
return disabledColor; return disabledColor;
if( c instanceof AbstractButton ) { if( c instanceof AbstractButton ) {
@@ -586,7 +589,7 @@ public class FlatButtonUI
return hoverColor; return hoverColor;
} }
if( c != null && focusedColor != null && isFocusPainted( c ) && FlatUIUtils.isPermanentFocusOwner( c ) ) if( focusedColor != null && isFocusPainted( c ) && FlatUIUtils.isPermanentFocusOwner( c ) )
return focusedColor; return focusedColor;
return enabledColor; return enabledColor;

18
flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatIconNullComponent.java → flatlaf-core/src/test/java/com/formdev/flatlaf/icons/TestFlatIconPaintingNullComponent.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2021 FormDev Software GmbH * Copyright 2022 FormDev Software GmbH
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,15 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package com.formdev.flatlaf.ui; package com.formdev.flatlaf.icons;
import java.awt.Color; import java.awt.Color;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import javax.swing.Icon; import javax.swing.Icon;
import com.formdev.flatlaf.icons.FlatHelpButtonIcon; import com.formdev.flatlaf.ui.TestUtils;
import com.formdev.flatlaf.icons.FlatMenuArrowIcon;
import com.formdev.flatlaf.icons.FlatSearchIcon;
import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@@ -52,16 +50,16 @@ class TestFlatIconPaintingNullComponent
@Test @Test
void flatMenuArrowIcon() { void flatMenuArrowIcon() {
paintWithoutException(new FlatMenuArrowIcon()); paintWithoutException( new FlatMenuArrowIcon() );
} }
@Test @Test
void flatSearchIcon() { void flatSearchIcon() {
paintWithoutException(new FlatSearchIcon()); paintWithoutException( new FlatSearchIcon() );
} }
private void paintWithoutException(Icon icon) { private void paintWithoutException( Icon icon ) {
graphics.clearRect( 0, 0, 32,32 ); graphics.clearRect( 0, 0, 32, 32 );
assertDoesNotThrow(() -> icon.paintIcon( null, graphics, 0, 0 )); assertDoesNotThrow( () -> icon.paintIcon( null, graphics, 0, 0 ) );
} }
} }