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

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
Karl Tauber
2022-01-03 17:05:37 +01:00
parent 0517e4fc02 db66a6c4f0
commit 5c4706cbc9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyleClasses.java
View File

@@ -40,7 +40,7 @@ public class TestFlatStyleClasses
@BeforeAll @BeforeAll
static void setup() { static void setup() {
System.setProperty( FlatSystemProperties.UI_SCALE_ENABLED, "false" ); System.setProperty( FlatSystemProperties.UI_SCALE, "1x" );
TestUtils.setup( false ); TestUtils.setup( false );
UIManager.put( "[style]Button.primary", BUTTON_PRIMARY ); UIManager.put( "[style]Button.primary", BUTTON_PRIMARY );
@@ -100,7 +100,7 @@ public class TestFlatStyleClasses
@AfterAll @AfterAll
static void cleanup() { static void cleanup() {
TestUtils.cleanup(); TestUtils.cleanup();
System.clearProperty( FlatSystemProperties.UI_SCALE_ENABLED ); System.clearProperty( FlatSystemProperties.UI_SCALE );
} }
@Test @Test

2
flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestUtils.java
View File

@@ -30,7 +30,7 @@ import com.formdev.flatlaf.FlatSystemProperties;
*/ */
public class TestUtils public class TestUtils
{ {
public static final float[] FACTORS = new float[] { 1f }; //, 1.25f, 1.5f, 1.75f, 2f, 2.25f, 2.5f, 2.75f, 3f, 3.25f, 3.5f, 3.75f, 4f, 5f, 6f }; public static final float[] FACTORS = new float[] { 1f, 1.25f, 1.5f, 1.75f, 2f, 2.25f, 2.5f, 2.75f, 3f, 3.25f, 3.5f, 3.75f, 4f, 5f, 6f };
public static void setup( boolean withFocus ) { public static void setup( boolean withFocus ) {
System.setProperty( FlatSystemProperties.UI_SCALE, "1x" ); System.setProperty( FlatSystemProperties.UI_SCALE, "1x" );