release 0.31

Table: use color functions

.editorconfig

@@ -6,3 +6,231 @@ insert_final_newline = true
 charset = latin1
 indent_style = tab
 indent_size = 4
+
+[*.java]
+indent_style = tab
+ij_continuation_indent_size = 4
+ij_java_align_consecutive_assignments = false
+ij_java_align_consecutive_variable_declarations = false
+ij_java_align_group_field_declarations = false
+ij_java_align_multiline_annotation_parameters = false
+ij_java_align_multiline_array_initializer_expression = false
+ij_java_align_multiline_assignment = false
+ij_java_align_multiline_binary_operation = false
+ij_java_align_multiline_chained_methods = false
+ij_java_align_multiline_extends_list = false
+ij_java_align_multiline_for = true
+ij_java_align_multiline_method_parentheses = false
+ij_java_align_multiline_parameters = false
+ij_java_align_multiline_parameters_in_calls = false
+ij_java_align_multiline_parenthesized_expression = false
+ij_java_align_multiline_resources = false
+ij_java_align_multiline_ternary_operation = false
+ij_java_align_multiline_text_blocks = false
+ij_java_align_multiline_throws_list = false
+ij_java_align_subsequent_simple_methods = false
+ij_java_align_throws_keyword = false
+ij_java_annotation_parameter_wrap = off
+ij_java_array_initializer_new_line_after_left_brace = false
+ij_java_array_initializer_right_brace_on_new_line = false
+ij_java_array_initializer_wrap = normal
+ij_java_assert_statement_colon_on_next_line = false
+ij_java_assert_statement_wrap = off
+ij_java_assignment_wrap = off
+ij_java_binary_operation_sign_on_next_line = false
+ij_java_binary_operation_wrap = off
+ij_java_blank_lines_after_anonymous_class_header = 0
+ij_java_blank_lines_after_class_header = 0
+ij_java_blank_lines_after_imports = 1
+ij_java_blank_lines_after_package = 1
+ij_java_blank_lines_around_class = 1
+ij_java_blank_lines_around_field = 0
+ij_java_blank_lines_around_field_in_interface = 0
+ij_java_blank_lines_around_initializer = 1
+ij_java_blank_lines_around_method = 1
+ij_java_blank_lines_around_method_in_interface = 1
+ij_java_blank_lines_before_class_end = 0
+ij_java_blank_lines_before_imports = 1
+ij_java_blank_lines_before_method_body = 0
+ij_java_blank_lines_before_package = 0
+ij_java_block_brace_style = next_line_if_wrapped
+ij_java_block_comment_at_first_column = true
+ij_java_call_parameters_new_line_after_left_paren = false
+ij_java_call_parameters_right_paren_on_new_line = false
+ij_java_call_parameters_wrap = normal
+ij_java_case_statement_on_separate_line = true
+ij_java_catch_on_new_line = false
+ij_java_class_annotation_wrap = split_into_lines
+ij_java_class_brace_style = next_line
+ij_java_class_count_to_use_import_on_demand = 99
+ij_java_class_names_in_javadoc = 1
+ij_java_do_not_indent_top_level_class_members = false
+ij_java_do_not_wrap_after_single_annotation = false
+ij_java_do_while_brace_force = never
+ij_java_doc_add_blank_line_after_description = true
+ij_java_doc_add_blank_line_after_param_comments = false
+ij_java_doc_add_blank_line_after_return = false
+ij_java_doc_add_p_tag_on_empty_lines = true
+ij_java_doc_align_exception_comments = true
+ij_java_doc_align_param_comments = true
+ij_java_doc_do_not_wrap_if_one_line = false
+ij_java_doc_enable_formatting = true
+ij_java_doc_enable_leading_asterisks = true
+ij_java_doc_indent_on_continuation = false
+ij_java_doc_keep_empty_lines = true
+ij_java_doc_keep_empty_parameter_tag = true
+ij_java_doc_keep_empty_return_tag = true
+ij_java_doc_keep_empty_throws_tag = true
+ij_java_doc_keep_invalid_tags = true
+ij_java_doc_param_description_on_new_line = false
+ij_java_doc_preserve_line_breaks = false
+ij_java_doc_use_throws_not_exception_tag = true
+ij_java_else_on_new_line = false
+ij_java_enum_constants_wrap = off
+ij_java_extends_keyword_wrap = split_into_lines
+ij_java_extends_list_wrap = normal
+ij_java_field_annotation_wrap = split_into_lines
+ij_java_finally_on_new_line = false
+ij_java_for_brace_force = never
+ij_java_for_statement_new_line_after_left_paren = false
+ij_java_for_statement_right_paren_on_new_line = false
+ij_java_for_statement_wrap = off
+ij_java_generate_final_locals = false
+ij_java_generate_final_parameters = false
+ij_java_if_brace_force = never
+ij_java_imports_layout = java.**,javax.**,*,$*
+ij_java_indent_case_from_switch = true
+ij_java_insert_inner_class_imports = false
+ij_java_insert_override_annotation = true
+ij_java_keep_blank_lines_before_right_brace = 1
+ij_java_keep_blank_lines_between_package_declaration_and_header = 1
+ij_java_keep_blank_lines_in_code = 1
+ij_java_keep_blank_lines_in_declarations = 1
+ij_java_keep_control_statement_in_one_line = false
+ij_java_keep_first_column_comment = false
+ij_java_keep_indents_on_empty_lines = false
+ij_java_keep_line_breaks = false
+ij_java_keep_multiple_expressions_in_one_line = false
+ij_java_keep_simple_blocks_in_one_line = false
+ij_java_keep_simple_classes_in_one_line = false
+ij_java_keep_simple_lambdas_in_one_line = false
+ij_java_keep_simple_methods_in_one_line = false
+ij_java_label_indent_absolute = false
+ij_java_label_indent_size = 0
+ij_java_lambda_brace_style = end_of_line
+ij_java_layout_static_imports_separately = true
+ij_java_line_comment_add_space = false
+ij_java_line_comment_at_first_column = true
+ij_java_method_annotation_wrap = split_into_lines
+ij_java_method_brace_style = next_line_if_wrapped
+ij_java_method_call_chain_wrap = normal
+ij_java_method_parameters_new_line_after_left_paren = false
+ij_java_method_parameters_right_paren_on_new_line = false
+ij_java_method_parameters_wrap = normal
+ij_java_modifier_list_wrap = false
+ij_java_names_count_to_use_import_on_demand = 3
+ij_java_parameter_annotation_wrap = off
+ij_java_parentheses_expression_new_line_after_left_paren = false
+ij_java_parentheses_expression_right_paren_on_new_line = false
+ij_java_place_assignment_sign_on_next_line = false
+ij_java_prefer_longer_names = true
+ij_java_prefer_parameters_wrap = false
+ij_java_repeat_synchronized = true
+ij_java_replace_instanceof_and_cast = false
+ij_java_replace_null_check = true
+ij_java_replace_sum_lambda_with_method_ref = true
+ij_java_resource_list_new_line_after_left_paren = false
+ij_java_resource_list_right_paren_on_new_line = false
+ij_java_resource_list_wrap = normal
+ij_java_space_after_closing_angle_bracket_in_type_argument = false
+ij_java_space_after_colon = true
+ij_java_space_after_comma = true
+ij_java_space_after_comma_in_type_arguments = true
+ij_java_space_after_for_semicolon = true
+ij_java_space_after_quest = true
+ij_java_space_after_type_cast = true
+ij_java_space_before_annotation_array_initializer_left_brace = true
+ij_java_space_before_annotation_parameter_list = false
+ij_java_space_before_array_initializer_left_brace = true
+ij_java_space_before_catch_keyword = true
+ij_java_space_before_catch_left_brace = true
+ij_java_space_before_catch_parentheses = false
+ij_java_space_before_class_left_brace = true
+ij_java_space_before_colon = true
+ij_java_space_before_colon_in_foreach = true
+ij_java_space_before_comma = false
+ij_java_space_before_do_left_brace = true
+ij_java_space_before_else_keyword = true
+ij_java_space_before_else_left_brace = true
+ij_java_space_before_finally_keyword = true
+ij_java_space_before_finally_left_brace = true
+ij_java_space_before_for_left_brace = true
+ij_java_space_before_for_parentheses = false
+ij_java_space_before_for_semicolon = false
+ij_java_space_before_if_left_brace = true
+ij_java_space_before_if_parentheses = false
+ij_java_space_before_method_call_parentheses = false
+ij_java_space_before_method_left_brace = true
+ij_java_space_before_method_parentheses = false
+ij_java_space_before_opening_angle_bracket_in_type_parameter = false
+ij_java_space_before_quest = true
+ij_java_space_before_switch_left_brace = true
+ij_java_space_before_switch_parentheses = false
+ij_java_space_before_synchronized_left_brace = true
+ij_java_space_before_synchronized_parentheses = false
+ij_java_space_before_try_left_brace = true
+ij_java_space_before_try_parentheses = false
+ij_java_space_before_type_parameter_list = false
+ij_java_space_before_while_keyword = true
+ij_java_space_before_while_left_brace = true
+ij_java_space_before_while_parentheses = false
+ij_java_space_inside_one_line_enum_braces = false
+ij_java_space_within_empty_array_initializer_braces = false
+ij_java_space_within_empty_method_call_parentheses = false
+ij_java_space_within_empty_method_parentheses = false
+ij_java_spaces_around_additive_operators = true
+ij_java_spaces_around_assignment_operators = true
+ij_java_spaces_around_bitwise_operators = true
+ij_java_spaces_around_equality_operators = true
+ij_java_spaces_around_lambda_arrow = true
+ij_java_spaces_around_logical_operators = true
+ij_java_spaces_around_method_ref_dbl_colon = false
+ij_java_spaces_around_multiplicative_operators = true
+ij_java_spaces_around_relational_operators = true
+ij_java_spaces_around_shift_operators = true
+ij_java_spaces_around_type_bounds_in_type_parameters = true
+ij_java_spaces_around_unary_operator = false
+ij_java_spaces_within_angle_brackets = false
+ij_java_spaces_within_annotation_parentheses = true
+ij_java_spaces_within_array_initializer_braces = true
+ij_java_spaces_within_braces = false
+ij_java_spaces_within_brackets = false
+ij_java_spaces_within_cast_parentheses = false
+ij_java_spaces_within_catch_parentheses = true
+ij_java_spaces_within_for_parentheses = true
+ij_java_spaces_within_if_parentheses = true
+ij_java_spaces_within_method_call_parentheses = true
+ij_java_spaces_within_method_parentheses = true
+ij_java_spaces_within_parentheses = false
+ij_java_spaces_within_switch_parentheses = true
+ij_java_spaces_within_synchronized_parentheses = true
+ij_java_spaces_within_try_parentheses = true
+ij_java_spaces_within_while_parentheses = true
+ij_java_special_else_if_treatment = true
+ij_java_subclass_name_suffix = Impl
+ij_java_ternary_operation_signs_on_next_line = true
+ij_java_ternary_operation_wrap = on_every_item
+ij_java_test_name_suffix = Test
+ij_java_throws_keyword_wrap = normal
+ij_java_throws_list_wrap = normal
+ij_java_use_external_annotations = false
+ij_java_use_fq_class_names = false
+ij_java_use_relative_indents = false
+ij_java_use_single_class_imports = true
+ij_java_variable_annotation_wrap = off
+ij_java_visibility = public
+ij_java_while_brace_force = never
+ij_java_while_on_new_line = false
+ij_java_wrap_comments = false
+ij_java_wrap_first_method_in_call_chain = false
+ij_java_wrap_long_lines = false

.travis.yml

@@ -19,11 +19,21 @@ before_install:
   - ./gradlew --version
   - java -version
 
-deploy:
-  provider: script
-  script: ./gradlew bintrayUpload
-  skip_cleanup: true # to upload artifacts created during the build
-  on:
-    branch: master
-    jdk: openjdk11
-    tags: true
+stages:
+  - name: test
+  - name: snapshot
+    if: branch = master AND type IN (push) AND tag IS blank
+  - name: release
+    if: type IN (push) AND tag IS present
+
+jobs:
+  include:
+    # publish snapshot to oss.jfrog.org
+    - stage: snapshot
+      jdk: openjdk11
+      script: ./gradlew artifactoryPublish
+
+    # release a new stable version to bintray
+    - stage: release
+      jdk: openjdk11
+      script: ./gradlew bintrayUpload -Drelease=true

CHANGELOG.md

@@ -1,6 +1,77 @@
 FlatLaf Change Log
 ==================
 
+## 0.31
+
+- Focus indication border (or background) no longer hidden when temporary
+  loosing focus (e.g. showing a popup menu).
+- List, Table and Tree: Item selection color of focused components no longer
+  change from blue to gray when temporary loosing focus (e.g. showing a popup
+  menu).
+
+
+## 0.30
+
+- Windows: Fixed rendering of Unicode characters. Previously not all Unicode
+  characters were rendered on Windows. (issue #81)
+
+
+## 0.29
+
+- Linux: Fixed scaling if `GDK_SCALE` environment variable is set or if running
+  on JetBrains Runtime. (issue #69)
+- Tree: Fixed repainting wide selection on focus gained/lost.
+- ComboBox: No longer ignore `JComboBox.prototypeDisplayValue` when computing
+  popup width. (issue #80)
+- Support changing default font used for all components with automatic scaling
+  UI if using larger font. Use `UIManager.put( "defaultFont", myFont );`
+- No longer use system property `sun.java2d.uiScale`. (Java 8 only)
+- Support specifying custom scale factor in system property `flatlaf.uiScale`
+  also for Java 9 and later.
+- Demo: Support using own FlatLaf themes (`.properties` files) that are located
+  in working directory of Demo application. Shown in the "Themes" list under
+  category "Current Directory".
+
+
+## 0.28
+
+- PasswordField: Warn about enabled Caps Lock.
+- TabbedPane: Support <kbd>Ctrl+TAB</kbd> / <kbd>Ctrl+Shift+TAB</kbd> to switch
+  to next / previous tab.
+- TextField, FormattedTextField and PasswordField: Support round borders (see UI
+  default value `TextComponent.arc`). (issue #65)
+- IntelliJ Themes: Added Gradianto themes to demo.
+- Button, CheckBox and RadioButton: Fixed NPE when button has children. (PR #68)
+- ScrollBar: Improved colors.
+- Reviewed (and tested) all key bindings on Windows and macOS. Linux key
+  bindings are equal to Windows key bindings. macOS key bindings are slightly
+  different for platform specific behavior.
+- UI default values are no longer based on Metal/Aqua UI defaults.
+
+
+## 0.27
+
+- Support `JInternalFrame` and `JDesktopPane`. (issues #39 and #11)
+- Table: Support positioning the column sort arrow in header right, left, top or
+  bottom. (issue #34)
+- ProgressBar: Fixed visual artifacts in indeterminate mode, on HiDPI screens at
+  125%, 150% and 175% scaling, when the progress moves around.
+- TabbedPane: New option to allow tab separators to take full height (to enable
+  use `UIManager.put( "TabbedPane.tabSeparatorsFullHeight", true );`). (issue
+  #59, PR #62)
+- CheckBox and RadioButton: Do not fill background if `contentAreaFilled` is
+  `false`. (issue #58, PR #63)
+- ToggleButton: Make toggle button square if it has an icon but no text or text
+  is "..." or a single character.
+- ToolBar: No longer use special rollover border for buttons in toolbar. (issue
+  #36)
+- ToolBar: Added empty space around buttons in toolbar and toolbar itself (see
+  UI default values `Button.toolbar.spacingInsets` and `ToolBar.borderMargins`).
+  (issue #56)
+- Fixed "illegal reflective access operation" warning on macOS when using Java
+  12 or later. (issue #60, PR #61)
+
+
 ## 0.26
 
 - Menus:

README.md

@@ -52,6 +52,19 @@ Otherwise download `flatlaf-<version>.jar` here:
 [![Download](https://api.bintray.com/packages/jformdesigner/flatlaf/flatlaf/images/download.svg)](https://bintray.com/jformdesigner/flatlaf/flatlaf/_latestVersion)
 
 
+### Snapshots
+
+FlatLaf snapshot binaries are available in
+[JFrog Artifactory](https://oss.jfrog.org/artifactory/oss-snapshot-local/com/formdev/).
+To access the latest snapshot, change the FlatLaf version(s) in the dependencies
+to `<version>-SNAPSHOT` (e.g. `0.27-SNAPSHOT`) and add the repository
+`https://oss.jfrog.org/artifactory/oss-snapshot-local` to your build (see
+[Maven](https://maven.apache.org/guides/mini/guide-multiple-repositories.html)
+and
+[Gradle](https://docs.gradle.org/current/userguide/declaring_repositories.html#sec:declaring_custom_repository)
+docs).
+
+
 Addons
 ------
 
@@ -59,6 +72,41 @@ Addons
 - [JIDE Common Layer](flatlaf-jide-oss)
 
 
+Projects using FlatLaf
+----------------------
+
+- [NetBeans](https://netbeans.apache.org/) 11.3
+- [jclasslib bytecode viewer](https://github.com/ingokegel/jclasslib) 5.5
+- [KeyStore Explorer](https://keystore-explorer.org/) 5.4.3
+- [OWASP Zed Attack Proxy (ZAP)](https://www.zaproxy.org/) (in weekly releases)
+- [XMLmind XML Editor](https://www.xmlmind.com/xmleditor/) 9.3 (commercial)
+- [Total Validator](https://www.totalvalidator.com/) 15 (commercial)
+- [j-lawyer](https://github.com/jlawyerorg/j-lawyer-org)
+- [MegaMek](https://github.com/MegaMek/megamek) v0.47.4 and
+  [MekHQ](https://github.com/MegaMek/mekhq) v0.47.5
+- [GUIslice Builder](https://github.com/ImpulseAdventure/GUIslice-Builder)
+  0.13.b024
+- [Rest Suite](https://github.com/supanadit/restsuite)
+- [ControllerBuddy](https://github.com/bwRavencl/ControllerBuddy)
+- [SpringRemote](https://github.com/HaleyWang/SpringRemote)
+- [mendelson AS2](https://sourceforge.net/projects/mec-as2/),
+  [AS4](https://sourceforge.net/projects/mendelson-as4/) and
+  [OFTP2](https://sourceforge.net/projects/mendelson-oftp2/) (open-source) and
+  [mendelson AS2](https://mendelson-e-c.com/as2/),
+  [AS4](https://mendelson-e-c.com/as4/) and
+  [OFTP2](https://mendelson-e-c.com/oftp2) (commercial)
+- [MeteoInfo](https://github.com/meteoinfo/MeteoInfo) 2.1.6
+- [lsfusion platform](https://github.com/lsfusion/platform)
+- and more...
+
+
+Buzz
+----
+
+- [What others say about FlatLaf on Twitter](https://twitter.com/search?f=live&q=flatlaf)
+- [FlatLaf announcement on Reddit](https://www.reddit.com/r/java/comments/dl0hu3/flatlaf_flat_look_and_feel/)
+
+
 Documentation
 -------------
 

build.gradle.kts

@@ -14,9 +14,14 @@
  * limitations under the License.
  */
 
-version = "0.26"
+val releaseVersion = "0.31"
+val developmentVersion = "0.32-SNAPSHOT"
+
+version = if( java.lang.Boolean.getBoolean( "release" ) ) releaseVersion else developmentVersion
 
 allprojects {
+	version = rootProject.version
+
 	repositories {
 		jcenter()
 	}
@@ -33,3 +38,39 @@ println( "FlatLaf Version: ${version}" )
 println( "Gradle ${gradle.gradleVersion} at ${gradle.gradleHomeDir}" )
 println( "Java ${System.getProperty( "java.version" )}" )
 println()
+
+
+extra["bintray.user"] = System.getenv( "BINTRAY_USER" ) ?: System.getProperty( "bintray.user" )
+extra["bintray.key"]  = System.getenv( "BINTRAY_KEY" )  ?: System.getProperty( "bintray.key" )
+
+// if true, do not upload to bintray
+extra["bintray.dryRun"] = false
+
+// if true, uploaded artifacts are visible to all
+// if false, only visible to owner when logged into bintray
+extra["bintray.publish"] = true
+
+
+allprojects {
+	tasks {
+		withType<JavaCompile>().configureEach {
+			sourceCompatibility = "1.8"
+			targetCompatibility = "1.8"
+
+			options.encoding = "ISO-8859-1"
+		}
+
+		withType<Jar>().configureEach {
+			// manifest for all created JARs
+			manifest.attributes(mapOf(
+				"Implementation-Vendor" to "FormDev Software GmbH",
+				"Implementation-Copyright" to "Copyright (C) ${java.time.LocalDate.now().year} FormDev Software GmbH. All rights reserved.",
+				"Implementation-Version" to project.version))
+
+			// add META-INF/LICENSE to all created JARs
+			from("${rootDir}/LICENSE") {
+				into("META-INF")
+			}
+		}
+	}
+}

flatlaf-core/build.gradle.kts

@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-version = rootProject.version
-
 plugins {
 	`java-library`
 	`maven-publish`
-	id( "com.jfrog.bintray" ) version "1.8.4"
+	id( "com.jfrog.bintray" )
+	id( "com.jfrog.artifactory" )
 }
 
 if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
@@ -34,11 +33,6 @@ if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
 	}
 }
 
-java {
-	sourceCompatibility = JavaVersion.VERSION_1_8
-	targetCompatibility = JavaVersion.VERSION_1_8
-}
-
 tasks {
 	assemble {
 		dependsOn(
@@ -53,7 +47,7 @@ tasks {
 			targetCompatibility = "9"
 		}
 	}
-	
+
 	jar {
 		archiveBaseName.set( "flatlaf" )
 
@@ -128,8 +122,8 @@ publishing {
 }
 
 bintray {
-	user = System.getenv( "BINTRAY_USER" ) ?: System.getProperty( "bintray.user" )
-	key = System.getenv( "BINTRAY_KEY" ) ?: System.getProperty( "bintray.key" )
+	user = rootProject.extra["bintray.user"] as String?
+	key = rootProject.extra["bintray.key"] as String?
 
 	setPublications( "maven" )
 
@@ -143,6 +137,29 @@ bintray {
 			name = project.version.toString()
 		}
 
-		publish = true
+		publish = rootProject.extra["bintray.publish"] as Boolean
+		dryRun = rootProject.extra["bintray.dryRun"] as Boolean
 	}
 }
+
+artifactory {
+	setContextUrl( "https://oss.jfrog.org" )
+
+	publish( closureOf<org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig> {
+		repository( delegateClosureOf<groovy.lang.GroovyObject> {
+			setProperty( "repoKey", "oss-snapshot-local" )
+			setProperty( "username", rootProject.extra["bintray.user"] as String? )
+			setProperty( "password", rootProject.extra["bintray.key"] as String? )
+		} )
+
+		defaults( delegateClosureOf<groovy.lang.GroovyObject> {
+			invokeMethod( "publications", "maven" )
+			setProperty( "publishArtifacts", true )
+			setProperty( "publishPom", true )
+		} )
+	} )
+
+	resolve( delegateClosureOf<org.jfrog.gradle.plugin.artifactory.dsl.ResolverConfig> {
+		setProperty( "repoKey", "jcenter" )
+	} )
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/FlatDefaultsAddon.java

@@ -17,6 +17,8 @@
 package com.formdev.flatlaf;
 
 import java.io.InputStream;
+import javax.swing.LookAndFeel;
+import javax.swing.UIDefaults;
 
 /**
  * Addon for FlatLaf UI defaults.
@@ -50,6 +52,13 @@ public abstract class FlatDefaultsAddon
 		return addonClass.getResourceAsStream( propertiesName );
 	}
 
+	/**
+	 * Allows modifying UI defaults after loading UI defaults.
+	 * The default implementation does nothing.
+	 */
+	public void afterDefaultsLoading( LookAndFeel laf, UIDefaults defaults ) {
+	}
+
 	/**
 	 * Returns the priority used to sort addon loading.
 	 * The order is only important if you want overwrite UI defaults of other addons.

flatlaf-core/src/main/java/com/formdev/flatlaf/FlatInputMaps.java

@@ -0,0 +1,639 @@
+/*
+ * Copyright 2020 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf;
+
+import javax.swing.InputMap;
+import javax.swing.JTextField;
+import javax.swing.KeyStroke;
+import javax.swing.LookAndFeel;
+import javax.swing.UIDefaults;
+import javax.swing.UIDefaults.LazyValue;
+import javax.swing.plaf.InputMapUIResource;
+import com.formdev.flatlaf.util.SystemInfo;
+import static javax.swing.text.DefaultEditorKit.*;
+
+/**
+ * @author Karl Tauber
+ */
+class FlatInputMaps
+{
+	static void initInputMaps( UIDefaults defaults ) {
+		initBasicInputMaps( defaults );
+		initTextComponentInputMaps( defaults );
+
+		if( SystemInfo.IS_MAC )
+			initMacInputMaps( defaults );
+	}
+
+	private static void initBasicInputMaps( UIDefaults defaults ) {
+		defaults.put( "Button.focusInputMap", new UIDefaults.LazyInputMap( new Object[] {
+			"SPACE", "pressed",
+			"released SPACE", "released"
+		} ) );
+
+		modifyInputMap( defaults, "ComboBox.ancestorInputMap",
+			"SPACE", "spacePopup",
+
+			"UP", mac( "selectPrevious2", "selectPrevious" ),
+			"DOWN", mac( "selectNext2", "selectNext" ),
+			"KP_UP", mac( "selectPrevious2", "selectPrevious" ),
+			"KP_DOWN", mac( "selectNext2", "selectNext" ),
+
+			mac( "alt UP", null ), "togglePopup",
+			mac( "alt DOWN", null ), "togglePopup",
+			mac( "alt KP_UP", null ), "togglePopup",
+			mac( "alt KP_DOWN", null ), "togglePopup"
+		);
+
+		if( !SystemInfo.IS_MAC ) {
+			modifyInputMap( defaults, "FileChooser.ancestorInputMap",
+				"F2", "editFileName",
+				"BACK_SPACE", "Go Up"
+			);
+		}
+
+		// join ltr and rtl bindings to fix up/down/etc keys in right-to-left component orientation
+		Object[] bindings = (Object[]) defaults.get( "PopupMenu.selectedWindowInputMapBindings" );
+		Object[] rtlBindings = (Object[]) defaults.get( "PopupMenu.selectedWindowInputMapBindings.RightToLeft" );
+		if( bindings != null && rtlBindings != null ) {
+			Object[] newBindings = new Object[bindings.length + rtlBindings.length];
+			System.arraycopy( bindings, 0, newBindings, 0, bindings.length );
+			System.arraycopy( rtlBindings, 0, newBindings, bindings.length, rtlBindings.length );
+			defaults.put( "PopupMenu.selectedWindowInputMapBindings.RightToLeft", newBindings );
+		}
+
+		modifyInputMap( defaults, "TabbedPane.ancestorInputMap",
+			"ctrl TAB", "navigateNext",
+			"shift ctrl TAB", "navigatePrevious"
+		);
+
+		modifyInputMap( defaults, "Table.ancestorInputMap",
+			// swap to make it consistent with List and Tree
+			"HOME", "selectFirstRow",
+			"END", "selectLastRow",
+			mac( "ctrl HOME", null ), "selectFirstColumn",
+			mac( "ctrl END", null ), "selectLastColumn"
+		);
+
+		if( !SystemInfo.IS_MAC ) {
+			modifyInputMap( defaults, "Tree.focusInputMap",
+				"ADD", "expand",
+				"SUBTRACT", "collapse"
+			);
+		}
+	}
+
+	private static void initTextComponentInputMaps( UIDefaults defaults ) {
+		Object[] commonTextComponentBindings = {
+			// move caret one character (without selecting text)
+			"LEFT", backwardAction,
+			"RIGHT", forwardAction,
+			"KP_LEFT", backwardAction,
+			"KP_RIGHT", forwardAction,
+
+			// move caret one character and select text
+			"shift LEFT", selectionBackwardAction,
+			"shift RIGHT", selectionForwardAction,
+			"shift KP_LEFT", selectionBackwardAction,
+			"shift KP_RIGHT", selectionForwardAction,
+
+			// move caret to word (without selecting text)
+			mac( "ctrl LEFT", "alt LEFT" ), previousWordAction,
+			mac( "ctrl RIGHT", "alt RIGHT" ), nextWordAction,
+			mac( "ctrl KP_LEFT", "alt KP_LEFT" ), previousWordAction,
+			mac( "ctrl KP_RIGHT", "alt KP_RIGHT" ), nextWordAction,
+
+			// move caret to word and select text
+			mac( "ctrl shift LEFT", "shift alt LEFT" ), selectionPreviousWordAction,
+			mac( "ctrl shift RIGHT", "shift alt RIGHT" ), selectionNextWordAction,
+			mac( "ctrl shift KP_LEFT", "shift alt KP_LEFT" ), selectionPreviousWordAction,
+			mac( "ctrl shift KP_RIGHT", "shift alt KP_RIGHT" ), selectionNextWordAction,
+
+			// move caret to line begin/end (without selecting text)
+			mac( "HOME", "meta LEFT" ), beginLineAction,
+			mac( "END", "meta RIGHT" ), endLineAction,
+
+			// move caret to line begin/end and select text
+			mac( "shift HOME", "shift meta LEFT" ), selectionBeginLineAction,
+			mac( "shift END", "shift meta RIGHT" ), selectionEndLineAction,
+
+			// select all/none
+			mac( "ctrl A", "meta A" ), selectAllAction,
+			mac( "ctrl BACK_SLASH", "meta BACK_SLASH" ), "unselect", // DefaultEditorKit.unselectAction
+
+			// delete previous/next character
+			"BACK_SPACE", deletePrevCharAction,
+			"shift BACK_SPACE", deletePrevCharAction,
+			"ctrl H", deletePrevCharAction,
+			"DELETE", deleteNextCharAction,
+
+			// delete previous/next word
+			mac( "ctrl BACK_SPACE", "alt BACK_SPACE" ), deletePrevWordAction,
+			mac( "ctrl DELETE", "alt DELETE" ), deleteNextWordAction,
+
+			// clipboard
+			mac( "ctrl X", "meta X" ), cutAction,
+			mac( "ctrl C", "meta C" ), copyAction,
+			mac( "ctrl V", "meta V" ), pasteAction,
+			"CUT", cutAction,
+			"COPY", copyAction,
+			"PASTE", pasteAction,
+			mac( "shift DELETE", null ), cutAction,
+			mac( "control INSERT", null ), copyAction,
+			mac( "shift INSERT", null ), pasteAction,
+
+			// misc
+			"control shift O", "toggle-componentOrientation", // DefaultEditorKit.toggleComponentOrientation
+		};
+
+		Object[] macCommonTextComponentBindings = SystemInfo.IS_MAC ? new Object[] {
+			// move caret one character (without selecting text)
+			"ctrl B", backwardAction,
+			"ctrl F", forwardAction,
+
+			// move caret to document begin/end (without selecting text)
+			"HOME", beginAction,
+			"END", endAction,
+			"meta UP", beginAction,
+			"meta DOWN", endAction,
+			"meta KP_UP", beginAction,
+			"meta KP_DOWN", endAction,
+			"ctrl P", beginAction,
+			"ctrl N", endAction,
+			"ctrl V", endAction,
+
+			// move caret to line begin/end (without selecting text)
+			"meta KP_LEFT", beginLineAction,
+			"meta KP_RIGHT", endLineAction,
+			"ctrl A", beginLineAction,
+			"ctrl E", endLineAction,
+
+			// move caret to document begin/end and select text
+			"shift meta UP", selectionBeginAction,
+			"shift meta DOWN", selectionEndAction,
+			"shift meta KP_UP", selectionBeginAction,
+			"shift meta KP_DOWN", selectionEndAction,
+			"shift HOME", selectionBeginAction,
+			"shift END", selectionEndAction,
+
+			// move caret to line begin/end and select text
+			"shift meta KP_LEFT", selectionBeginLineAction,
+			"shift meta KP_RIGHT", selectionEndLineAction,
+			"shift UP", selectionBeginLineAction,
+			"shift DOWN", selectionEndLineAction,
+			"shift KP_UP", selectionBeginLineAction,
+			"shift KP_DOWN", selectionEndLineAction,
+
+			// delete previous/next word
+			"ctrl W", deletePrevWordAction,
+			"ctrl D", deleteNextCharAction,
+		} : null;
+
+		Object[] singleLineTextComponentBindings = {
+			"ENTER", JTextField.notifyAction,
+		};
+
+		Object[] macSingleLineTextComponentBindings = SystemInfo.IS_MAC ? new Object[] {
+			// move caret to line begin/end (without selecting text)
+			"UP", beginLineAction,
+			"DOWN", endLineAction,
+			"KP_UP", beginLineAction,
+			"KP_DOWN", endLineAction,
+		} : null;
+
+		Object[] formattedTextComponentBindings = {
+			// reset
+			"ESCAPE", "reset-field-edit",
+
+			// increment/decrement
+			"UP", "increment",
+			"DOWN", "decrement",
+			"KP_UP", "increment",
+			"KP_DOWN", "decrement",
+		};
+
+		Object[] passwordTextComponentBindings = {
+			// move caret to line begin/end (without selecting text)
+			mac( "ctrl LEFT", "alt LEFT" ), beginLineAction,
+			mac( "ctrl RIGHT", "alt RIGHT" ), endLineAction,
+			mac( "ctrl KP_LEFT", "alt KP_LEFT" ), beginLineAction,
+			mac( "ctrl KP_RIGHT", "alt KP_RIGHT" ), endLineAction,
+
+			// move caret to line begin/end and select text
+			mac( "ctrl shift LEFT", "shift alt LEFT" ), selectionBeginLineAction,
+			mac( "ctrl shift RIGHT", "shift alt RIGHT" ), selectionEndLineAction,
+			mac( "ctrl shift KP_LEFT", "shift alt KP_LEFT" ), selectionBeginLineAction,
+			mac( "ctrl shift KP_RIGHT", "shift alt KP_RIGHT" ), selectionEndLineAction,
+
+			// delete previous/next word
+			mac( "ctrl BACK_SPACE", "alt BACK_SPACE" ), null,
+			mac( "ctrl DELETE", "alt DELETE" ), null,
+		};
+
+		Object[] multiLineTextComponentBindings = {
+			// move caret one line (without selecting text)
+			"UP", upAction,
+			"DOWN", downAction,
+			"KP_UP", upAction,
+			"KP_DOWN", downAction,
+
+			// move caret one line and select text
+			"shift UP", selectionUpAction,
+			"shift DOWN", selectionDownAction,
+			"shift KP_UP", selectionUpAction,
+			"shift KP_DOWN", selectionDownAction,
+
+			// move caret one page (without selecting text)
+			"PAGE_UP", pageUpAction,
+			"PAGE_DOWN", pageDownAction,
+
+			// move caret one page and select text
+			"shift PAGE_UP", "selection-page-up", // DefaultEditorKit.selectionPageUpAction
+			"shift PAGE_DOWN", "selection-page-down", // DefaultEditorKit.selectionPageDownAction
+			mac( "ctrl shift PAGE_UP", "shift meta PAGE_UP" ), "selection-page-left", // DefaultEditorKit.selectionPageLeftAction
+			mac( "ctrl shift PAGE_DOWN", "shift meta PAGE_DOWN" ), "selection-page-right", // DefaultEditorKit.selectionPageRightAction
+
+			// move caret to document begin/end (without selecting text)
+			mac( "ctrl HOME", "meta UP" ), beginAction,
+			mac( "ctrl END", "meta DOWN" ), endAction,
+
+			// move caret to document begin/end and select text
+			mac( "ctrl shift HOME", "shift meta UP" ), selectionBeginAction,
+			mac( "ctrl shift END", "shift meta DOWN" ), selectionEndAction,
+
+			// misc
+			"ENTER", insertBreakAction,
+			"TAB", insertTabAction,
+
+			// links
+			mac( "ctrl T", "meta T" ), "next-link-action",
+			mac( "ctrl shift T", "shift meta T" ), "previous-link-action",
+			mac( "ctrl SPACE", "meta SPACE" ), "activate-link-action",
+		};
+
+		Object[] macMultiLineTextComponentBindings = SystemInfo.IS_MAC ? new Object[] {
+			// move caret one line (without selecting text)
+			"ctrl N", downAction,
+			"ctrl P", upAction,
+
+			// move caret to beginning/end of paragraph and select text
+			"shift alt UP", selectionBeginParagraphAction,
+			"shift alt DOWN", selectionEndParagraphAction,
+			"shift alt KP_UP", selectionBeginParagraphAction,
+			"shift alt KP_DOWN", selectionEndParagraphAction,
+
+			// move caret one page (without selecting text)
+			"ctrl V", pageDownAction,
+		} : null;
+
+		defaults.put( "TextField.focusInputMap", new LazyInputMapEx(
+			commonTextComponentBindings,
+			macCommonTextComponentBindings,
+			singleLineTextComponentBindings,
+			macSingleLineTextComponentBindings
+		) );
+		defaults.put( "FormattedTextField.focusInputMap", new LazyInputMapEx(
+			commonTextComponentBindings,
+			macCommonTextComponentBindings,
+			singleLineTextComponentBindings,
+			macSingleLineTextComponentBindings,
+			formattedTextComponentBindings
+		) );
+		defaults.put( "PasswordField.focusInputMap", new LazyInputMapEx(
+			commonTextComponentBindings,
+			macCommonTextComponentBindings,
+			singleLineTextComponentBindings,
+			macSingleLineTextComponentBindings,
+			passwordTextComponentBindings
+		) );
+
+		Object multiLineInputMap = new LazyInputMapEx(
+			commonTextComponentBindings,
+			macCommonTextComponentBindings,
+			multiLineTextComponentBindings,
+			macMultiLineTextComponentBindings
+		);
+		defaults.put( "TextArea.focusInputMap", multiLineInputMap );
+		defaults.put( "TextPane.focusInputMap", multiLineInputMap );
+		defaults.put( "EditorPane.focusInputMap", multiLineInputMap );
+	}
+
+	private static void initMacInputMaps( UIDefaults defaults ) {
+		// list
+		modifyInputMap( defaults, "List.focusInputMap",
+			"meta A", "selectAll",
+			"meta C", "copy",
+			"meta V", "paste",
+			"meta X", "cut",
+
+			// let parent scroll pane do the macOS typical scrolling without changing selection
+			"HOME", null,
+			"END", null,
+			"PAGE_UP", null,
+			"PAGE_DOWN", null,
+
+			"ctrl A", null,
+			"ctrl BACK_SLASH", null,
+			"ctrl C", null,
+			"ctrl DOWN", null,
+			"ctrl END", null,
+			"ctrl HOME", null,
+			"ctrl INSERT", null,
+			"ctrl KP_DOWN", null,
+			"ctrl KP_LEFT", null,
+			"ctrl KP_RIGHT", null,
+			"ctrl KP_UP", null,
+			"ctrl LEFT", null,
+			"ctrl PAGE_DOWN", null,
+			"ctrl PAGE_UP", null,
+			"ctrl RIGHT", null,
+			"ctrl SLASH", null,
+			"ctrl SPACE", null,
+			"ctrl UP", null,
+			"ctrl V", null,
+			"ctrl X", null,
+			"SPACE", null,
+			"shift ctrl DOWN", null,
+			"shift ctrl END", null,
+			"shift ctrl HOME", null,
+			"shift ctrl KP_DOWN", null,
+			"shift ctrl KP_LEFT", null,
+			"shift ctrl KP_RIGHT", null,
+			"shift ctrl KP_UP", null,
+			"shift ctrl LEFT", null,
+			"shift ctrl PAGE_DOWN", null,
+			"shift ctrl PAGE_UP", null,
+			"shift ctrl RIGHT", null,
+			"shift ctrl SPACE", null,
+			"shift ctrl UP", null,
+			"shift DELETE", null,
+			"shift INSERT", null,
+			"shift SPACE", null
+		);
+		modifyInputMap( defaults, "List.focusInputMap.RightToLeft",
+			"ctrl KP_LEFT", null,
+			"ctrl KP_RIGHT", null,
+			"ctrl LEFT", null,
+			"ctrl RIGHT", null,
+			"shift ctrl KP_LEFT", null,
+			"shift ctrl KP_RIGHT", null,
+			"shift ctrl LEFT", null,
+			"shift ctrl RIGHT", null
+		);
+
+		// scrollpane
+		modifyInputMap( defaults, "ScrollPane.ancestorInputMap",
+			"END", "scrollEnd",
+			"HOME", "scrollHome",
+
+			"ctrl END", null,
+			"ctrl HOME", null,
+			"ctrl PAGE_DOWN", null,
+			"ctrl PAGE_UP", null
+		);
+		modifyInputMap( defaults, "ScrollPane.ancestorInputMap.RightToLeft",
+			"ctrl PAGE_DOWN", null,
+			"ctrl PAGE_UP", null
+		);
+
+		// tabbedpane
+		modifyInputMap( defaults, "TabbedPane.ancestorInputMap",
+			"ctrl UP", null,
+			"ctrl KP_UP", null
+		);
+		modifyInputMap( defaults, "TabbedPane.focusInputMap",
+			"ctrl DOWN", null,
+			"ctrl KP_DOWN", null
+		);
+
+		// table
+		modifyInputMap( defaults, "Table.ancestorInputMap",
+			"alt TAB", "focusHeader",
+			"shift alt TAB", "focusHeader",
+			"meta A", "selectAll",
+			"meta C", "copy",
+			"meta V", "paste",
+			"meta X", "cut",
+
+			// let parent scroll pane do the macOS typical scrolling without changing selection
+			"HOME", null,
+			"END", null,
+			"PAGE_UP", null,
+			"PAGE_DOWN", null,
+
+			"ctrl A", null,
+			"ctrl BACK_SLASH", null,
+			"ctrl C", null,
+			"ctrl DOWN", null,
+			"ctrl END", null,
+			"ctrl HOME", null,
+			"ctrl INSERT", null,
+			"ctrl KP_DOWN", null,
+			"ctrl KP_LEFT", null,
+			"ctrl KP_RIGHT", null,
+			"ctrl KP_UP", null,
+			"ctrl LEFT", null,
+			"ctrl PAGE_DOWN", null,
+			"ctrl PAGE_UP", null,
+			"ctrl RIGHT", null,
+			"ctrl SLASH", null,
+			"ctrl SPACE", null,
+			"ctrl UP", null,
+			"ctrl V", null,
+			"ctrl X", null,
+			"F2", null,
+			"F8", null,
+			"SPACE", null,
+			"shift ctrl DOWN", null,
+			"shift ctrl END", null,
+			"shift ctrl HOME", null,
+			"shift ctrl KP_DOWN", null,
+			"shift ctrl KP_LEFT", null,
+			"shift ctrl KP_RIGHT", null,
+			"shift ctrl KP_UP", null,
+			"shift ctrl LEFT", null,
+			"shift ctrl PAGE_DOWN", null,
+			"shift ctrl PAGE_UP", null,
+			"shift ctrl RIGHT", null,
+			"shift ctrl SPACE", null,
+			"shift ctrl UP", null,
+			"shift DELETE", null,
+			"shift INSERT", null,
+			"shift SPACE", null
+		);
+		modifyInputMap( defaults, "Table.ancestorInputMap.RightToLeft",
+			"ctrl KP_LEFT", null,
+			"ctrl KP_RIGHT", null,
+			"ctrl LEFT", null,
+			"ctrl RIGHT", null,
+			"shift ctrl KP_LEFT", null,
+			"shift ctrl KP_RIGHT", null,
+			"shift ctrl LEFT", null,
+			"shift ctrl RIGHT", null
+		);
+
+		// tree node expanding/collapsing
+		modifyInputMap( defaults, "Tree.focusInputMap",
+			"LEFT", "selectParent",
+			"RIGHT", "selectChild",
+			"KP_LEFT", "selectParent",
+			"KP_RIGHT", "selectChild",
+			"shift LEFT", "selectParent",
+			"shift RIGHT", "selectChild",
+			"shift KP_LEFT", "selectParent",
+			"shift KP_RIGHT", "selectChild",
+			"alt LEFT", "selectParent",
+			"alt RIGHT", "selectChild",
+			"alt KP_LEFT", "selectParent",
+			"alt KP_RIGHT", "selectChild",
+
+		    "meta A", "selectAll",
+		    "meta C", "copy",
+		    "meta V", "paste",
+		    "meta X", "cut",
+
+			// let parent scroll pane do the macOS typical scrolling without changing selection
+			"HOME", null,
+			"END", null,
+			"PAGE_UP", null,
+			"PAGE_DOWN", null,
+
+		    "ctrl LEFT", null,
+			"ctrl RIGHT", null,
+			"ctrl KP_LEFT", null,
+			"ctrl KP_RIGHT", null,
+
+			"ctrl A", null,
+			"ctrl BACK_SLASH", null,
+			"ctrl C", null,
+			"ctrl DOWN", null,
+			"ctrl END", null,
+			"ctrl HOME", null,
+			"ctrl INSERT", null,
+			"ctrl KP_DOWN", null,
+			"ctrl KP_UP", null,
+			"ctrl PAGE_DOWN", null,
+			"ctrl PAGE_UP", null,
+			"ctrl SLASH", null,
+			"ctrl SPACE", null,
+			"ctrl UP", null,
+			"ctrl V", null,
+			"ctrl X", null,
+			"F2", null,
+			"SPACE", null,
+			"shift ctrl DOWN", null,
+			"shift ctrl END", null,
+			"shift ctrl HOME", null,
+			"shift ctrl KP_DOWN", null,
+			"shift ctrl KP_UP", null,
+			"shift ctrl PAGE_DOWN", null,
+			"shift ctrl PAGE_UP", null,
+			"shift ctrl SPACE", null,
+			"shift ctrl UP", null,
+			"shift DELETE", null,
+			"shift END", null,
+			"shift HOME", null,
+			"shift INSERT", null,
+			"shift PAGE_DOWN", null,
+			"shift PAGE_UP", null,
+			"shift SPACE", null
+		);
+		defaults.put( "Tree.focusInputMap.RightToLeft", new UIDefaults.LazyInputMap( new Object[] {
+			"LEFT", "selectChild",
+			"RIGHT", "selectParent",
+			"KP_LEFT", "selectChild",
+			"KP_RIGHT", "selectParent",
+			"shift LEFT", "selectChild",
+			"shift RIGHT", "selectParent",
+			"shift KP_LEFT", "selectChild",
+			"shift KP_RIGHT", "selectParent",
+			"alt LEFT", "selectChild",
+			"alt RIGHT", "selectParent",
+			"alt KP_LEFT", "selectChild",
+			"alt KP_RIGHT", "selectParent"
+		} ) );
+	}
+
+	private static void modifyInputMap( UIDefaults defaults, String key, Object... bindings ) {
+		// Note: not using `defaults.get(key)` here because this would resolve the lazy value
+		defaults.put( key, new LazyModifyInputMap( defaults.remove( key ), bindings ) );
+	}
+
+	private static <T> T mac( T value, T macValue ) {
+		return SystemInfo.IS_MAC ? macValue : value;
+	}
+
+	//---- class LazyInputMapEx -----------------------------------------------
+
+	/**
+	 * Lazily creates a input map.
+	 * Similar to {@link UIDefaults.LazyInputMap}, but can use multiple bindings arrays.
+	 */
+	private static class LazyInputMapEx
+		implements LazyValue
+	{
+		private final Object[][] bindingsArray;
+
+		LazyInputMapEx( Object[]... bindingsArray ) {
+			this.bindingsArray = bindingsArray;
+		}
+
+		@Override
+		public Object createValue( UIDefaults table ) {
+			InputMap inputMap = new InputMapUIResource();
+			for( Object[] bindings : bindingsArray )
+				LookAndFeel.loadKeyBindings( inputMap, bindings );
+			return inputMap;
+		}
+	}
+
+	//---- class LazyModifyInputMap -------------------------------------------
+
+	/**
+	 * Takes a (lazy) base input map and lazily applies modifications to it specified in bindings.
+	 */
+	private static class LazyModifyInputMap
+		implements LazyValue
+	{
+		private final Object baseInputMap;
+		private final Object[] bindings;
+
+		LazyModifyInputMap( Object baseInputMap, Object[] bindings ) {
+			this.baseInputMap = baseInputMap;
+			this.bindings = bindings;
+		}
+
+		@Override
+		public Object createValue( UIDefaults table ) {
+			// get base input map
+			InputMap inputMap = (baseInputMap instanceof LazyValue)
+				? (InputMap) ((LazyValue)baseInputMap).createValue( table )
+				: (InputMap) baseInputMap;
+
+			// modify input map (replace or remove)
+			for( int i = 0; i < bindings.length; i += 2 ) {
+				KeyStroke keyStroke = KeyStroke.getKeyStroke( (String) bindings[i] );
+				if( bindings[i + 1] != null )
+					inputMap.put( keyStroke, bindings[i + 1] );
+				else
+					inputMap.remove( keyStroke );
+			}
+
+			return inputMap;
+		}
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java

@@ -23,33 +23,38 @@ import java.awt.EventQueue;
 import java.awt.Font;
 import java.awt.KeyEventPostProcessor;
 import java.awt.KeyboardFocusManager;
+import java.awt.RenderingHints;
 import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.event.KeyEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.lang.ref.WeakReference;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ServiceLoader;
 import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.AbstractButton;
-import javax.swing.InputMap;
 import javax.swing.JLabel;
 import javax.swing.JRootPane;
 import javax.swing.JTabbedPane;
-import javax.swing.KeyStroke;
 import javax.swing.LookAndFeel;
 import javax.swing.PopupFactory;
 import javax.swing.SwingUtilities;
 import javax.swing.UIDefaults;
-import javax.swing.UIDefaults.LazyValue;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.UIDefaults.ActiveValue;
 import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.FontUIResource;
+import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicLookAndFeel;
-import javax.swing.plaf.metal.MetalLookAndFeel;
+import javax.swing.text.StyleContext;
 import javax.swing.text.html.HTMLEditorKit;
 import com.formdev.flatlaf.util.SystemInfo;
 import com.formdev.flatlaf.util.UIScale;
@@ -63,12 +68,14 @@ public abstract class FlatLaf
 	extends BasicLookAndFeel
 {
 	static final Logger LOG = Logger.getLogger( FlatLaf.class.getName() );
-
-	private BasicLookAndFeel base;
+	private static final String DESKTOPFONTHINTS = "awt.font.desktophints";
 
 	private String desktopPropertyName;
 	private PropertyChangeListener desktopPropertyListener;
 
+	private static boolean aquaLoaded;
+	private static boolean updateUIPending;
+
 	private KeyEventPostProcessor mnemonicListener;
 	private static boolean showMnemonics;
 	private static WeakReference<Window> lastShowMnemonicWindow;
@@ -112,15 +119,11 @@ public abstract class FlatLaf
 
 	@Override
 	public void initialize() {
-		getBase().initialize();
+		if( SystemInfo.IS_MAC )
+			initializeAqua();
 
 		super.initialize();
 
-		// make sure that a plain popup factory is used (otherwise sub-menu rendering
-		// is "jittery" on Mac, where AquaLookAndFeel installs its own popup factory)
-		if( PopupFactory.getSharedInstance().getClass() != PopupFactory.class )
-			PopupFactory.setSharedInstance( new PopupFactory() );
-
 		// add mnemonic listener
 		mnemonicListener = e -> {
 			checkShowMnemonics( e );
@@ -141,9 +144,19 @@ public abstract class FlatLaf
 		}
 		if( desktopPropertyName != null ) {
 			desktopPropertyListener = e -> {
-				reSetLookAndFeel();
+				String propertyName = e.getPropertyName();
+				if( desktopPropertyName.equals( propertyName ) )
+					reSetLookAndFeel();
+				else if( DESKTOPFONTHINTS.equals( propertyName ) ) {
+					if( UIManager.getLookAndFeel() instanceof FlatLaf ) {
+						putAATextInfo( UIManager.getLookAndFeelDefaults() );
+						updateUILater();
+					}
+				}
 			};
-			Toolkit.getDefaultToolkit().addPropertyChangeListener( desktopPropertyName, desktopPropertyListener );
+			Toolkit toolkit = Toolkit.getDefaultToolkit();
+			toolkit.addPropertyChangeListener( desktopPropertyName, desktopPropertyListener );
+			toolkit.addPropertyChangeListener( DESKTOPFONTHINTS, desktopPropertyListener );
 		}
 
 		// Following code should be ideally in initialize(), but needs color from UI defaults.
@@ -163,7 +176,9 @@ public abstract class FlatLaf
 	public void uninitialize() {
 		// remove desktop property listener
 		if( desktopPropertyListener != null ) {
-			Toolkit.getDefaultToolkit().removePropertyChangeListener( desktopPropertyName, desktopPropertyListener );
+			Toolkit toolkit = Toolkit.getDefaultToolkit();
+			toolkit.removePropertyChangeListener( desktopPropertyName, desktopPropertyListener );
+			toolkit.removePropertyChangeListener( DESKTOPFONTHINTS, desktopPropertyListener );
 			desktopPropertyName = null;
 			desktopPropertyListener = null;
 		}
@@ -178,89 +193,129 @@ public abstract class FlatLaf
 		new HTMLEditorKit().getStyleSheet().addRule( "a { color: blue; }" );
 		postInitialization = null;
 
-		if( base != null )
-			base.uninitialize();
-
 		super.uninitialize();
 	}
 
 	/**
-	 * Get/create base LaF. This is used to grab base UI defaults from different LaFs.
-	 * E.g. on Mac from system dependent LaF, otherwise from Metal LaF.
+	 * Initialize Aqua LaF on macOS, which is required for using Mac screen menubar.
+	 * (at least on Java 8, since 9 it seems to work without it)
+	 * <p>
+	 * This loads the native library "osxui" and initializes JRSUI.
+	 * Because both are not unloaded/uninitialized, Aqua LaF is initialized only once.
 	 */
-	private BasicLookAndFeel getBase() {
-		if( base == null ) {
-			if( SystemInfo.IS_MAC ) {
-				// use Mac Aqua LaF as base
-				String aquaLafClassName = "com.apple.laf.AquaLookAndFeel";
-				try {
-					base = (BasicLookAndFeel) Class.forName( aquaLafClassName ).newInstance();
-				} catch( Exception ex ) {
-					LOG.log( Level.SEVERE, "FlatLaf: Failed to initialize base look and feel '" + aquaLafClassName + "'.", ex );
-					throw new IllegalStateException();
-				}
+	private void initializeAqua() {
+		if( aquaLoaded )
+			return;
+
+		aquaLoaded = true;
+
+		// create macOS Aqua LaF
+		String aquaLafClassName = "com.apple.laf.AquaLookAndFeel";
+		BasicLookAndFeel aquaLaf;
+		try {
+			if( SystemInfo.IS_JAVA_9_OR_LATER ) {
+				Method m = UIManager.class.getMethod( "createLookAndFeel", String.class );
+				aquaLaf = (BasicLookAndFeel) m.invoke( null, "Mac OS X" );
 			} else
-				base = new MetalLookAndFeel();
+				aquaLaf = (BasicLookAndFeel) Class.forName( aquaLafClassName ).newInstance();
+		} catch( Exception ex ) {
+			LOG.log( Level.SEVERE, "FlatLaf: Failed to initialize Aqua look and feel '" + aquaLafClassName + "'.", ex );
+			throw new IllegalStateException();
 		}
-		return base;
+
+		// remember popup factory because aquaLaf.initialize() installs its own
+		// factory, which makes sub-menu rendering "jittery"
+		PopupFactory oldPopupFactory = PopupFactory.getSharedInstance();
+
+		// initialize Aqua LaF
+		aquaLaf.initialize();
+		aquaLaf.uninitialize();
+
+		// restore popup factory
+		PopupFactory.setSharedInstance( oldPopupFactory );
 	}
 
 	@Override
 	public UIDefaults getDefaults() {
-		UIDefaults defaults = getBase().getDefaults();
+		UIDefaults defaults = super.getDefaults();
 
 		// add Metal resource bundle, which is required for FlatFileChooserUI
 		defaults.addResourceBundle( "com.sun.swing.internal.plaf.metal.resources.metal" );
 
-		// initialize some defaults (for overriding) that are used in basic UI delegates,
-		// but are not set in MetalLookAndFeel or BasicLookAndFeel
-		Color control = defaults.getColor( "control" );
-		defaults.put( "EditorPane.disabledBackground", control );
-		defaults.put( "EditorPane.inactiveBackground", control );
-		defaults.put( "FormattedTextField.disabledBackground", control );
-		defaults.put( "PasswordField.disabledBackground", control );
-		defaults.put( "TextArea.disabledBackground", control );
-		defaults.put( "TextArea.inactiveBackground", control );
-		defaults.put( "TextField.disabledBackground", control );
-		defaults.put( "TextPane.disabledBackground", control );
-		defaults.put( "TextPane.inactiveBackground", control );
-
-		// initialize some own defaults (for overriding)
-		defaults.put( "Spinner.disabledBackground", control );
-		defaults.put( "Spinner.disabledForeground", control );
-
-		// remember MenuBarUI from Mac Aqua LaF if Mac screen menubar is enabled
-		boolean useScreenMenuBar = SystemInfo.IS_MAC && "true".equals( System.getProperty( "apple.laf.useScreenMenuBar" ) );
-		Object aquaMenuBarUI = useScreenMenuBar ? defaults.get( "MenuBarUI" ) : null;
+		// initialize some defaults (for overriding) that are used in UI delegates,
+		// but are not set in BasicLookAndFeel
+		putDefaults( defaults, defaults.getColor( "control" ),
+			"EditorPane.disabledBackground",
+			"EditorPane.inactiveBackground",
+			"FormattedTextField.disabledBackground",
+			"PasswordField.disabledBackground",
+			"Spinner.disabledBackground",
+			"TextArea.disabledBackground",
+			"TextArea.inactiveBackground",
+			"TextField.disabledBackground",
+			"TextPane.disabledBackground",
+			"TextPane.inactiveBackground" );
+		putDefaults( defaults, defaults.getColor( "textInactiveText" ),
+			"Button.disabledText",
+			"CheckBox.disabledText",
+			"CheckBoxMenuItem.disabledForeground",
+			"Menu.disabledForeground",
+			"MenuItem.disabledForeground",
+			"RadioButton.disabledText",
+			"RadioButtonMenuItem.disabledForeground",
+			"Spinner.disabledForeground",
+			"ToggleButton.disabledText" );
+		putDefaults( defaults, defaults.getColor( "textText" ),
+			"DesktopIcon.foreground" );
 
 		initFonts( defaults );
 		initIconColors( defaults, isDark() );
-		initInputMaps( defaults );
+		FlatInputMaps.initInputMaps( defaults );
+
+		// get addons and sort them by priority
+		ServiceLoader<FlatDefaultsAddon> addonLoader = ServiceLoader.load( FlatDefaultsAddon.class );
+		List<FlatDefaultsAddon> addons = new ArrayList<>();
+		for( FlatDefaultsAddon addon : addonLoader )
+			addons.add( addon );
+		addons.sort( (addon1, addon2) -> addon1.getPriority() - addon2.getPriority() );
 
 		// load defaults from properties
 		List<Class<?>> lafClassesForDefaultsLoading = getLafClassesForDefaultsLoading();
 		if( lafClassesForDefaultsLoading != null )
-			UIDefaultsLoader.loadDefaultsFromProperties( lafClassesForDefaultsLoading, defaults );
+			UIDefaultsLoader.loadDefaultsFromProperties( lafClassesForDefaultsLoading, addons, getAdditionalDefaults(), defaults );
 		else
-			UIDefaultsLoader.loadDefaultsFromProperties( getClass(), defaults );
+			UIDefaultsLoader.loadDefaultsFromProperties( getClass(), addons, getAdditionalDefaults(), defaults );
 
 		// use Aqua MenuBarUI if Mac screen menubar is enabled
-		if( useScreenMenuBar )
-			defaults.put( "MenuBarUI", aquaMenuBarUI );
+		if( SystemInfo.IS_MAC && Boolean.getBoolean( "apple.laf.useScreenMenuBar" ) )
+			defaults.put( "MenuBarUI", "com.apple.laf.AquaMenuBarUI" );
 
-		invokePostInitialization( defaults );
+		// initialize text antialiasing
+		putAATextInfo( defaults );
 
-		return defaults;
-	}
+		// apply additional defaults (e.g. from IntelliJ themes)
+		applyAdditionalDefaults( defaults );
+
+		// allow addons modifying UI defaults
+		for( FlatDefaultsAddon addon : addons )
+			addon.afterDefaultsLoading( this, defaults );
 
-	void invokePostInitialization( UIDefaults defaults ) {
 		if( postInitialization != null ) {
 			postInitialization.accept( defaults );
 			postInitialization = null;
 		}
+
+		return defaults;
 	}
 
-	List<Class<?>> getLafClassesForDefaultsLoading() {
+	void applyAdditionalDefaults( UIDefaults defaults ) {
+	}
+
+	protected List<Class<?>> getLafClassesForDefaultsLoading() {
+		return null;
+	}
+
+	protected Properties getAdditionalDefaults() {
 		return null;
 	}
 
@@ -270,17 +325,19 @@ public abstract class FlatLaf
 		if( SystemInfo.IS_WINDOWS ) {
 			Font winFont = (Font) Toolkit.getDefaultToolkit().getDesktopProperty( "win.messagebox.font" );
 			if( winFont != null )
-				uiFont = new FontUIResource( winFont );
+				uiFont = createCompositeFont( winFont.getFamily(), winFont.getStyle(), winFont.getSize() );
 
 		} else if( SystemInfo.IS_MAC ) {
-			Font font = defaults.getFont( "Label.font" );
-
+			String fontName;
 			if( SystemInfo.IS_MAC_OS_10_11_EL_CAPITAN_OR_LATER ) {
 				// use San Francisco Text font
-				font = new FontUIResource( ".SF NS Text", font.getStyle(), font.getSize() );
+				fontName = ".SF NS Text";
+			} else {
+				// default font on older systems (see com.apple.laf.AquaFonts)
+				fontName = "Lucida Grande";
 			}
 
-			uiFont = (font instanceof FontUIResource) ? (FontUIResource) font : new FontUIResource( font );
+			uiFont = createCompositeFont( fontName, Font.PLAIN, 13 );
 
 		} else if( SystemInfo.IS_LINUX ) {
 			Font font = LinuxFontPolicy.getFont();
@@ -288,19 +345,34 @@ public abstract class FlatLaf
 		}
 
 		if( uiFont == null )
-			return;
+			uiFont = createCompositeFont( Font.SANS_SERIF, Font.PLAIN, 12 );
 
 		uiFont = UIScale.applyCustomScaleFactor( uiFont );
 
+		// use active value for all fonts to allow changing fonts in all components
+		// (similar as in Nimbus L&F) with:
+		//     UIManager.put( "defaultFont", myFont );
+		Object activeFont =  new ActiveFont( 1 );
+
 		// override fonts
 		for( Object key : defaults.keySet() ) {
-			if( key instanceof String && ((String)key).endsWith( ".font" ) )
-				defaults.put( key, uiFont );
+			if( key instanceof String && (((String)key).endsWith( ".font" ) || ((String)key).endsWith( "Font" )) )
+				defaults.put( key, activeFont );
 		}
-		defaults.put( "MenuItem.acceleratorFont", uiFont );
 
 		// use smaller font for progress bar
-		defaults.put( "ProgressBar.font", UIScale.scaleFont( uiFont, 0.85f ) );
+		defaults.put( "ProgressBar.font", new ActiveFont( 0.85f ) );
+
+		// set default font
+		defaults.put( "defaultFont", uiFont );
+	}
+
+	static FontUIResource createCompositeFont( String family, int style, int size ) {
+		// using StyleContext.getFont() here because it uses
+		// sun.font.FontUtilities.getCompositeFontUIResource()
+		// and creates a composite font that is able to display all Unicode characters
+		Font font = new StyleContext().getFont( family, style, size );
+		return (font instanceof FontUIResource) ? (FontUIResource) font : new FontUIResource( font );
 	}
 
 	/**
@@ -342,55 +414,42 @@ public abstract class FlatLaf
 		defaults.put( "Objects.BlackText",      new ColorUIResource( 0x231F20 ) );
 	}
 
-	private void initInputMaps( UIDefaults defaults ) {
-		if( SystemInfo.IS_MAC ) {
-			// AquaLookAndFeel (the base for UI defaults on macOS) uses special
-			// action keys (e.g. "aquaExpandNode") for some macOS specific behaviour.
-			// Those action keys are not available in FlatLaf, which makes it
-			// necessary to make some modifications.
-
-			// combobox
-			defaults.put( "ComboBox.ancestorInputMap", new UIDefaults.LazyInputMap( new Object[] {
-				     "ESCAPE", "hidePopup",
-				    "PAGE_UP", "pageUpPassThrough",
-				  "PAGE_DOWN", "pageDownPassThrough",
-				       "HOME", "homePassThrough",
-				        "END", "endPassThrough",
-				       "DOWN", "selectNext",
-				    "KP_DOWN", "selectNext",
-				      "SPACE", "spacePopup",
-				      "ENTER", "enterPressed",
-				         "UP", "selectPrevious",
-				      "KP_UP", "selectPrevious"
-			} ) );
-
-			// tree node expanding/collapsing
-			modifyInputMap( defaults, "Tree.focusInputMap",
-				         "RIGHT", "selectChild",
-				      "KP_RIGHT", "selectChild",
-				          "LEFT", "selectParent",
-				       "KP_LEFT", "selectParent",
-				   "shift RIGHT", null,
-				"shift KP_RIGHT", null,
-				    "shift LEFT", null,
-				 "shift KP_LEFT", null,
-				     "ctrl LEFT", null,
-				  "ctrl KP_LEFT", null,
-				    "ctrl RIGHT", null,
-				 "ctrl KP_RIGHT", null
-			);
-			defaults.put( "Tree.focusInputMap.RightToLeft", new UIDefaults.LazyInputMap( new Object[] {
-	                     "RIGHT", "selectParent",
-	                  "KP_RIGHT", "selectParent",
-	                      "LEFT", "selectChild",
-	                   "KP_LEFT", "selectChild"
-			} ) );
+	private void putAATextInfo( UIDefaults defaults ) {
+		if( SystemInfo.IS_JAVA_9_OR_LATER ) {
+			Object desktopHints = Toolkit.getDefaultToolkit().getDesktopProperty( DESKTOPFONTHINTS );
+			if( desktopHints instanceof Map ) {
+				@SuppressWarnings( "unchecked" )
+				Map<Object, Object> hints = (Map<Object, Object>) desktopHints;
+				Object aaHint = hints.get( RenderingHints.KEY_TEXT_ANTIALIASING );
+				if( aaHint != null &&
+					aaHint != RenderingHints.VALUE_TEXT_ANTIALIAS_OFF &&
+					aaHint != RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT )
+				{
+					defaults.put( RenderingHints.KEY_TEXT_ANTIALIASING, aaHint );
+					defaults.put( RenderingHints.KEY_TEXT_LCD_CONTRAST,
+						hints.get( RenderingHints.KEY_TEXT_LCD_CONTRAST ) );
+				}
+			}
+		} else {
+			// Java 8
+			try {
+				Object key = Class.forName( "sun.swing.SwingUtilities2" )
+					.getField( "AA_TEXT_PROPERTY_KEY" )
+					.get( null );
+				Object value = Class.forName( "sun.swing.SwingUtilities2$AATextInfo" )
+					.getMethod( "getAATextInfo", boolean.class )
+					.invoke( null, true );
+				defaults.put( key, value );
+			} catch( Exception ex ) {
+				Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex );
+				throw new RuntimeException( ex );
+			}
 		}
 	}
 
-	private void modifyInputMap( UIDefaults defaults, String key, Object... bindings ) {
-		// Note: not using `defaults.get(key)` here because this would resolve the lazy value
-		defaults.put( key, new LazyModifyInputMap( defaults.remove( key ), bindings ) );
+	private void putDefaults( UIDefaults defaults, Object value, String... keys ) {
+		for( String key : keys )
+			defaults.put( key, value );
 	}
 
 	private static void reSetLookAndFeel() {
@@ -414,7 +473,7 @@ public abstract class FlatLaf
 	}
 
 	/**
-	 * Update UI of all application windows.
+	 * Update UI of all application windows immediately.
 	 * Invoke after changing LaF.
 	 */
 	public static void updateUI() {
@@ -422,6 +481,25 @@ public abstract class FlatLaf
 			SwingUtilities.updateComponentTreeUI( w );
 	}
 
+	/**
+	 * Update UI of all application windows later.
+	 */
+	public static void updateUILater() {
+		synchronized( FlatLaf.class ) {
+			if( updateUIPending )
+				return;
+
+			updateUIPending = true;
+		}
+
+		EventQueue.invokeLater( () -> {
+			updateUI();
+			synchronized( FlatLaf.class ) {
+				updateUIPending = false;
+			}
+		} );
+	}
+
 	public static boolean isShowMnemonics() {
 		return showMnemonics || !UIManager.getBoolean( "Component.hideMnemonics" );
 	}
@@ -505,39 +583,41 @@ public abstract class FlatLaf
 		return false;
 	}
 
-	//---- class LazyModifyInputMap -------------------------------------------
+	//---- class ActiveFont ---------------------------------------------------
 
-	/**
-	 * Takes a (lazy) base input map and lazily applies modifications to it specified in bindings.
-	 */
-	private static class LazyModifyInputMap
-		implements LazyValue
+	private static class ActiveFont
+		implements ActiveValue
 	{
-		private final Object baseInputMap;
-		private final Object[] bindings;
+		private final float scaleFactor;
 
-		public LazyModifyInputMap( Object baseInputMap, Object[] bindings ) {
-			this.baseInputMap = baseInputMap;
-			this.bindings = bindings;
+		// cache (scaled) font
+		private Font font;
+		private Font lastDefaultFont;
+
+		ActiveFont( float scaleFactor ) {
+			this.scaleFactor = scaleFactor;
 		}
 
 		@Override
 		public Object createValue( UIDefaults table ) {
-			// get base input map
-			InputMap inputMap = (baseInputMap instanceof LazyValue)
-				? (InputMap) ((LazyValue)baseInputMap).createValue( table )
-				: (InputMap) baseInputMap;
+			Font defaultFont = UIManager.getFont( "defaultFont" );
 
-			// modify input map (replace or remove)
-			for( int i = 0; i < bindings.length; i += 2 ) {
-				KeyStroke keyStroke = KeyStroke.getKeyStroke( (String) bindings[i] );
-				if( bindings[i + 1] != null )
-					inputMap.put( keyStroke, bindings[i + 1] );
-				else
-					inputMap.remove( keyStroke );
+			if( lastDefaultFont != defaultFont ) {
+				lastDefaultFont = defaultFont;
+
+				if( scaleFactor != 1 ) {
+					// scale font
+					int newFontSize = Math.round( defaultFont.getSize() * scaleFactor );
+					font = new FontUIResource( defaultFont.deriveFont( (float) newFontSize ) );
+				} else {
+					// make sure that font is a UIResource for LaF switching
+					font = (defaultFont instanceof UIResource)
+						? defaultFont
+						: new FontUIResource( defaultFont );
+				}
 			}
 
-			return inputMap;
+			return font;
 		}
 	}
 }

flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java

@@ -513,19 +513,12 @@ public class IntelliJTheme
 		}
 
 		@Override
-		public UIDefaults getDefaults() {
-			UIDefaults defaults = super.getDefaults();
+		void applyAdditionalDefaults( UIDefaults defaults ) {
 			theme.applyProperties( defaults );
-			super.invokePostInitialization( defaults );
-			return defaults;
 		}
 
 		@Override
-		void invokePostInitialization( UIDefaults defaults ) {
-		}
-
-		@Override
-		ArrayList<Class<?>> getLafClassesForDefaultsLoading() {
+		protected ArrayList<Class<?>> getLafClassesForDefaultsLoading() {
 			ArrayList<Class<?>> lafClasses = new ArrayList<>();
 			lafClasses.add( FlatLaf.class );
 			lafClasses.add( theme.dark ? FlatDarkLaf.class : FlatLightLaf.class );

flatlaf-core/src/main/java/com/formdev/flatlaf/LinuxFontPolicy.java

@@ -17,6 +17,7 @@
 package com.formdev.flatlaf;
 
 import java.awt.Font;
+import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsEnvironment;
 import java.awt.Toolkit;
 import java.io.BufferedReader;
@@ -28,9 +29,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.logging.Level;
-import javax.swing.text.StyleContext;
 import com.formdev.flatlaf.util.StringUtils;
 import com.formdev.flatlaf.util.SystemInfo;
+import com.formdev.flatlaf.util.UIScale;
 
 /**
  * @author Karl Tauber
@@ -88,9 +89,7 @@ class LinuxFontPolicy
 	}
 
 	private static Font createFont( String family, int style, int size, double dsize ) {
-		// using StyleContext.getFont() here because it uses
-		// sun.font.FontUtilities.getCompositeFontUIResource()
-		Font font = new StyleContext().getFont( family, style, size );
+		Font font = FlatLaf.createCompositeFont( family, style, size );
 
 		// set font size in floating points
 		font = font.deriveFont( style, (float) dsize );
@@ -99,6 +98,10 @@ class LinuxFontPolicy
 	}
 
 	private static double getGnomeFontScale() {
+		// do not scale font here if JRE scales
+		if( isSystemScaling() )
+			return 96. / 72.;
+
 		// see class com.sun.java.swing.plaf.gtk.PangoFonts background information
 
 		Object value = Toolkit.getDefaultToolkit().getDesktopProperty( "gnome.Xft/DPI" );
@@ -168,7 +171,7 @@ class LinuxFontPolicy
 
 		// font dpi
 		int dpi = 96;
-		if( forceFontDPI != null ) {
+		if( forceFontDPI != null && !isSystemScaling() ) {
 			try {
 				dpi = Integer.parseInt( forceFontDPI );
 				if( dpi <= 0 )
@@ -247,4 +250,15 @@ class LinuxFontPolicy
 		}
 		return null;
 	}
+
+	/**
+	 * Returns true if the JRE scales, which is the case if:
+	 *   - environment variable GDK_SCALE is set and running on Java 9 or later
+	 *   - running on JetBrains Runtime 11 or later and scaling is enabled in system Settings
+	 */
+	private static boolean isSystemScaling() {
+		GraphicsConfiguration gc = GraphicsEnvironment.getLocalGraphicsEnvironment()
+			.getDefaultScreenDevice().getDefaultConfiguration();
+		return UIScale.getSystemScaleFactor( gc ) > 1;
+	}
 }

flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java

@@ -28,7 +28,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
-import java.util.ServiceLoader;
 import java.util.function.Function;
 import java.util.logging.Level;
 import javax.swing.UIDefaults;
@@ -69,7 +68,9 @@ class UIDefaultsLoader
 	private static final String OPTIONAL_PREFIX = "?";
 	private static final String GLOBAL_PREFIX = "*.";
 
-	static void loadDefaultsFromProperties( Class<?> lookAndFeelClass, UIDefaults defaults ) {
+	static void loadDefaultsFromProperties( Class<?> lookAndFeelClass, List<FlatDefaultsAddon> addons,
+		Properties additionalDefaults, UIDefaults defaults )
+	{
 		// determine classes in class hierarchy in reverse order
 		ArrayList<Class<?>> lafClasses = new ArrayList<>();
 		for( Class<?> lafClass = lookAndFeelClass;
@@ -79,10 +80,12 @@ class UIDefaultsLoader
 			lafClasses.add( 0, lafClass );
 		}
 
-		loadDefaultsFromProperties( lafClasses, defaults );
+		loadDefaultsFromProperties( lafClasses, addons, additionalDefaults, defaults );
 	}
 
-	static void loadDefaultsFromProperties( List<Class<?>> lafClasses, UIDefaults defaults ) {
+	static void loadDefaultsFromProperties( List<Class<?>> lafClasses, List<FlatDefaultsAddon> addons,
+		Properties additionalDefaults, UIDefaults defaults )
+	{
 		try {
 			// load core properties files
 			Properties properties = new Properties();
@@ -94,15 +97,8 @@ class UIDefaultsLoader
 				}
 			}
 
-			// get addons and sort them by priority
-			ServiceLoader<FlatDefaultsAddon> addonLoader = ServiceLoader.load( FlatDefaultsAddon.class );
-			List<FlatDefaultsAddon> addonList = new ArrayList<>();
-			for( FlatDefaultsAddon addon : addonLoader )
-				addonList.add( addon );
-			addonList.sort( (addon1, addon2) -> addon1.getPriority() - addon2.getPriority() );
-
 			// load properties from addons
-			for( FlatDefaultsAddon addon : addonList ) {
+			for( FlatDefaultsAddon addon : addons ) {
 				for( Class<?> lafClass : lafClasses ) {
 					try( InputStream in = addon.getDefaults( lafClass ) ) {
 						if( in != null )
@@ -113,12 +109,16 @@ class UIDefaultsLoader
 
 			// collect addon class loaders
 			List<ClassLoader> addonClassLoaders = new ArrayList<>();
-			for( FlatDefaultsAddon addon : addonList ) {
+			for( FlatDefaultsAddon addon : addons ) {
 				ClassLoader addonClassLoader = addon.getClass().getClassLoader();
 				if( !addonClassLoaders.contains( addonClassLoader ) )
 					addonClassLoaders.add( addonClassLoader );
 			}
 
+			// add additional defaults
+			if( additionalDefaults != null )
+				properties.putAll( additionalDefaults );
+
 			// collect all platform specific keys (but do not modify properties)
 			ArrayList<String> platformSpecificKeys = new ArrayList<>();
 			for( Object key : properties.keySet() ) {
@@ -221,7 +221,8 @@ class UIDefaultsLoader
 		return resolveValue( properties, newValue );
 	}
 
-	private enum ValueType { UNKNOWN, STRING, INTEGER, FLOAT, BORDER, ICON, INSETS, DIMENSION, COLOR, SCALEDINTEGER, INSTANCE, CLASS }
+	private enum ValueType { UNKNOWN, STRING, CHARACTER, INTEGER, FLOAT, BORDER, ICON, INSETS, DIMENSION, COLOR,
+		SCALEDINTEGER, SCALEDFLOAT, SCALEDINSETS, SCALEDDIMENSION, INSTANCE, CLASS }
 
 	static Object parseValue( String key, String value ) {
 		return parseValue( key, value, v -> v, Collections.emptyList() );
@@ -284,6 +285,8 @@ class UIDefaultsLoader
 				valueType = ValueType.DIMENSION;
 			else if( key.endsWith( "Width" ) || key.endsWith( "Height" ) )
 				valueType = ValueType.INTEGER;
+			else if( key.endsWith( "Char" ) )
+				valueType = ValueType.CHARACTER;
 			else if( key.endsWith( "UI" ) )
 				valueType = ValueType.STRING;
 		}
@@ -291,6 +294,7 @@ class UIDefaultsLoader
 		// parse value
 		switch( valueType ) {
 			case STRING:		return value;
+			case CHARACTER:		return parseCharacter( value );
 			case INTEGER:		return parseInteger( value, true );
 			case FLOAT:			return parseFloat( value, true );
 			case BORDER:		return parseBorder( value, resolver, addonClassLoaders );
@@ -299,6 +303,9 @@ class UIDefaultsLoader
 			case DIMENSION:		return parseDimension( value );
 			case COLOR:			return parseColorOrFunction( value, resolver, true );
 			case SCALEDINTEGER:	return parseScaledInteger( value );
+			case SCALEDFLOAT:	return parseScaledFloat( value );
+			case SCALEDINSETS:	return parseScaledInsets( value );
+			case SCALEDDIMENSION:return parseScaledDimension( value );
 			case INSTANCE:		return parseInstance( value, addonClassLoaders );
 			case CLASS:			return parseClass( value, addonClassLoaders );
 			case UNKNOWN:
@@ -325,16 +332,17 @@ class UIDefaultsLoader
 
 	private static Object parseBorder( String value, Function<String, String> resolver, List<ClassLoader> addonClassLoaders ) {
 		if( value.indexOf( ',' ) >= 0 ) {
-			// top,left,bottom,right[,lineColor]
+			// top,left,bottom,right[,lineColor[,lineThickness]]
 			List<String> parts = split( value, ',' );
 			Insets insets = parseInsets( value );
-			ColorUIResource lineColor = (parts.size() == 5)
+			ColorUIResource lineColor = (parts.size() >= 5)
 				? (ColorUIResource) parseColorOrFunction( resolver.apply( parts.get( 4 ) ), resolver, true )
 				: null;
+			float lineThickness = (parts.size() >= 6) ? parseFloat( parts.get( 5 ), true ) : 1f;
 
 			return (LazyValue) t -> {
 				return (lineColor != null)
-					? new FlatLineBorder( insets, lineColor )
+					? new FlatLineBorder( insets, lineColor, lineThickness )
 					: new FlatEmptyBorder( insets );
 			};
 		} else
@@ -595,6 +603,12 @@ class UIDefaultsLoader
 		return val;
 	}
 
+	private static Character parseCharacter( String value ) {
+		if( value.length() != 1 )
+			throw new IllegalArgumentException( "invalid character '" + value + "'" );
+		return value.charAt( 0 );
+	}
+
 	private static Integer parseInteger( String value, int min, int max ) {
 		Integer integer = parseInteger( value, true );
 		if( integer.intValue() < min || integer.intValue() > max )
@@ -629,6 +643,27 @@ class UIDefaultsLoader
 		};
 	}
 
+	private static ActiveValue parseScaledFloat( String value ) {
+		float val = parseFloat( value, true );
+		return (ActiveValue) t -> {
+			return UIScale.scale( val );
+		};
+	}
+
+	private static ActiveValue parseScaledInsets( String value ) {
+		Insets insets = parseInsets( value );
+		return (ActiveValue) t -> {
+			return UIScale.scale( insets );
+		};
+	}
+
+	private static ActiveValue parseScaledDimension( String value ) {
+		Dimension dimension = parseDimension( value );
+		return (ActiveValue) t -> {
+			return UIScale.scale( dimension );
+		};
+	}
+
 	/**
 	 * Split string and trim parts.
 	 */

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatAscendingSortIcon.java

@@ -47,7 +47,7 @@ public class FlatAscendingSortIcon
 		g.setColor( sortIconColor );
 		if( chevron ) {
 			// chevron arrow
-			Path2D path = FlatUIUtils.createPath( false, 1,5, 5,1, 9,5 );
+			Path2D path = FlatUIUtils.createPath( false, 1,4, 5,0, 9,4 );
 			g.setStroke( new BasicStroke( 1f ) );
 			g.draw( path );
 		} else {

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCapsLockIcon.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2020 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.icons;
+
+import java.awt.Component;
+import java.awt.Graphics2D;
+import java.awt.geom.Path2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.geom.RoundRectangle2D;
+import javax.swing.UIManager;
+import com.formdev.flatlaf.ui.FlatUIUtils;
+
+/**
+ * "caps lock" icon for {@link javax.swing.JPasswordField}.
+ *
+ * @uiDefault PasswordField.capsLockIconColor			Color
+ *
+ * @author Karl Tauber
+ */
+public class FlatCapsLockIcon
+	extends FlatAbstractIcon
+{
+	public FlatCapsLockIcon() {
+		super( 16, 16, UIManager.getColor( "PasswordField.capsLockIconColor" ) );
+	}
+
+	@Override
+	protected void paintIcon( Component c, Graphics2D g ) {
+		/*
+			<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+			  <g fill="none" fill-rule="evenodd">
+			    <rect width="16" height="16" fill="#6E6E6E" rx="3"/>
+			    <rect width="6" height="2" x="5" y="12" fill="#FFF"/>
+    			<path fill="#FFF" d="M2,8 L8,2 L14,8 L11,8 L11,10 L5,10 L5,8 L2,8 Z"/>
+			  </g>
+			</svg>
+		*/
+
+		Path2D path = new Path2D.Float( Path2D.WIND_EVEN_ODD );
+		path.append( new RoundRectangle2D.Float( 0, 0, 16, 16, 6, 6 ), false );
+		path.append( new Rectangle2D.Float( 5, 12, 6, 2 ), false );
+		path.append( FlatUIUtils.createPath( 2,8, 8,2, 14,8, 11,8, 11,10, 5,10, 5,8 ), false );
+		g.fill( path );
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java

@@ -96,7 +96,7 @@ public class FlatCheckBoxIcon
 		boolean selected = indeterminate || (c instanceof AbstractButton && ((AbstractButton)c).isSelected());
 
 		// paint focused border
-		if( c.hasFocus() && focusWidth > 0 ) {
+		if( FlatUIUtils.isPermanentFocusOwner( c ) && focusWidth > 0 ) {
 			g2.setColor( focusColor );
 			paintFocusBorder( g2 );
 		}

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatDescendingSortIcon.java

@@ -47,7 +47,7 @@ public class FlatDescendingSortIcon
 		g.setColor( sortIconColor );
 		if( chevron ) {
 			// chevron arrow
-			Path2D path = FlatUIUtils.createPath( false, 1,1, 5,5, 9,1 );
+			Path2D path = FlatUIUtils.createPath( false, 1,0, 5,4, 9,0 );
 			g.setStroke( new BasicStroke( 1f ) );
 			g.draw( path );
 		} else {

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatHelpButtonIcon.java

@@ -82,7 +82,7 @@ public class FlatHelpButtonIcon
 		*/
 
 		boolean enabled = c.isEnabled();
-		boolean focused = c.hasFocus();
+		boolean focused = FlatUIUtils.isPermanentFocusOwner( c );
 
 		// paint focused border
 		if( focused ) {

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatInternalFrameAbstractIcon.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2019 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.icons;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import javax.swing.UIManager;
+import com.formdev.flatlaf.ui.FlatButtonUI;
+import com.formdev.flatlaf.ui.FlatUIUtils;
+
+/**
+ * Base class for internal frame icons.
+ *
+ * @uiDefault InternalFrame.buttonHoverBackground		Color
+ * @uiDefault InternalFrame.buttonPressedBackground		Color
+ *
+ * @author Karl Tauber
+ */
+public abstract class FlatInternalFrameAbstractIcon
+	extends FlatAbstractIcon
+{
+	private final Color hoverBackground;
+	private final Color pressedBackground;
+
+	public FlatInternalFrameAbstractIcon() {
+		this( UIManager.getDimension( "InternalFrame.buttonSize" ),
+			UIManager.getColor( "InternalFrame.buttonHoverBackground" ),
+			UIManager.getColor( "InternalFrame.buttonPressedBackground" ) );
+	}
+
+	public FlatInternalFrameAbstractIcon( Dimension size, Color hoverBackground, Color pressedBackground ) {
+		super( size.width, size.height, null );
+		this.hoverBackground = hoverBackground;
+		this.pressedBackground = pressedBackground;
+	}
+
+	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.fillRect( 0, 0, width, height );
+		}
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatInternalFrameCloseIcon.java

@@ -17,30 +17,42 @@
 package com.formdev.flatlaf.icons;
 
 import java.awt.BasicStroke;
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics2D;
 import java.awt.geom.Line2D;
 import java.awt.geom.Path2D;
 import javax.swing.UIManager;
+import com.formdev.flatlaf.ui.FlatButtonUI;
 
 /**
  * "close" icon for {@link javax.swing.JInternalFrame}.
  *
- * @uiDefault InternalFrame.iconColor			Color
+ * @uiDefault InternalFrame.buttonHoverBackground		Color
+ * @uiDefault InternalFrame.buttonPressedBackground		Color
  *
  * @author Karl Tauber
  */
 public class FlatInternalFrameCloseIcon
-	extends FlatAbstractIcon
+	extends FlatInternalFrameAbstractIcon
 {
+	private final Color hoverForeground = UIManager.getColor( "InternalFrame.closeHoverForeground" );
+	private final Color pressedForeground = UIManager.getColor( "InternalFrame.closePressedForeground" );
+
 	public FlatInternalFrameCloseIcon() {
-		super( 16, 16, UIManager.getColor( "InternalFrame.iconColor" ) );
+		super( UIManager.getDimension( "InternalFrame.buttonSize" ),
+			UIManager.getColor( "InternalFrame.closeHoverBackground" ),
+			UIManager.getColor( "InternalFrame.closePressedBackground" ) );
 	}
 
 	@Override
 	protected void paintIcon( Component c, Graphics2D g ) {
-		float mx = 8;
-		float my = 8;
+		paintBackground( c, g );
+
+		g.setColor( FlatButtonUI.buttonStateColor( c, c.getForeground(), null, null, hoverForeground, pressedForeground ) );
+
+		float mx = width / 2;
+		float my = height / 2;
 		float r = 3.25f;
 
 		Path2D path = new Path2D.Float( Path2D.WIND_EVEN_ODD );

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatInternalFrameIconifyIcon.java

@@ -18,24 +18,23 @@ package com.formdev.flatlaf.icons;
 
 import java.awt.Component;
 import java.awt.Graphics2D;
-import javax.swing.UIManager;
 
 /**
  * "iconify" icon for {@link javax.swing.JInternalFrame}.
  *
- * @uiDefault InternalFrame.iconColor			Color
- *
  * @author Karl Tauber
  */
 public class FlatInternalFrameIconifyIcon
-	extends FlatAbstractIcon
+	extends FlatInternalFrameAbstractIcon
 {
 	public FlatInternalFrameIconifyIcon() {
-		super( 16, 16, UIManager.getColor( "InternalFrame.iconColor" ) );
 	}
 
 	@Override
 	protected void paintIcon( Component c, Graphics2D g ) {
-		g.fillRect( 3, 8, 10, 1 );
+		paintBackground( c, g );
+
+		g.setColor( c.getForeground() );
+		g.fillRect( (width / 2) - 4, height / 2, 8, 1 );
 	}
 }

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatInternalFrameMaximizeIcon.java

@@ -18,25 +18,24 @@ package com.formdev.flatlaf.icons;
 
 import java.awt.Component;
 import java.awt.Graphics2D;
-import javax.swing.UIManager;
 import com.formdev.flatlaf.ui.FlatUIUtils;
 
 /**
  * "maximize" icon for {@link javax.swing.JInternalFrame}.
  *
- * @uiDefault InternalFrame.iconColor			Color
- *
  * @author Karl Tauber
  */
 public class FlatInternalFrameMaximizeIcon
-	extends FlatAbstractIcon
+	extends FlatInternalFrameAbstractIcon
 {
 	public FlatInternalFrameMaximizeIcon() {
-		super( 16, 16, UIManager.getColor( "InternalFrame.iconColor" ) );
 	}
 
 	@Override
 	protected void paintIcon( Component c, Graphics2D g ) {
-		g.fill( FlatUIUtils.createRectangle( 3, 3, 10, 10, 1 ) );
+		paintBackground( c, g );
+
+		g.setColor( c.getForeground() );
+		g.fill( FlatUIUtils.createRectangle( (width / 2) - 4, (height / 2) - 4, 8, 8, 1 ) );
 	}
 }

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatInternalFrameMinimizeIcon.java

@@ -21,30 +21,32 @@ import java.awt.Graphics2D;
 import java.awt.geom.Area;
 import java.awt.geom.Path2D;
 import java.awt.geom.Rectangle2D;
-import javax.swing.UIManager;
 import com.formdev.flatlaf.ui.FlatUIUtils;
 
 /**
  * "minimize" (actually "restore") icon for {@link javax.swing.JInternalFrame}.
  *
- * @uiDefault InternalFrame.iconColor			Color
- *
  * @author Karl Tauber
  */
 public class FlatInternalFrameMinimizeIcon
-	extends FlatAbstractIcon
+	extends FlatInternalFrameAbstractIcon
 {
 	public FlatInternalFrameMinimizeIcon() {
-		super( 16, 16, UIManager.getColor( "InternalFrame.iconColor" ) );
 	}
 
 	@Override
 	protected void paintIcon( Component c, Graphics2D g ) {
-		Path2D r1 = FlatUIUtils.createRectangle( 5, 3, 8, 8, 1 );
-		Path2D r2 = FlatUIUtils.createRectangle( 3, 5, 8, 8, 1 );
+		paintBackground( c, g );
+
+		g.setColor( c.getForeground() );
+
+		int x = (width / 2) - 4;
+		int y = (height / 2) - 4;
+		Path2D r1 = FlatUIUtils.createRectangle( x + 1, y - 1, 8, 8, 1 );
+		Path2D r2 = FlatUIUtils.createRectangle( x - 1, y + 1, 8, 8, 1 );
 
 		Area area = new Area( r1 );
-		area.subtract( new Area( new Rectangle2D.Float( 3, 5, 8, 8 ) ) );
+		area.subtract( new Area( new Rectangle2D.Float( x - 1, y + 1, 8, 8 ) ) );
 		g.fill( area );
 
 		g.fill( r2 );

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatBorder.java

@@ -119,7 +119,7 @@ public class FlatBorder
 			JViewport viewport = ((JScrollPane)c).getViewport();
 			Component view = (viewport != null) ? viewport.getView() : null;
 			if( view != null ) {
-				if( view.hasFocus() )
+				if( FlatUIUtils.isPermanentFocusOwner( view ) )
 					return true;
 
 				if( (view instanceof JTable && ((JTable)view).isEditing()) ||
@@ -133,17 +133,17 @@ public class FlatBorder
 			return false;
 		} else if( c instanceof JComboBox && ((JComboBox<?>)c).isEditable() ) {
 			Component editorComponent = ((JComboBox<?>)c).getEditor().getEditorComponent();
-			return (editorComponent != null) ? editorComponent.hasFocus() : false;
+			return (editorComponent != null) ? FlatUIUtils.isPermanentFocusOwner( editorComponent ) : false;
 		} else if( c instanceof JSpinner ) {
 			JComponent editor = ((JSpinner)c).getEditor();
 			if( editor instanceof JSpinner.DefaultEditor ) {
 				JTextField textField = ((JSpinner.DefaultEditor)editor).getTextField();
 				if( textField != null )
-					return textField.hasFocus();
+					return FlatUIUtils.isPermanentFocusOwner( textField );
 			}
 			return false;
 		} else
-			return c.hasFocus();
+			return FlatUIUtils.isPermanentFocusOwner( c );
 	}
 
 	protected boolean isTableCellEditor( Component c ) {

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonBorder.java

@@ -23,9 +23,10 @@ import java.awt.GradientPaint;
 import java.awt.Graphics;
 import java.awt.Insets;
 import java.awt.Paint;
-import javax.swing.JButton;
+import javax.swing.AbstractButton;
 import javax.swing.UIManager;
 import javax.swing.plaf.UIResource;
+import com.formdev.flatlaf.util.UIScale;
 
 /**
  * Border for {@link javax.swing.JButton}.
@@ -43,6 +44,8 @@ import javax.swing.plaf.UIResource;
  * @uiDefault Button.default.focusedBorderColor	Color
  * @uiDefault Button.default.focusColor			Color
  * @uiDefault Button.default.borderWidth		int
+ * @uiDefault Button.toolbar.margin				Insets
+ * @uiDefault Button.toolbar.spacingInsets		Insets
  * @uiDefault Button.arc						int
  *
  * @author Karl Tauber
@@ -61,12 +64,17 @@ public class FlatButtonBorder
 	protected final Color defaultFocusedBorderColor = UIManager.getColor( "Button.default.focusedBorderColor" );
 	protected final Color defaultFocusColor = UIManager.getColor( "Button.default.focusColor" );
 	protected final int defaultBorderWidth = UIManager.getInt( "Button.default.borderWidth" );
+	protected final Insets toolbarMargin = UIManager.getInsets( "Button.toolbar.margin" );
+	protected final Insets toolbarSpacingInsets = UIManager.getInsets( "Button.toolbar.spacingInsets" );
 	protected final int arc = UIManager.getInt( "Button.arc" );
 
 	@Override
 	public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
-		if( FlatButtonUI.isContentAreaFilled( c ) && !FlatButtonUI.isHelpButton( c ) && !FlatToggleButtonUI.isTabButton( c ) )
-			super.paintBorder( c, g, x, y, width, height );
+		if( FlatButtonUI.isContentAreaFilled( c ) &&
+			!FlatButtonUI.isToolBarButton( c ) &&
+			!FlatButtonUI.isHelpButton( c ) &&
+			!FlatToggleButtonUI.isTabButton( c ) )
+		  super.paintBorder( c, g, x, y, width, height );
 	}
 
 	@Override
@@ -95,11 +103,22 @@ public class FlatButtonBorder
 
 	@Override
 	public Insets getBorderInsets( Component c, Insets insets ) {
-		insets = super.getBorderInsets( c, insets );
+		if( FlatButtonUI.isToolBarButton( c ) ) {
+			// In toolbars, use button margin only if explicitly set.
+			// Otherwise use toolbar margin specified in UI defaults.
+			Insets margin = (c instanceof AbstractButton)
+				? ((AbstractButton)c).getMargin()
+				: null;
 
-		// use smaller left and right insets for icon-only buttons (so that they are square)
-		if( FlatButtonUI.isIconOnlyButton( c ) && ((JButton)c).getMargin() instanceof UIResource )
-			insets.left = insets.right = Math.min( insets.top, insets.bottom );
+			FlatUIUtils.setInsets( insets, UIScale.scale( FlatUIUtils.addInsets( toolbarSpacingInsets,
+				(margin != null && !(margin instanceof UIResource)) ? margin : toolbarMargin ) ) );
+		} else {
+			insets = super.getBorderInsets( c, insets );
+
+			// use smaller left and right insets for icon-only buttons (so that they are square)
+			if( FlatButtonUI.isIconOnlyButton( c ) && ((AbstractButton)c).getMargin() instanceof UIResource )
+				insets.left = insets.right = Math.min( insets.top, insets.bottom );
+		}
 
 		return insets;
 	}

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

@@ -26,6 +26,7 @@ import java.awt.FontMetrics;
 import java.awt.GradientPaint;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.Insets;
 import java.awt.Rectangle;
 import java.awt.geom.RoundRectangle2D;
 import java.beans.PropertyChangeEvent;
@@ -34,6 +35,7 @@ import javax.swing.ButtonModel;
 import javax.swing.Icon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
+import javax.swing.JToggleButton;
 import javax.swing.JToolBar;
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
@@ -81,6 +83,7 @@ import com.formdev.flatlaf.util.UIScale;
  * @uiDefault Button.shadowWidth				int		default is 2
  * @uiDefault Button.shadowColor				Color	optional
  * @uiDefault Button.default.shadowColor		Color	optional
+ * @uiDefault Button.toolbar.spacingInsets		Insets
  * @uiDefault Button.toolbar.hoverBackground	Color
  * @uiDefault Button.toolbar.pressedBackground	Color
  *
@@ -113,6 +116,7 @@ public class FlatButtonUI
 	protected Color shadowColor;
 	protected Color defaultShadowColor;
 
+	protected Insets toolbarSpacingInsets;
 	protected Color toolbarHoverBackground;
 	protected Color toolbarPressedBackground;
 
@@ -165,6 +169,7 @@ public class FlatButtonUI
 			defaultPressedBackground = UIManager.getColor( "Button.default.pressedBackground" );
 			defaultBoldText = UIManager.getBoolean( "Button.default.boldText" );
 
+			toolbarSpacingInsets = UIManager.getInsets( "Button.toolbar.spacingInsets" );
 			toolbarHoverBackground = UIManager.getColor( prefix + "toolbar.hoverBackground" );
 			toolbarPressedBackground = UIManager.getColor( prefix + "toolbar.pressedBackground" );
 
@@ -222,11 +227,11 @@ public class FlatButtonUI
 	}
 
 	static boolean isIconOnlyButton( Component c ) {
-		if( !(c instanceof JButton) )
+		if( !(c instanceof JButton) && !(c instanceof JToggleButton) )
 			return false;
 
-		Icon icon = ((JButton)c).getIcon();
-		String text = ((JButton)c).getText();
+		Icon icon = ((AbstractButton)c).getIcon();
+		String text = ((AbstractButton)c).getText();
 		return (icon != null && (text == null || text.isEmpty())) ||
 			(icon == null && text != null && ("...".equals( text ) || text.length() == 1));
 	}
@@ -239,7 +244,7 @@ public class FlatButtonUI
 		return c instanceof JButton && clientPropertyEquals( (JButton) c, BUTTON_TYPE, BUTTON_TYPE_HELP );
 	}
 
-	static boolean isToolBarButton( JComponent c ) {
+	static boolean isToolBarButton( Component c ) {
 		return c.getParent() instanceof JToolBar;
 	}
 
@@ -268,27 +273,44 @@ public class FlatButtonUI
 				FlatUIUtils.setRenderingHints( g2 );
 
 				Border border = c.getBorder();
-				float focusWidth = (border instanceof FlatBorder) ? scale( (float) getFocusWidth( c ) ) : 0;
-				float arc = ((border instanceof FlatButtonBorder && !isSquareButton( c )) || isToolBarButton( c ))
+				boolean isToolBarButton = isToolBarButton( c );
+				float focusWidth = (border instanceof FlatBorder && !isToolBarButton) ? scale( (float) getFocusWidth( c ) ) : 0;
+				float arc = ((border instanceof FlatButtonBorder && !isSquareButton( c )) || isToolBarButton)
 					? scale( (float) this.arc ) : 0;
 				boolean def = isDefaultButton( c );
 
+				int x = 0;
+				int y = 0;
+				int width = c.getWidth();
+				int height = c.getHeight();
+
+				if( isToolBarButton ) {
+					Insets spacing = UIScale.scale( toolbarSpacingInsets );
+					x += spacing.left;
+					y += spacing.top;
+					width -= spacing.left + spacing.right;
+					height -= spacing.top + spacing.bottom;
+				}
+
 				// paint shadow
 				Color shadowColor = def ? defaultShadowColor : this.shadowColor;
-				if( shadowColor != null && shadowWidth > 0 && focusWidth > 0 && !c.hasFocus() && c.isEnabled() ) {
+				if( !isToolBarButton && shadowColor != null && shadowWidth > 0 && focusWidth > 0 &&
+					!FlatUIUtils.isPermanentFocusOwner( c ) && c.isEnabled() )
+				{
 					g2.setColor( shadowColor );
 					g2.fill( new RoundRectangle2D.Float( focusWidth, focusWidth + UIScale.scale( (float) shadowWidth ),
-						c.getWidth() - focusWidth * 2, c.getHeight() - focusWidth * 2, arc, arc ) );
+						width - focusWidth * 2, height - focusWidth * 2, arc, arc ) );
 				}
 
 				// paint background
 				Color startBg = def ? defaultBackground : startBackground;
 				Color endBg = def ? defaultEndBackground : endBackground;
 				if( background == startBg && endBg != null && !startBg.equals( endBg ) )
-					g2.setPaint( new GradientPaint( 0, 0, startBg, 0, c.getHeight(), endBg ) );
+					g2.setPaint( new GradientPaint( 0, 0, startBg, 0, height, endBg ) );
 				else
 					FlatUIUtils.setColor( g2, background, def ? defaultBackground : c.getBackground() );
-				FlatUIUtils.paintComponentBackground( g2, 0, 0, c.getWidth(), c.getHeight(), focusWidth, arc );
+
+				FlatUIUtils.paintComponentBackground( g2, x, y, width, height, focusWidth, arc );
 			} finally {
 				g2.dispose();
 			}
@@ -362,7 +384,7 @@ public class FlatButtonUI
 		if( hoverColor != null && b != null && b.getModel().isRollover() )
 			return hoverColor;
 
-		if( focusedColor != null && c.hasFocus() )
+		if( focusedColor != null && FlatUIUtils.isPermanentFocusOwner( c ) )
 			return focusedColor;
 
 		return enabledColor;
@@ -379,6 +401,8 @@ public class FlatButtonUI
 			return new Dimension( helpButtonIcon.getIconWidth(), helpButtonIcon.getIconHeight() );
 
 		Dimension prefSize = super.getPreferredSize( c );
+		if ( prefSize == null )
+			return null;
 
 		// make button square if it is a icon-only button
 		// or apply minimum width, if not in toolbar and not a icon-only button

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatColorChooserUI.java

@@ -16,12 +16,9 @@
 
 package com.formdev.flatlaf.ui;
 
-import java.awt.Dimension;
 import javax.swing.JComponent;
-import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicColorChooserUI;
-import com.formdev.flatlaf.util.UIScale;
 
 /**
  * Provides the Flat LaF UI delegate for {@link javax.swing.JColorChooser}.
@@ -43,21 +40,4 @@ public class FlatColorChooserUI
 	public static ComponentUI createUI( JComponent c ) {
 		return  new FlatColorChooserUI();
 	}
-
-	@Override
-	public void installUI( JComponent c ) {
-		if( UIScale.getUserScaleFactor() != 1f ) {
-			// temporary scale swatch sizes
-			Dimension swatchSize = UIManager.getDimension( "ColorChooser.swatchesSwatchSize" );
-			Dimension swatchSize2 = UIManager.getDimension( "ColorChooser.swatchesRecentSwatchSize" );
-			UIManager.put( "ColorChooser.swatchesSwatchSize", UIScale.scale( swatchSize ) );
-			UIManager.put( "ColorChooser.swatchesRecentSwatchSize", UIScale.scale( swatchSize2 ) );
-
-			super.installUI( c );
-
-			UIManager.put( "ColorChooser.swatchesSwatchSize", null );
-			UIManager.put( "ColorChooser.swatchesRecentSwatchSize", null );
-		} else
-			super.installUI( c );
-	}
 }

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java

@@ -281,13 +281,14 @@ public class FlatComboBoxUI
 		// macOS
 		if( SystemInfo.IS_MAC && editor instanceof JTextComponent ) {
 			// delegate actions from editor text field to combobox, which is necessary
-			// because text field on macOS (based on Aqua LaF UI defaults)
-			// already handle those keys
+			// because text field on macOS already handle those keys
 			InputMap inputMap = ((JTextComponent)editor).getInputMap();
 			new EditorDelegateAction( inputMap, KeyStroke.getKeyStroke( "UP" ) );
 			new EditorDelegateAction( inputMap, KeyStroke.getKeyStroke( "KP_UP" ) );
 			new EditorDelegateAction( inputMap, KeyStroke.getKeyStroke( "DOWN" ) );
 			new EditorDelegateAction( inputMap, KeyStroke.getKeyStroke( "KP_DOWN" ) );
+			new EditorDelegateAction( inputMap, KeyStroke.getKeyStroke( "HOME" ) );
+			new EditorDelegateAction( inputMap, KeyStroke.getKeyStroke( "END" ) );
 		}
 	}
 
@@ -459,12 +460,12 @@ public class FlatComboBoxUI
 	//---- class FlatComboPopup -----------------------------------------------
 
 	@SuppressWarnings( { "rawtypes", "unchecked" } )
-	private class FlatComboPopup
+	protected class FlatComboPopup
 		extends BasicComboPopup
 	{
 		private CellPaddingBorder paddingBorder;
 
-		FlatComboPopup( JComboBox combo ) {
+		protected FlatComboPopup( JComboBox combo ) {
 			super( combo );
 
 			// BasicComboPopup listens to JComboBox.componentOrientation and updates
@@ -479,13 +480,8 @@ public class FlatComboBoxUI
 
 		@Override
 		protected Rectangle computePopupBounds( int px, int py, int pw, int ph ) {
-			// get maximum display size of all items, ignoring prototype value
-			Object prototype = comboBox.getPrototypeDisplayValue();
-			if( prototype != null )
-				comboBox.setPrototypeDisplayValue( null );
+			// get maximum display size of all items
 			Dimension displaySize = getDisplaySize();
-			if( prototype != null )
-				comboBox.setPrototypeDisplayValue( prototype );
 
 			// make popup wider if necessary
 			if( displaySize.width > pw ) {

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatDesktopIconUI.java

@@ -0,0 +1,308 @@
+/*
+ * Copyright 2020 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.ui;
+
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Insets;
+import java.awt.LayoutManager;
+import java.awt.Point;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.image.BufferedImage;
+import java.beans.PropertyVetoException;
+import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.event.MouseInputAdapter;
+import javax.swing.event.MouseInputListener;
+import javax.swing.JLabel;
+import javax.swing.JLayeredPane;
+import javax.swing.JRootPane;
+import javax.swing.JToolTip;
+import javax.swing.LookAndFeel;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicDesktopIconUI;
+import com.formdev.flatlaf.util.UIScale;
+
+/**
+ * Provides the Flat LaF UI delegate for {@link javax.swing.JInternalFrame.JDesktopIcon}.
+ *
+ * <!-- BasicDesktopIconUI -->
+ *
+ * @uiDefault DesktopIcon.border					Border
+ *
+ * <!-- FlatDesktopIconUI -->
+ *
+ * @uiDefault DesktopIcon.background				Color
+ * @uiDefault DesktopIcon.foreground				Color
+ * @uiDefault DesktopIcon.iconSize					Dimension
+ * @uiDefault DesktopIcon.closeSize					Dimension
+ * @uiDefault DesktopIcon.closeIcon					Icon
+ *
+ * @author Karl Tauber
+ */
+public class FlatDesktopIconUI
+	extends BasicDesktopIconUI
+{
+	private Dimension iconSize;
+	private Dimension closeSize;
+
+	private JLabel dockIcon;
+	private JButton closeButton;
+	private JToolTip titleTip;
+	private ActionListener closeListener;
+	private MouseInputListener mouseInputListener;
+
+	public static ComponentUI createUI( JComponent c ) {
+		return new FlatDesktopIconUI();
+	}
+
+	@Override
+	public void uninstallUI( JComponent c ) {
+		super.uninstallUI( c );
+
+		dockIcon = null;
+		closeButton = null;
+	}
+
+	@Override
+	protected void installComponents() {
+		dockIcon = new JLabel();
+		dockIcon.setHorizontalAlignment( SwingConstants.CENTER );
+
+		closeButton = new JButton();
+		closeButton.setIcon( UIManager.getIcon( "DesktopIcon.closeIcon" ) );
+		closeButton.setFocusable( false );
+		closeButton.setBorder( BorderFactory.createEmptyBorder() );
+		closeButton.setOpaque( true );
+		closeButton.setBackground( FlatUIUtils.nonUIResource( desktopIcon.getBackground() ) );
+		closeButton.setForeground( FlatUIUtils.nonUIResource( desktopIcon.getForeground() ) );
+		closeButton.setVisible( false );
+
+		desktopIcon.setLayout( new FlatDesktopIconLayout() );
+		desktopIcon.add( closeButton );
+		desktopIcon.add( dockIcon );
+	}
+
+	@Override
+	protected void uninstallComponents() {
+		hideTitleTip();
+
+		desktopIcon.remove( dockIcon );
+		desktopIcon.remove( closeButton );
+		desktopIcon.setLayout( null );
+	}
+
+	@Override
+	protected void installDefaults() {
+		super.installDefaults();
+
+		LookAndFeel.installColors( desktopIcon, "DesktopIcon.background", "DesktopIcon.foreground" );
+
+		iconSize = UIManager.getDimension( "DesktopIcon.iconSize" );
+		closeSize = UIManager.getDimension( "DesktopIcon.closeSize" );
+	}
+
+	@Override
+	protected void installListeners() {
+		super.installListeners();
+
+		closeListener = e -> {
+			if( frame.isClosable() )
+				frame.doDefaultCloseAction();
+		};
+		closeButton.addActionListener( closeListener );
+		closeButton.addMouseListener( mouseInputListener );
+	}
+
+	@Override
+	protected void uninstallListeners() {
+		super.uninstallListeners();
+
+		closeButton.removeActionListener( closeListener );
+		closeButton.removeMouseListener( mouseInputListener );
+		closeListener = null;
+		mouseInputListener = null;
+	}
+
+	@Override
+	protected MouseInputListener createMouseInputListener() {
+		mouseInputListener = new MouseInputAdapter() {
+			@Override
+			public void mouseReleased( MouseEvent e ) {
+				if( frame.isIcon() && desktopIcon.contains( e.getX(), e.getY() ) ) {
+					hideTitleTip();
+					closeButton.setVisible( false );
+
+					try {
+						frame.setIcon( false );
+					} catch( PropertyVetoException ex ) {
+						// ignore
+					}
+				}
+			}
+
+			@Override
+			public void mouseEntered( MouseEvent e ) {
+				showTitleTip();
+				if( frame.isClosable() )
+					closeButton.setVisible( true );
+			}
+
+			@Override
+			public void mouseExited( MouseEvent e ) {
+				hideTitleTip();
+				closeButton.setVisible( false );
+			}
+		};
+		return mouseInputListener;
+	}
+
+	private void showTitleTip() {
+		JRootPane rootPane = SwingUtilities.getRootPane( desktopIcon );
+		if( rootPane == null )
+			return;
+
+		if( titleTip == null ) {
+			titleTip = new JToolTip();
+			rootPane.getLayeredPane().add( titleTip, JLayeredPane.POPUP_LAYER );
+		}
+		titleTip.setTipText( frame.getTitle() );
+		titleTip.setSize( titleTip.getPreferredSize() );
+
+		int tx = (desktopIcon.getWidth() - titleTip.getWidth()) / 2;
+		int ty = -(titleTip.getHeight() + UIScale.scale( 4 ));
+		Point pt = SwingUtilities.convertPoint( desktopIcon, tx, ty, titleTip.getParent() );
+		if( pt.x + titleTip.getWidth() > rootPane.getWidth() )
+			pt.x = rootPane.getWidth() - titleTip.getWidth();
+		if( pt.x < 0 )
+			pt.x = 0;
+		titleTip.setLocation( pt );
+		titleTip.repaint();
+	}
+
+	private void hideTitleTip() {
+		if( titleTip == null )
+			return;
+
+		titleTip.setVisible( false );
+		titleTip.getParent().remove( titleTip );
+		titleTip = null;
+	}
+
+	@Override
+	public Dimension getPreferredSize( JComponent c ) {
+		return UIScale.scale( iconSize );
+	}
+
+	@Override
+	public Dimension getMinimumSize( JComponent c ) {
+		return getPreferredSize( c );
+	}
+
+	@Override
+	public Dimension getMaximumSize( JComponent c ) {
+		return getPreferredSize( c );
+	}
+
+	void updateDockIcon() {
+		// use invoke later to make sure that components are updated when switching LaF
+		EventQueue.invokeLater( () -> {
+			if( dockIcon != null )
+				updateDockIconLater();
+		} );
+	}
+
+	private void updateDockIconLater() {
+		// make sure that frame is not selected
+		if( frame.isSelected() ) {
+			try {
+				frame.setSelected( false );
+			} catch( PropertyVetoException ex ) {
+				// ignore
+			}
+		}
+
+		// paint internal frame to buffered image
+		int frameWidth = Math.max( frame.getWidth(), 1 );
+		int frameHeight = Math.max( frame.getHeight(), 1 );
+		BufferedImage frameImage = new BufferedImage( frameWidth, frameHeight, BufferedImage.TYPE_INT_ARGB );
+		Graphics2D g = frameImage.createGraphics();
+		try {
+			//TODO fix missing internal frame header when switching LaF
+			frame.paint( g );
+		} finally {
+			g.dispose();
+		}
+
+		// compute preview size (keep ratio; also works with non-square preview)
+		Insets insets = desktopIcon.getInsets();
+		int previewWidth = UIScale.scale( iconSize.width ) - insets.left - insets.right;
+		int previewHeight = UIScale.scale( iconSize.height ) - insets.top - insets.bottom;
+		float frameRatio = ((float) frameHeight / (float) frameWidth);
+		if( ((float) previewWidth / (float) frameWidth) > ((float) previewHeight / (float) frameHeight) )
+			previewWidth = Math.round( previewHeight / frameRatio );
+		else
+			previewHeight = Math.round( previewWidth * frameRatio );
+
+		// scale preview
+		Image previewImage = frameImage.getScaledInstance( previewWidth, previewHeight, Image.SCALE_SMOOTH );
+		dockIcon.setIcon( new ImageIcon( previewImage ) );
+	}
+
+	//---- class DockIcon -----------------------------------------------------
+
+	private class FlatDesktopIconLayout
+		implements LayoutManager
+	{
+		@Override public void addLayoutComponent( String name, Component comp ) {}
+		@Override public void removeLayoutComponent( Component comp ) {}
+
+		@Override
+		public Dimension preferredLayoutSize( Container parent ) {
+			return dockIcon.getPreferredSize();
+		}
+
+		@Override
+		public Dimension minimumLayoutSize( Container parent ) {
+			return dockIcon.getMinimumSize();
+		}
+
+		@Override
+		public void layoutContainer( Container parent ) {
+			Insets insets = parent.getInsets();
+
+			// dock icon
+			dockIcon.setBounds( insets.left, insets.top,
+				parent.getWidth() - insets.left - insets.right,
+				parent.getHeight() - insets.top - insets.bottom );
+
+			// close button in upper right corner
+			Dimension cSize = UIScale.scale( closeSize );
+			closeButton.setBounds( parent.getWidth() - cSize.width, 0, cSize.width, cSize.height );
+		}
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatDesktopPaneUI.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2020 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.ui;
+
+import javax.swing.DefaultDesktopManager;
+import javax.swing.JComponent;
+import javax.swing.JInternalFrame;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.UIResource;
+import javax.swing.plaf.basic.BasicDesktopPaneUI;
+
+/**
+ * Provides the Flat LaF UI delegate for {@link javax.swing.JDesktopPane}.
+ *
+ * <!-- BasicDesktopPaneUI -->
+ *
+ * @uiDefault Desktop.background					Color
+ * @uiDefault Desktop.minOnScreenInsets				Insets
+ *
+ * @author Karl Tauber
+ */
+public class FlatDesktopPaneUI
+	extends BasicDesktopPaneUI
+{
+	public static ComponentUI createUI( JComponent c ) {
+		return new FlatDesktopPaneUI();
+	}
+
+	@Override
+	protected void installDesktopManager() {
+		desktopManager = desktop.getDesktopManager();
+		if( desktopManager == null ) {
+			desktopManager = new FlatDesktopManager();
+			desktop.setDesktopManager( desktopManager );
+		}
+	}
+
+	//---- class FlatDesktopManager -------------------------------------------
+
+	private class FlatDesktopManager
+		extends DefaultDesktopManager
+		implements UIResource
+	{
+		@Override
+		public void iconifyFrame( JInternalFrame f ) {
+			super.iconifyFrame( f );
+
+			((FlatDesktopIconUI)f.getDesktopIcon().getUI()).updateDockIcon();
+		}
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEmptyBorder.java

@@ -50,9 +50,10 @@ public class FlatEmptyBorder
 
 	@Override
 	public Insets getBorderInsets( Component c, Insets insets ) {
-		insets.left = scale( left );
+		boolean leftToRight = left == right || c.getComponentOrientation().isLeftToRight();
+		insets.left = scale( leftToRight ? left : right );
 		insets.top = scale( top );
-		insets.right = scale( right );
+		insets.right = scale( leftToRight ? right : left );
 		insets.bottom = scale( bottom );
 		return insets;
 	}

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatFormattedTextFieldUI.java

@@ -39,6 +39,7 @@ import javax.swing.plaf.ComponentUI;
  *
  * <!-- FlatTextFieldUI -->
  *
+ * @uiDefault TextComponent.arc							int
  * @uiDefault Component.focusWidth						int
  * @uiDefault Component.minimumWidth					int
  * @uiDefault Component.isIntelliJTheme					boolean

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatInternalFrameTitlePane.java

@@ -0,0 +1,190 @@
+/*
+ * Copyright 2020 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.ui;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.LayoutManager;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+import javax.swing.Icon;
+import javax.swing.JInternalFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.LookAndFeel;
+import javax.swing.UIManager;
+import javax.swing.border.Border;
+import javax.swing.plaf.basic.BasicInternalFrameTitlePane;
+import com.formdev.flatlaf.util.UIScale;
+
+/**
+ * Provides the Flat LaF internal frame title bar.
+ *
+ * @author Karl Tauber
+ */
+public class FlatInternalFrameTitlePane
+	extends BasicInternalFrameTitlePane
+{
+	private JLabel titleLabel;
+	private JPanel buttonPanel;
+
+	public FlatInternalFrameTitlePane( JInternalFrame f ) {
+		super( f );
+	}
+
+	@Override
+	protected void installDefaults() {
+		super.installDefaults();
+
+		LookAndFeel.installBorder( this, "InternalFrameTitlePane.border" );
+	}
+
+	@Override
+	protected PropertyChangeListener createPropertyChangeListener() {
+		return new FlatPropertyChangeHandler();
+	}
+
+	@Override
+	protected LayoutManager createLayout() {
+		return new BorderLayout( UIScale.scale( 4 ), 0 );
+	}
+
+	@Override
+	protected void createButtons() {
+		super.createButtons();
+
+		iconButton.setContentAreaFilled( false );
+		maxButton.setContentAreaFilled( false );
+		closeButton.setContentAreaFilled( false );
+
+		Border emptyBorder = BorderFactory.createEmptyBorder();
+		iconButton.setBorder( emptyBorder );
+		maxButton.setBorder( emptyBorder );
+		closeButton.setBorder( emptyBorder );
+
+		updateButtonsVisibility();
+	}
+
+	@Override
+	protected void addSubComponents() {
+		titleLabel = new JLabel( frame.getTitle() );
+		titleLabel.setFont( FlatUIUtils.nonUIResource( getFont() ) );
+		titleLabel.setMinimumSize( new Dimension( UIScale.scale( 32 ), 1 ) );
+		updateFrameIcon();
+		updateColors();
+
+		buttonPanel = new JPanel();
+		buttonPanel.setLayout( new BoxLayout( buttonPanel, BoxLayout.LINE_AXIS ) );
+		buttonPanel.setOpaque( false );
+
+		buttonPanel.add( iconButton );
+		buttonPanel.add( maxButton );
+		buttonPanel.add( closeButton );
+
+		add( titleLabel, BorderLayout.CENTER );
+		add( buttonPanel, BorderLayout.LINE_END );
+	}
+
+	private void updateFrameIcon() {
+		Icon frameIcon = frame.getFrameIcon();
+		if( frameIcon == UIManager.getIcon( "InternalFrame.icon" ) )
+			frameIcon = null;
+		titleLabel.setIcon( frameIcon );
+	}
+
+	private void updateColors() {
+		Color background = FlatUIUtils.nonUIResource( frame.isSelected() ? selectedTitleColor : notSelectedTitleColor );
+		Color foreground = FlatUIUtils.nonUIResource( frame.isSelected() ? selectedTextColor : notSelectedTextColor );
+
+		titleLabel.setForeground( foreground );
+		iconButton.setBackground( background );
+		iconButton.setForeground( foreground );
+		maxButton.setBackground( background );
+		maxButton.setForeground( foreground );
+		closeButton.setBackground( background );
+		closeButton.setForeground( foreground );
+	}
+
+	private void updateButtonsVisibility() {
+		iconButton.setVisible( frame.isIconifiable() );
+		maxButton.setVisible( frame.isMaximizable() );
+		closeButton.setVisible( frame.isClosable() );
+	}
+
+	/**
+	 * Does nothing because FlatLaf internal frames do not have system menus.
+	 */
+	@Override
+	protected void assembleSystemMenu() {
+	}
+
+	/**
+	 * Does nothing because FlatLaf internal frames do not have system menus.
+	 */
+	@Override
+	protected void showSystemMenu() {
+	}
+
+	@Override
+	public void paintComponent( Graphics g ) {
+		paintTitleBackground( g );
+	}
+
+	//---- class FlatPropertyChangeHandler ------------------------------------
+
+	private class FlatPropertyChangeHandler
+		extends PropertyChangeHandler
+	{
+		@Override
+		public void propertyChange( PropertyChangeEvent e ) {
+			switch( e.getPropertyName() ) {
+				case JInternalFrame.TITLE_PROPERTY:
+					titleLabel.setText( frame.getTitle() );
+					break;
+
+				case JInternalFrame.FRAME_ICON_PROPERTY:
+					updateFrameIcon();
+					break;
+
+				case JInternalFrame.IS_SELECTED_PROPERTY:
+					updateColors();
+					break;
+
+				case "iconable":
+				case "maximizable":
+				case "closable":
+					updateButtonsVisibility();
+					enableActions();
+					revalidate();
+					repaint();
+
+					// do not invoke super.propertyChange() because this adds/removes the buttons
+					return;
+
+				case "componentOrientation":
+					applyComponentOrientation( frame.getComponentOrientation() );
+					break;
+			}
+
+			super.propertyChange( e );
+		}
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatInternalFrameUI.java

@@ -0,0 +1,155 @@
+/*
+ * Copyright 2020 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+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;
+import java.awt.Graphics2D;
+import java.awt.Insets;
+import javax.swing.JComponent;
+import javax.swing.JInternalFrame;
+import javax.swing.LookAndFeel;
+import javax.swing.UIManager;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicInternalFrameUI;
+
+/**
+ * Provides the Flat LaF UI delegate for {@link javax.swing.JInternalFrame}.
+ *
+ * <!-- BasicInternalFrameUI -->
+ *
+ * @uiDefault control											Color
+ * @uiDefault InternalFrame.icon								Icon
+ * @uiDefault InternalFrame.border								Border
+ * @uiDefault InternalFrame.layoutTitlePaneAtOrigin				boolean
+ *
+ * <!-- BasicInternalFrameTitlePane -->
+ *
+ * @uiDefault InternalFrame.titleFont							Font
+ * @uiDefault InternalFrame.icon								Icon
+ * @uiDefault InternalFrame.maximizeIcon						Icon
+ * @uiDefault InternalFrame.minimizeIcon						Icon
+ * @uiDefault InternalFrame.iconifyIcon							Icon
+ * @uiDefault InternalFrame.closeIcon							Icon
+ * @uiDefault InternalFrame.activeTitleBackground				Color
+ * @uiDefault InternalFrame.activeTitleForeground				Color
+ * @uiDefault InternalFrame.inactiveTitleBackground				Color
+ * @uiDefault InternalFrame.inactiveTitleForeground				Color
+ * @uiDefault InternalFrame.closeButtonToolTip					String
+ * @uiDefault InternalFrame.iconButtonToolTip					String
+ * @uiDefault InternalFrame.restoreButtonToolTip				String
+ * @uiDefault InternalFrame.maxButtonToolTip					String
+ * @uiDefault InternalFrameTitlePane.closeButtonText			String
+ * @uiDefault InternalFrameTitlePane.minimizeButtonText			String
+ * @uiDefault InternalFrameTitlePane.restoreButtonText			String
+ * @uiDefault InternalFrameTitlePane.maximizeButtonText			String
+ * @uiDefault InternalFrameTitlePane.moveButtonText				String
+ * @uiDefault InternalFrameTitlePane.sizeButtonText				String
+ * @uiDefault InternalFrameTitlePane.closeButton.mnemonic		Integer
+ * @uiDefault InternalFrameTitlePane.minimizeButton.mnemonic	Integer
+ * @uiDefault InternalFrameTitlePane.restoreButton.mnemonic		Integer
+ * @uiDefault InternalFrameTitlePane.maximizeButton.mnemonic	Integer
+ * @uiDefault InternalFrameTitlePane.moveButton.mnemonic		Integer
+ * @uiDefault InternalFrameTitlePane.sizeButton.mnemonic		Integer
+ *
+ * <!-- FlatInternalFrameUI -->
+ *
+ * @uiDefault InternalFrame.activeBorderColor					Color
+ * @uiDefault InternalFrame.inactiveBorderColor					Color
+ * @uiDefault InternalFrame.borderLineWidth						int
+ * @uiDefault InternalFrame.borderMargins						Insets
+ *
+ * <!-- FlatInternalFrameTitlePane -->
+ *
+ * @uiDefault InternalFrameTitlePane.border						Border
+ *
+ * @author Karl Tauber
+ */
+public class FlatInternalFrameUI
+	extends BasicInternalFrameUI
+{
+	public static ComponentUI createUI( JComponent c ) {
+		return new FlatInternalFrameUI( (JInternalFrame) c );
+	}
+
+	public FlatInternalFrameUI( JInternalFrame b ) {
+		super( b );
+	}
+
+	@Override
+	public void installUI( JComponent c ) {
+		super.installUI( c );
+
+		LookAndFeel.installProperty( frame, "opaque", false );
+	}
+
+	@Override
+	protected JComponent createNorthPane( JInternalFrame w ) {
+		return new FlatInternalFrameTitlePane( w );
+	}
+
+	//---- class FlatInternalFrameBorder --------------------------------------
+
+	public static class FlatInternalFrameBorder
+		extends FlatEmptyBorder
+	{
+		private final Color activeBorderColor = UIManager.getColor( "InternalFrame.activeBorderColor" );
+		private final Color inactiveBorderColor = UIManager.getColor( "InternalFrame.inactiveBorderColor" );
+		private final int borderLineWidth = FlatUIUtils.getUIInt( "InternalFrame.borderLineWidth", 1 );
+
+		public FlatInternalFrameBorder() {
+			super( UIManager.getInsets( "InternalFrame.borderMargins" ) );
+		}
+
+		@Override
+		public Insets getBorderInsets( Component c, Insets insets ) {
+			if( c instanceof JInternalFrame && ((JInternalFrame)c).isMaximum() ) {
+				insets.left = scale( Math.min( borderLineWidth, left ) );
+				insets.top = scale( Math.min( borderLineWidth, top ) );
+				insets.right = scale( Math.min( borderLineWidth, right ) );
+				insets.bottom = scale( Math.min( borderLineWidth, bottom ) );
+				return insets;
+			}
+
+			return super.getBorderInsets( c, insets );
+		}
+
+		@Override
+		public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
+			JInternalFrame f = (JInternalFrame) c;
+
+			Insets insets = getBorderInsets( c );
+			float lineWidth = scale( (float) borderLineWidth );
+
+			Graphics2D g2 = (Graphics2D) g.create();
+			try {
+				FlatUIUtils.setRenderingHints( g2 );
+				g2.setColor( f.isSelected() ? activeBorderColor : inactiveBorderColor );
+				g2.fill( FlatUIUtils.createRectangle(
+					x + insets.left - lineWidth,
+					y + insets.top - lineWidth,
+					width - insets.left - insets.right + (lineWidth * 2),
+					height - insets.top - insets.bottom + (lineWidth * 2),
+					lineWidth ) );
+			} finally {
+				g2.dispose();
+			}
+		}
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLineBorder.java

@@ -26,9 +26,9 @@ import java.awt.Insets;
 /**
  * Line border for various components.
  *
- * Paints a scaled 1px thick line around the component.
- * The line thickness is not included in the border insets.
- * The insets should be at least 1,1,1,1.
+ * Paints a scaled (usually 1px thick) line around the component.
+ * The line thickness is not added to the border insets.
+ * The insets should be at least have line thickness (usually 1,1,1,1).
  *
  * @author Karl Tauber
  */
@@ -36,10 +36,16 @@ public class FlatLineBorder
 	extends FlatEmptyBorder
 {
 	private final Color lineColor;
+	private final float lineThickness;
 
 	public FlatLineBorder( Insets insets, Color lineColor ) {
+		this( insets, lineColor, 1f );
+	}
+
+	public FlatLineBorder( Insets insets, Color lineColor, float lineThickness ) {
 		super( insets );
 		this.lineColor = lineColor;
+		this.lineThickness = lineThickness;
 	}
 
 	@Override
@@ -48,7 +54,7 @@ public class FlatLineBorder
 		try {
 			FlatUIUtils.setRenderingHints( g2 );
 			g2.setColor( lineColor );
-			FlatUIUtils.paintComponentBorder( g2, x, y, width, height, 0f, scale( 1f ), 0f );
+			FlatUIUtils.paintComponentBorder( g2, x, y, width, height, 0f, scale( lineThickness ), 0f );
 		} finally {
 			g2.dispose();
 		}

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListUI.java

@@ -81,7 +81,7 @@ public class FlatListUI
 		selectionInactiveBackground = UIManager.getColor( "List.selectionInactiveBackground" );
 		selectionInactiveForeground = UIManager.getColor( "List.selectionInactiveForeground" );
 
-		toggleSelectionColors( list.hasFocus() );
+		toggleSelectionColors();
 	}
 
 	@Override
@@ -100,13 +100,13 @@ public class FlatListUI
 			@Override
 			public void focusGained( FocusEvent e ) {
 				super.focusGained( e );
-				toggleSelectionColors( true );
+				toggleSelectionColors();
 			}
 
 			@Override
 			public void focusLost( FocusEvent e ) {
 				super.focusLost( e );
-				toggleSelectionColors( false );
+				toggleSelectionColors();
 			}
 		};
 	}
@@ -120,8 +120,8 @@ public class FlatListUI
 	 * already used in applications. Then either the inactive colors are not used,
 	 * or the application has to be changed to extend a FlatLaf renderer.
 	 */
-	private void toggleSelectionColors( boolean focused ) {
-		if( focused ) {
+	private void toggleSelectionColors() {
+		if( FlatUIUtils.isPermanentFocusOwner( list ) ) {
 			if( list.getSelectionBackground() == selectionInactiveBackground )
 				list.setSelectionBackground( selectionBackground );
 			if( list.getSelectionForeground() == selectionInactiveForeground )

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMarginBorder.java

@@ -29,13 +29,26 @@ import javax.swing.plaf.basic.BasicBorders;
 public class FlatMarginBorder
 	extends BasicBorders.MarginBorder
 {
+	private final int left, right, top, bottom;
+
+	public FlatMarginBorder() {
+		left = right = top = bottom = 0;
+	}
+
+	public FlatMarginBorder( Insets insets ) {
+		left = insets.left;
+		top = insets.top;
+		right = insets.right;
+		bottom = insets.bottom;
+	}
+
 	@Override
 	public Insets getBorderInsets( Component c, Insets insets ) {
 		insets = super.getBorderInsets( c, insets );
-		insets.top = scale( insets.top );
-		insets.left = scale( insets.left );
-		insets.bottom = scale( insets.bottom );
-		insets.right = scale( insets.right );
+		insets.top = scale( insets.top + top );
+		insets.left = scale( insets.left + left );
+		insets.bottom = scale( insets.bottom + bottom );
+		insets.right = scale( insets.right + right );
 		return insets;
 	}
 }

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPanelUI.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2020 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.ui;
+
+import javax.swing.JComponent;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicPanelUI;
+
+/**
+ * Provides the Flat LaF UI delegate for {@link javax.swing.JPanel}.
+ *
+ * <!-- BasicPanelUI -->
+ *
+ * @uiDefault Panel.font				Font	unused
+ * @uiDefault Panel.background			Color	only used if opaque
+ * @uiDefault Panel.foreground			Color
+ * @uiDefault Panel.border				Border
+ *
+ * @author Karl Tauber
+ */
+public class FlatPanelUI
+	extends BasicPanelUI
+{
+	private static ComponentUI instance;
+
+	public static ComponentUI createUI( JComponent c ) {
+		if( instance == null )
+			instance = new FlatPanelUI();
+		return instance;
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPasswordFieldUI.java

@@ -20,16 +20,21 @@ import static com.formdev.flatlaf.util.UIScale.scale;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
+import java.awt.Toolkit;
 import java.awt.event.FocusListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 import java.beans.PropertyChangeEvent;
+import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicPasswordFieldUI;
 import javax.swing.text.Caret;
+import javax.swing.text.JTextComponent;
 import com.formdev.flatlaf.FlatClientProperties;
-import com.formdev.flatlaf.util.SystemInfo;
 
 /**
  * Provides the Flat LaF UI delegate for {@link javax.swing.JPasswordField}.
@@ -52,10 +57,12 @@ import com.formdev.flatlaf.util.SystemInfo;
  *
  * <!-- FlatPasswordFieldUI -->
  *
+ * @uiDefault TextComponent.arc						int
  * @uiDefault Component.focusWidth					int
  * @uiDefault Component.minimumWidth				int
  * @uiDefault Component.isIntelliJTheme				boolean
  * @uiDefault PasswordField.placeholderForeground	Color
+ * @uiDefault PasswordField.capsLockIcon			Icon
  * @uiDefault TextComponent.selectAllOnFocusPolicy	String	never, once (default) or always
  *
  * @author Karl Tauber
@@ -63,12 +70,15 @@ import com.formdev.flatlaf.util.SystemInfo;
 public class FlatPasswordFieldUI
 	extends BasicPasswordFieldUI
 {
+	protected int arc;
 	protected int focusWidth;
 	protected int minimumWidth;
 	protected boolean isIntelliJTheme;
 	protected Color placeholderForeground;
+	protected Icon capsLockIcon;
 
 	private FocusListener focusListener;
+	private KeyListener capsLockListener;
 
 	public static ComponentUI createUI( JComponent c ) {
 		return new FlatPasswordFieldUI();
@@ -78,15 +88,13 @@ public class FlatPasswordFieldUI
 	protected void installDefaults() {
 		super.installDefaults();
 
-		// use other echoChar on Mac because the default is too large in SF font
-		if( SystemInfo.IS_MAC )
-			LookAndFeel.installProperty( getComponent(), "echoChar", '\u2022' );
-
 		String prefix = getPropertyPrefix();
+		arc = UIManager.getInt( "TextComponent.arc" );
 		focusWidth = UIManager.getInt( "Component.focusWidth" );
 		minimumWidth = UIManager.getInt( "Component.minimumWidth" );
 		isIntelliJTheme = UIManager.getBoolean( "Component.isIntelliJTheme" );
 		placeholderForeground = UIManager.getColor( prefix + ".placeholderForeground" );
+		capsLockIcon = UIManager.getIcon( "PasswordField.capsLockIcon" );
 
 		LookAndFeel.installProperty( getComponent(), "opaque", focusWidth == 0 );
 
@@ -98,6 +106,7 @@ public class FlatPasswordFieldUI
 		super.uninstallDefaults();
 
 		placeholderForeground = null;
+		capsLockIcon = null;
 
 		MigLayoutVisualPadding.uninstall( getComponent() );
 	}
@@ -107,7 +116,23 @@ public class FlatPasswordFieldUI
 		super.installListeners();
 
 		focusListener = new FlatUIUtils.RepaintFocusListener( getComponent() );
+		capsLockListener = new KeyAdapter() {
+			@Override
+			public void keyPressed( KeyEvent e ) {
+				repaint( e );
+			}
+			@Override
+			public void keyReleased( KeyEvent e ) {
+				repaint( e );
+			}
+			private void repaint( KeyEvent e ) {
+				if( e.getKeyCode() == KeyEvent.VK_CAPS_LOCK )
+					e.getComponent().repaint();
+			}
+		};
+
 		getComponent().addFocusListener( focusListener );
+		getComponent().addKeyListener( capsLockListener );
 	}
 
 	@Override
@@ -115,7 +140,9 @@ public class FlatPasswordFieldUI
 		super.uninstallListeners();
 
 		getComponent().removeFocusListener( focusListener );
+		getComponent().removeKeyListener( capsLockListener );
 		focusListener = null;
+		capsLockListener = null;
 	}
 
 	@Override
@@ -133,11 +160,23 @@ public class FlatPasswordFieldUI
 
 	@Override
 	protected void paintSafely( Graphics g ) {
-		FlatTextFieldUI.paintBackground( g, getComponent(), focusWidth, isIntelliJTheme );
+		FlatTextFieldUI.paintBackground( g, getComponent(), focusWidth, arc, isIntelliJTheme );
 		FlatTextFieldUI.paintPlaceholder( g, getComponent(), placeholderForeground );
+		paintCapsLock( g );
 		super.paintSafely( g );
 	}
 
+	protected void paintCapsLock( Graphics g ) {
+		JTextComponent c = getComponent();
+		if( !FlatUIUtils.isPermanentFocusOwner( c ) ||
+			!Toolkit.getDefaultToolkit().getLockingKeyState( KeyEvent.VK_CAPS_LOCK ) )
+		  return;
+
+		int y = (c.getHeight() - capsLockIcon.getIconHeight()) / 2;
+		int x = c.getWidth() - capsLockIcon.getIconWidth() - y;
+		capsLockIcon.paintIcon( c, g, x, y );
+	}
+
 	@Override
 	protected void paintBackground( Graphics g ) {
 		// background is painted elsewhere

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatProgressBarUI.java

@@ -193,4 +193,19 @@ public class FlatProgressBarUI
 				paintString( g, x, y, width, height, amountFull, insets );
 		}
 	}
+
+	@Override
+	protected void setAnimationIndex( int newValue ) {
+		super.setAnimationIndex( newValue );
+
+		// On HiDPI screens at 125%, 150% and 175% scaling, it occurs that antialiased painting
+		// may paint one pixel outside of the clipping area. This results in visual artifacts
+		// in indeterminate mode when the progress moves around.
+		// Unfortunately it is not safe to invoke getBox() from here (may throw NPE),
+		// which makes it impractical to get progress box and repaint increased box.
+		// Only solution is to repaint whole progress bar.
+		double systemScaleFactor = UIScale.getSystemScaleFactor( progressBar.getGraphicsConfiguration() );
+		if( (int) systemScaleFactor != systemScaleFactor )
+			progressBar.repaint();
+	}
 }

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java

@@ -101,6 +101,8 @@ public class FlatRadioButtonUI
 	@Override
 	public Dimension getPreferredSize( JComponent c ) {
 		Dimension size = super.getPreferredSize( c );
+		if( size == null )
+			return null;
 
 		// small insets fix
 		int focusWidth = getIconFocusWidth( c );
@@ -118,11 +120,13 @@ public class FlatRadioButtonUI
 
 	@Override
 	public void paint( Graphics g, JComponent c ) {
-		// fill background even if opaque if
-		// - used as cell renderer (because of selection background)
-		// - if background was explicitly set to a non-UIResource color
+		// fill background even if not opaque if
+		// - contentAreaFilled is true and
+		//   - used as cell renderer (because of selection background)
+		//   - or if background was explicitly set to a non-UIResource color
 		if( !c.isOpaque() &&
-			(c.getParent() instanceof CellRendererPane || !(c.getBackground() instanceof UIResource)) )
+			((AbstractButton)c).isContentAreaFilled() &&
+			(c.getParent() instanceof CellRendererPane || !(c.getBackground() instanceof UIResource)))
 		{
 			g.setColor( c.getBackground() );
 			g.fillRect( 0, 0, c.getWidth(), c.getHeight() );

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRootPaneUI.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2020 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.ui;
+
+import javax.swing.JComponent;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicRootPaneUI;
+
+/**
+ * Provides the Flat LaF UI delegate for {@link javax.swing.JRootPane}.
+ *
+ * @author Karl Tauber
+ */
+public class FlatRootPaneUI
+	extends BasicRootPaneUI
+{
+	private static ComponentUI instance;
+
+	public static ComponentUI createUI( JComponent c ) {
+		if( instance == null )
+			instance = new FlatRootPaneUI();
+		return instance;
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java

@@ -25,9 +25,11 @@ import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Objects;
+import javax.swing.InputMap;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicScrollBarUI;
@@ -127,9 +129,24 @@ public class FlatScrollBarUI
 			public void propertyChange( PropertyChangeEvent e ) {
 				super.propertyChange( e );
 
-				if( FlatClientProperties.SCROLL_BAR_SHOW_BUTTONS.equals( e.getPropertyName() ) ) {
-					scrollbar.revalidate();
-					scrollbar.repaint();
+				switch( e.getPropertyName() ) {
+					case FlatClientProperties.SCROLL_BAR_SHOW_BUTTONS:
+						scrollbar.revalidate();
+						scrollbar.repaint();
+						break;
+
+					case "componentOrientation":
+						// this is missing in BasicScrollBarUI.Handler.propertyChange()
+						InputMap inputMap = (InputMap) UIManager.get( "ScrollBar.ancestorInputMap" );
+						if( !scrollbar.getComponentOrientation().isLeftToRight() ) {
+							InputMap rtlInputMap = (InputMap) UIManager.get( "ScrollBar.ancestorInputMap.RightToLeft" );
+							if( rtlInputMap != null ) {
+								rtlInputMap.setParent( inputMap );
+								inputMap = rtlInputMap;
+							}
+						}
+						SwingUtilities.replaceUIInputMap( scrollbar, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, inputMap );
+						break;
 				}
 			}
 		};

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java

@@ -201,7 +201,7 @@ public class FlatSliderUI
 		}
 
 		if( coloredTrack != null ) {
-			FlatUIUtils.setColor( g, slider.hasFocus() ? focusColor : (hover ? hoverColor : thumbColor), thumbColor );
+			FlatUIUtils.setColor( g, FlatUIUtils.isPermanentFocusOwner( slider ) ? focusColor : (hover ? hoverColor : thumbColor), thumbColor );
 			((Graphics2D)g).fill( coloredTrack );
 		}
 
@@ -212,7 +212,7 @@ public class FlatSliderUI
 	@Override
 	public void paintThumb( Graphics g ) {
 		FlatUIUtils.setColor( g, slider.isEnabled()
-			? (slider.hasFocus() ? focusColor : (hover ? hoverColor : thumbColor))
+			? (FlatUIUtils.isPermanentFocusOwner( slider ) ? focusColor : (hover ? hoverColor : thumbColor))
 			: disabledForeground,
 			thumbColor );
 

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java

@@ -26,15 +26,21 @@ import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Insets;
+import java.awt.KeyboardFocusManager;
 import java.awt.Rectangle;
 import java.awt.Shape;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
 import java.awt.geom.Path2D;
 import java.awt.geom.Rectangle2D;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.util.Collections;
+import java.util.Set;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JTabbedPane;
+import javax.swing.KeyStroke;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.UIResource;
@@ -82,6 +88,7 @@ import com.formdev.flatlaf.util.UIScale;
  * @uiDefault TabbedPane.tabSelectionHeight				int
  * @uiDefault TabbedPane.contentSeparatorHeight			int
  * @uiDefault TabbedPane.showTabSeparators				boolean
+ * @uiDefault TabbedPane.tabSeparatorsFullHeight		boolean
  * @uiDefault TabbedPane.hasFullBorder					boolean
  *
  * @author Karl Tauber
@@ -89,6 +96,9 @@ import com.formdev.flatlaf.util.UIScale;
 public class FlatTabbedPaneUI
 	extends BasicTabbedPaneUI
 {
+	private static Set<KeyStroke> focusForwardTraversalKeys;
+	private static Set<KeyStroke> focusBackwardTraversalKeys;
+
 	protected Color disabledForeground;
 	protected Color selectedBackground;
 	protected Color selectedForeground;
@@ -103,6 +113,7 @@ public class FlatTabbedPaneUI
 	protected int tabSelectionHeight;
 	protected int contentSeparatorHeight;
 	protected boolean showTabSeparators;
+	protected boolean tabSeparatorsFullHeight;
 	protected boolean hasFullBorder;
 	protected boolean tabsOverlapBorder;
 
@@ -128,6 +139,7 @@ public class FlatTabbedPaneUI
 		tabSelectionHeight = UIManager.getInt( "TabbedPane.tabSelectionHeight" );
 		contentSeparatorHeight = UIManager.getInt( "TabbedPane.contentSeparatorHeight" );
 		showTabSeparators = UIManager.getBoolean( "TabbedPane.showTabSeparators" );
+		tabSeparatorsFullHeight = UIManager.getBoolean( "TabbedPane.tabSeparatorsFullHeight" );
 		hasFullBorder = UIManager.getBoolean( "TabbedPane.hasFullBorder" );
 		tabsOverlapBorder = UIManager.getBoolean( "TabbedPane.tabsOverlapBorder" );
 
@@ -139,11 +151,27 @@ public class FlatTabbedPaneUI
 		tabHeight = scale( tabHeight );
 		tabSelectionHeight = scale( tabSelectionHeight );
 
+		// replace focus forward/backward traversal keys with TAB/Shift+TAB because
+		// the default also includes Ctrl+TAB/Ctrl+Shift+TAB, which we need to switch tabs
+		if( focusForwardTraversalKeys == null ) {
+			focusForwardTraversalKeys = Collections.singleton( KeyStroke.getKeyStroke( KeyEvent.VK_TAB, 0 ) );
+			focusBackwardTraversalKeys = Collections.singleton( KeyStroke.getKeyStroke( KeyEvent.VK_TAB, InputEvent.SHIFT_MASK ) );
+		}
+		// Ideally we should use `LookAndFeel.installProperty( tabPane, "focusTraversalKeysForward", keys )` here
+		// instead of `tabPane.setFocusTraversalKeys()`, but WindowsTabbedPaneUI also uses later method
+		// and switching from Windows LaF to FlatLaf would not replace the keys and Ctrl+TAB would not work.
+		tabPane.setFocusTraversalKeys( KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS, focusForwardTraversalKeys );
+		tabPane.setFocusTraversalKeys( KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS, focusBackwardTraversalKeys );
+
 		MigLayoutVisualPadding.install( tabPane, null );
 	}
 
 	@Override
 	protected void uninstallDefaults() {
+		// restore focus forward/backward traversal keys
+		tabPane.setFocusTraversalKeys( KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS, null );
+		tabPane.setFocusTraversalKeys( KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS, null );
+
 		super.uninstallDefaults();
 
 		disabledForeground = null;
@@ -290,7 +318,7 @@ public class FlatTabbedPaneUI
 		boolean enabled = tabPane.isEnabled();
 		g.setColor( enabled && tabPane.isEnabledAt( tabIndex ) && getRolloverTab() == tabIndex
 			? hoverColor
-			: (enabled && isSelected && tabPane.hasFocus()
+			: (enabled && isSelected && FlatUIUtils.isPermanentFocusOwner( tabPane )
 				? focusColor
 				: (selectedBackground != null && enabled && isSelected
 					? selectedBackground
@@ -307,7 +335,7 @@ public class FlatTabbedPaneUI
 			!isLastInRun( tabIndex ) )
 		{
 			float sepWidth = UIScale.scale( 1f );
-			float offset = UIScale.scale( 5f );
+			float offset = tabSeparatorsFullHeight ? 0 : UIScale.scale( 5f );
 
 			g.setColor( (tabSeparatorColor != null) ? tabSeparatorColor : contentAreaColor );
 			if( tabPlacement == LEFT || tabPlacement == RIGHT ) {

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

@@ -22,13 +22,20 @@ import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.Insets;
 import java.awt.Rectangle;
 import java.awt.geom.Rectangle2D;
+import java.util.Objects;
+import javax.swing.Icon;
 import javax.swing.JComponent;
+import javax.swing.JLabel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
+import javax.swing.SwingConstants;
 import javax.swing.UIManager;
+import javax.swing.border.Border;
 import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicTableHeaderUI;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
@@ -49,6 +56,7 @@ import com.formdev.flatlaf.util.UIScale;
  * @uiDefault TableHeader.separatorColor		Color
  * @uiDefault TableHeader.bottomSeparatorColor	Color
  * @uiDefault TableHeader.height				int
+ * @uiDefault TableHeader.sortIconPosition		String	right (default), left, top or bottom
  *
  * @author Karl Tauber
  */
@@ -58,6 +66,7 @@ public class FlatTableHeaderUI
 	protected Color separatorColor;
 	protected Color bottomSeparatorColor;
 	protected int height;
+	protected int sortIconPosition;
 
 	public static ComponentUI createUI( JComponent c ) {
 		return new FlatTableHeaderUI();
@@ -70,12 +79,33 @@ public class FlatTableHeaderUI
 		separatorColor = UIManager.getColor( "TableHeader.separatorColor" );
 		bottomSeparatorColor = UIManager.getColor( "TableHeader.bottomSeparatorColor" );
 		height = UIManager.getInt( "TableHeader.height" );
+		switch( Objects.toString( UIManager.getString( "TableHeader.sortIconPosition" ), "right" ) ) {
+			default:
+			case "right":	sortIconPosition = SwingConstants.RIGHT; break;
+			case "left":	sortIconPosition = SwingConstants.LEFT; break;
+			case "top":		sortIconPosition = SwingConstants.TOP; break;
+			case "bottom":	sortIconPosition = SwingConstants.BOTTOM; break;
+		}
+
+		// use own renderer if necessary
+		if( sortIconPosition != SwingConstants.RIGHT ) {
+			TableCellRenderer defaultRenderer = header.getDefaultRenderer();
+			if( defaultRenderer instanceof UIResource )
+				header.setDefaultRenderer( new FlatTableCellHeaderRenderer( defaultRenderer ) );
+		}
 	}
 
 	@Override
 	protected void uninstallDefaults() {
 		super.uninstallDefaults();
 
+		// restore default renderer
+		TableCellRenderer defaultRenderer = header.getDefaultRenderer();
+		if( defaultRenderer instanceof FlatTableCellHeaderRenderer ) {
+			((FlatTableCellHeaderRenderer)defaultRenderer).reset();
+			header.setDefaultRenderer( ((FlatTableCellHeaderRenderer)defaultRenderer).delegate );
+		}
+
 		separatorColor = null;
 		bottomSeparatorColor = null;
 	}
@@ -215,4 +245,83 @@ public class FlatTableHeaderUI
 		parent = parent.getParent();
 		return (parent instanceof JScrollPane) ? (JScrollPane) parent : null;
 	}
+
+	//---- class FlatTableCellHeaderRenderer ----------------------------------
+
+	/**
+	 * A delegating header renderer that is only used to paint sort arrows at
+	 * top, bottom or left position.
+	 */
+	private class FlatTableCellHeaderRenderer
+		implements TableCellRenderer, Border, UIResource
+	{
+		private final TableCellRenderer delegate;
+
+		private int oldHorizontalTextPosition = -1;
+		private Border origBorder;
+		private Icon sortIcon;
+
+		FlatTableCellHeaderRenderer( TableCellRenderer delegate ) {
+			this.delegate = delegate;
+		}
+
+		@Override
+		public Component getTableCellRendererComponent( JTable table, Object value, boolean isSelected,
+			boolean hasFocus, int row, int column )
+		{
+			Component c = delegate.getTableCellRendererComponent( table, value, isSelected, hasFocus, row, column );
+			if( !(c instanceof JLabel) )
+				return c;
+
+			JLabel l = (JLabel) c;
+
+			if( sortIconPosition == SwingConstants.LEFT ) {
+				if( oldHorizontalTextPosition < 0 )
+					oldHorizontalTextPosition = l.getHorizontalTextPosition();
+				l.setHorizontalTextPosition( SwingConstants.RIGHT );
+			} else {
+				// top or bottom
+				sortIcon = l.getIcon();
+				origBorder = l.getBorder();
+				l.setIcon( null );
+				l.setBorder( this );
+			}
+
+			return l;
+		}
+
+		void reset() {
+			if( sortIconPosition == SwingConstants.LEFT && oldHorizontalTextPosition >= 0 ) {
+				Component c = getTableCellRendererComponent( header.getTable(), "", false, false, -1, 0 );
+				if( c instanceof JLabel && ((JLabel)c).getHorizontalTextPosition() == SwingConstants.RIGHT )
+					((JLabel)c).setHorizontalTextPosition( oldHorizontalTextPosition );
+			}
+		}
+
+		@Override
+		public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
+			if( origBorder != null )
+				origBorder.paintBorder( c, g, x, y, width, height );
+
+			if( sortIcon != null ) {
+				int xi = x + ((width - sortIcon.getIconWidth()) / 2);
+				int yi = (sortIconPosition == SwingConstants.TOP)
+					? y + UIScale.scale( 1 )
+					: y + height - sortIcon.getIconHeight()
+						- 1 // for gap
+						- (int) (1 * UIScale.getUserScaleFactor()); // for bottom border
+				sortIcon.paintIcon( c, g, xi, yi );
+			}
+		}
+
+		@Override
+		public Insets getBorderInsets( Component c ) {
+			return (origBorder != null) ? origBorder.getBorderInsets( c ) : new Insets( 0, 0, 0, 0 );
+		}
+
+		@Override
+		public boolean isBorderOpaque() {
+			return (origBorder != null) ? origBorder.isBorderOpaque() : false;
+		}
+	}
 }

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

@@ -113,7 +113,7 @@ public class FlatTableUI
 		selectionInactiveBackground = UIManager.getColor( "Table.selectionInactiveBackground" );
 		selectionInactiveForeground = UIManager.getColor( "Table.selectionInactiveForeground" );
 
-		toggleSelectionColors( table.hasFocus() );
+		toggleSelectionColors();
 
 		int rowHeight = FlatUIUtils.getUIInt( "Table.rowHeight", 16 );
 		if( rowHeight > 0 )
@@ -160,13 +160,13 @@ public class FlatTableUI
 			@Override
 			public void focusGained( FocusEvent e ) {
 				super.focusGained( e );
-				toggleSelectionColors( true );
+				toggleSelectionColors();
 			}
 
 			@Override
 			public void focusLost( FocusEvent e ) {
 				super.focusLost( e );
-				toggleSelectionColors( false );
+				toggleSelectionColors();
 			}
 		};
 	}
@@ -180,8 +180,8 @@ public class FlatTableUI
 	 * already used in applications. Then either the inactive colors are not used,
 	 * or the application has to be changed to extend a FlatLaf renderer.
 	 */
-	private void toggleSelectionColors( boolean focused ) {
-		if( focused ) {
+	private void toggleSelectionColors() {
+		if( FlatUIUtils.isPermanentFocusOwner( table ) ) {
 			if( table.getSelectionBackground() == selectionInactiveBackground )
 				table.setSelectionBackground( selectionBackground );
 			if( table.getSelectionForeground() == selectionInactiveForeground )

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextBorder.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2019 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.ui;
+
+import static com.formdev.flatlaf.util.UIScale.scale;
+import java.awt.Component;
+import javax.swing.UIManager;
+
+/**
+ * Border for various text components (e.g. {@link javax.swing.JTextField}).
+ *
+ * @uiDefault Component.arc					int
+ *
+ * @author Karl Tauber
+ */
+public class FlatTextBorder
+	extends FlatBorder
+{
+	protected final int arc = UIManager.getInt( "TextComponent.arc" );
+
+	@Override
+	protected float getArc( Component c ) {
+		return scale( (float) arc );
+	}
+}

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java

@@ -32,6 +32,7 @@ import javax.swing.JSpinner;
 import javax.swing.JTextField;
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
+import javax.swing.border.Border;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicTextFieldUI;
@@ -59,6 +60,7 @@ import com.formdev.flatlaf.FlatClientProperties;
  *
  * <!-- FlatTextFieldUI -->
  *
+ * @uiDefault TextComponent.arc					int
  * @uiDefault Component.focusWidth				int
  * @uiDefault Component.minimumWidth			int
  * @uiDefault Component.isIntelliJTheme			boolean
@@ -70,6 +72,7 @@ import com.formdev.flatlaf.FlatClientProperties;
 public class FlatTextFieldUI
 	extends BasicTextFieldUI
 {
+	protected int arc;
 	protected int focusWidth;
 	protected int minimumWidth;
 	protected boolean isIntelliJTheme;
@@ -86,6 +89,7 @@ public class FlatTextFieldUI
 		super.installDefaults();
 
 		String prefix = getPropertyPrefix();
+		arc = UIManager.getInt( "TextComponent.arc" );
 		focusWidth = UIManager.getInt( "Component.focusWidth" );
 		minimumWidth = UIManager.getInt( "Component.minimumWidth" );
 		isIntelliJTheme = UIManager.getBoolean( "Component.isIntelliJTheme" );
@@ -136,7 +140,7 @@ public class FlatTextFieldUI
 
 	@Override
 	protected void paintSafely( Graphics g ) {
-		paintBackground( g, getComponent(), focusWidth, isIntelliJTheme );
+		paintBackground( g, getComponent(), focusWidth, arc, isIntelliJTheme );
 		paintPlaceholder( g, getComponent(), placeholderForeground );
 		super.paintSafely( g );
 	}
@@ -146,13 +150,15 @@ public class FlatTextFieldUI
 		// background is painted elsewhere
 	}
 
-	static void paintBackground( Graphics g, JTextComponent c, int focusWidth, boolean isIntelliJTheme ) {
+	static void paintBackground( Graphics g, JTextComponent c, int focusWidth, int arc, boolean isIntelliJTheme ) {
+		Border border = c.getBorder();
+
 		// do not paint background if:
 		//   - not opaque and
 		//   - border is not a flat border and
 		//   - opaque was explicitly set (to false)
 		// (same behaviour as in AquaTextFieldUI)
-		if( !c.isOpaque() && !(c.getBorder() instanceof FlatBorder) && FlatUIUtils.hasOpaqueBeenExplicitlySet( c ) )
+		if( !c.isOpaque() && !(border instanceof FlatBorder) && FlatUIUtils.hasOpaqueBeenExplicitlySet( c ) )
 			return;
 
 		// fill background if opaque to avoid garbage if user sets opaque to true
@@ -164,7 +170,8 @@ public class FlatTextFieldUI
 		try {
 			FlatUIUtils.setRenderingHints( g2 );
 
-			float fFocusWidth = (c.getBorder() instanceof FlatBorder) ? scale( (float) focusWidth ) : 0;
+			float fFocusWidth = (border instanceof FlatBorder) ? scale( (float) focusWidth ) : 0;
+			float fArc = (border instanceof FlatTextBorder) ? scale( (float) arc ) : 0;
 
 			Color background = c.getBackground();
 			g2.setColor( !(background instanceof UIResource)
@@ -172,7 +179,7 @@ public class FlatTextFieldUI
 				: (isIntelliJTheme && (!c.isEnabled() || !c.isEditable())
 					? FlatUIUtils.getParentBackground( c )
 					: background) );
-			FlatUIUtils.paintComponentBackground( g2, 0, 0, c.getWidth(), c.getHeight(), fFocusWidth, 0 );
+			FlatUIUtils.paintComponentBackground( g2, 0, 0, c.getWidth(), c.getHeight(), fFocusWidth, fArc );
 		} finally {
 			g2.dispose();
 		}

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarBorder.java

@@ -29,6 +29,7 @@ import javax.swing.UIManager;
 /**
  * Border for {@link javax.swing.JToolBar}.
  *
+ * @uiDefault ToolBar.borderMargins				Insets
  * @uiDefault ToolBar.gripColor					Color
  *
  * @author Karl Tauber
@@ -42,6 +43,10 @@ public class FlatToolBarBorder
 
 	protected final Color gripColor = UIManager.getColor( "ToolBar.gripColor" );
 
+	public FlatToolBarBorder() {
+		super( UIManager.getInsets( "ToolBar.borderMargins" ) );
+	}
+
 	@Override
 	public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
 		// paint grip

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarUI.java

@@ -16,18 +16,14 @@
 
 package com.formdev.flatlaf.ui;
 
-import static com.formdev.flatlaf.util.UIScale.scale;
 import java.awt.Component;
 import java.awt.Insets;
 import java.awt.event.ContainerEvent;
 import java.awt.event.ContainerListener;
 import javax.swing.AbstractButton;
 import javax.swing.JComponent;
-import javax.swing.UIManager;
 import javax.swing.border.Border;
-import javax.swing.border.EmptyBorder;
 import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicToolBarUI;
 
 /**
@@ -45,28 +41,15 @@ import javax.swing.plaf.basic.BasicToolBarUI;
  * @uiDefault ToolBar.floatingForeground				Color
  * @uiDefault ToolBar.isRollover						boolean
  *
- * <!-- FlatToolBarUI -->
- *
- * @uiDefault ToolBar.buttonMargins						Insets
- *
  * @author Karl Tauber
  */
 public class FlatToolBarUI
 	extends BasicToolBarUI
 {
-	private Border rolloverBorder;
-
 	public static ComponentUI createUI( JComponent c ) {
 		return new FlatToolBarUI();
 	}
 
-	@Override
-	public void uninstallUI( JComponent c ) {
-		super.uninstallUI( c );
-
-		rolloverBorder = null;
-	}
-
 	@Override
 	protected ContainerListener createToolBarContListener() {
 		return new ToolBarContListener() {
@@ -90,26 +73,15 @@ public class FlatToolBarUI
 		};
 	}
 
-	@Override
-	protected Border createRolloverBorder() {
-		return getRolloverBorder();
-	}
-
-	@Override
-	protected Border createNonRolloverBorder() {
-		return getRolloverBorder();
-	}
-
-	@Override
-	protected Border getNonRolloverBorder( AbstractButton b ) {
-		return getRolloverBorder();
-	}
-
-	private Border getRolloverBorder() {
-		if( rolloverBorder == null )
-			rolloverBorder = new FlatRolloverMarginBorder();
-		return rolloverBorder;
-	}
+	// disable rollover border
+	@Override protected void setBorderToRollover( Component c ) {}
+	@Override protected void setBorderToNonRollover( Component c ) {}
+	@Override protected void setBorderToNormal( Component c ) {}
+	@Override protected void installRolloverBorders( JComponent c ) {}
+	@Override protected void installNonRolloverBorders( JComponent c ) {}
+	@Override protected void installNormalBorders( JComponent c ) {}
+	@Override protected Border createRolloverBorder() { return null; }
+	@Override protected Border createNonRolloverBorder() { return null; }
 
 	@Override
 	public void setOrientation( int orientation ) {
@@ -123,46 +95,4 @@ public class FlatToolBarUI
 
 		super.setOrientation( orientation );
 	}
-
-	//---- class FlatRolloverMarginBorder -------------------------------------
-
-	/**
-	 * Uses button margin only if explicitly set.
-	 * Otherwise uses insets specified in constructor.
-	 */
-	private static class FlatRolloverMarginBorder
-		extends EmptyBorder
-	{
-		public FlatRolloverMarginBorder() {
-			super( UIManager.getInsets( "ToolBar.buttonMargins" ) );
-		}
-
-		@Override
-		public Insets getBorderInsets( Component c, Insets insets ) {
-			Insets margin = (c instanceof AbstractButton)
-				? ((AbstractButton) c).getMargin()
-				: null;
-
-			if( margin == null || margin instanceof UIResource ) {
-				insets.top = top;
-				insets.left = left;
-				insets.bottom = bottom;
-				insets.right = right;
-			} else {
-				// margin explicitly set
-				insets.top = margin.top;
-				insets.left = margin.left;
-				insets.bottom = margin.bottom;
-				insets.right = margin.right;
-			}
-
-			// scale
-			insets.top = scale( insets.top );
-			insets.left = scale( insets.left );
-			insets.bottom = scale( insets.bottom );
-			insets.right = scale( insets.right );
-
-			return insets;
-		}
-	}
 }

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java

@@ -221,7 +221,7 @@ public class FlatTreeUI
 		TreePath path, int row, boolean isExpanded, boolean hasBeenExpanded, boolean isLeaf )
 	{
 		boolean isEditing = (editingComponent != null && editingRow == row);
-		boolean hasFocus = tree.hasFocus();
+		boolean hasFocus = FlatUIUtils.isPermanentFocusOwner( tree );
 		boolean cellHasFocus = hasFocus && (row == getLeadSelectionRow());
 		boolean isSelected = tree.isRowSelected( row );
 		boolean isDropRow = isDropRow( row );

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java

@@ -20,9 +20,11 @@ import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
+import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Insets;
+import java.awt.KeyboardFocusManager;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.Shape;
@@ -37,7 +39,7 @@ import java.util.function.Consumer;
 import javax.swing.JComponent;
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
-import javax.swing.plaf.ColorUIResource;
+import javax.swing.plaf.UIResource;
 import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.util.DerivedColor;
 import com.formdev.flatlaf.util.HiDPIUtils;
@@ -83,6 +85,13 @@ public class FlatUIUtils
 			insets1.right + insets2.right );
 	}
 
+	public static void setInsets( Insets dest, Insets src ) {
+		dest.top = src.top;
+		dest.left = src.left;
+		dest.bottom = src.bottom;
+		dest.right = src.right;
+	}
+
 	public static Color getUIColor( String key, int defaultColorRGB ) {
 		Color color = UIManager.getColor( key );
 		return (color != null) ? color : new Color( defaultColorRGB );
@@ -109,7 +118,11 @@ public class FlatUIUtils
 	}
 
 	public static Color nonUIResource( Color c ) {
-		return (c instanceof ColorUIResource) ? new Color( c.getRGB(), true ) : c;
+		return (c instanceof UIResource) ? new Color( c.getRGB(), true ) : c;
+	}
+
+	public static Font nonUIResource( Font font ) {
+		return (font instanceof UIResource) ? font.deriveFont( font.getStyle() ) : font;
 	}
 
 	public static int minimumWidth( JComponent c, int minimumWidth ) {
@@ -124,6 +137,10 @@ public class FlatUIUtils
 		return c instanceof JComponent && Boolean.TRUE.equals( ((JComponent)c).getClientProperty( "JComboBox.isTableCellEditor" ) );
 	}
 
+	public static boolean isPermanentFocusOwner( Component c ) {
+		return (KeyboardFocusManager.getCurrentKeyboardFocusManager().getPermanentFocusOwner() == c);
+	}
+
 	/**
 	 * Sets rendering hints used for painting.
 	 */
@@ -155,7 +172,7 @@ public class FlatUIUtils
 		double systemScaleFactor = UIScale.getSystemScaleFactor( g );
 		if( systemScaleFactor != 1 && systemScaleFactor != 2 ) {
 			// paint at scale 1x to avoid clipping on right and bottom edges at 125%, 150% or 175%
-			HiDPIUtils.paintAtScale1x( g, x, y, width, height, systemScaleFactor,
+			HiDPIUtils.paintAtScale1x( g, x, y, width, height,
 				(g2d, x2, y2, width2, height2, scaleFactor) -> {
 					paintComponentOuterBorderImpl( g2d, x2, y2, width2, height2,
 						(float) (focusWidth * scaleFactor), (float) (lineWidth * scaleFactor), (float) (arc * scaleFactor) );
@@ -169,13 +186,22 @@ public class FlatUIUtils
 	private static void paintComponentOuterBorderImpl( Graphics2D g, int x, int y, int width, int height,
 		float focusWidth, float lineWidth, float arc )
 	{
-		float outerRadius = (arc > 0) ? arc + focusWidth - UIScale.scale( 2f ) : focusWidth;
 		float ow = focusWidth + lineWidth;
-		float innerRadius = outerRadius - ow;
+		float outerArc = arc + (focusWidth * 2);
+		float innerArc = arc - (lineWidth * 2);
+
+		// reduce outer arc slightly for small arcs to make the curve slightly wider
+		if( arc > 0 && arc < UIScale.scale( 10 ) )
+			outerArc -= UIScale.scale( 2f );
+
+		if( outerArc < 0 )
+			outerArc = 0;
+		if( innerArc < 0 )
+			innerArc = 0;
 
 		Path2D path = new Path2D.Float( Path2D.WIND_EVEN_ODD );
-		path.append( createRoundRectanglePath( x, y, width, height, outerRadius, outerRadius, outerRadius, outerRadius ), false );
-		path.append( createRoundRectanglePath( x + ow, y + ow, width - (ow * 2), height - (ow * 2), innerRadius, innerRadius, innerRadius, innerRadius ), false );
+		path.append( new RoundRectangle2D.Float( x, y, width, height, outerArc, outerArc ), false );
+		path.append( new RoundRectangle2D.Float( x + ow, y + ow, width - (ow * 2), height - (ow * 2), innerArc, innerArc ), false );
 		g.fill( path );
 	}
 
@@ -195,7 +221,7 @@ public class FlatUIUtils
 		double systemScaleFactor = UIScale.getSystemScaleFactor( g );
 		if( systemScaleFactor != 1 && systemScaleFactor != 2 ) {
 			// paint at scale 1x to avoid clipping on right and bottom edges at 125%, 150% or 175%
-			HiDPIUtils.paintAtScale1x( g, x, y, width, height, systemScaleFactor,
+			HiDPIUtils.paintAtScale1x( g, x, y, width, height,
 				(g2d, x2, y2, width2, height2, scaleFactor) -> {
 					paintComponentBorderImpl( g2d, x2, y2, width2, height2,
 						(float) (focusWidth * scaleFactor), (float) (lineWidth * scaleFactor), (float) (arc * scaleFactor) );
@@ -209,7 +235,12 @@ public class FlatUIUtils
 	private static void paintComponentBorderImpl( Graphics2D g, int x, int y, int width, int height,
 		float focusWidth, float lineWidth, float arc )
 	{
-		float arc2 = arc > lineWidth ? arc - lineWidth : 0f;
+		float arc2 = arc - (lineWidth * 2);
+
+		if( arc < 0 )
+			arc = 0;
+		if( arc2 < 0 )
+			arc2 = 0;
 
 		RoundRectangle2D.Float r1 = new RoundRectangle2D.Float(
 			x + focusWidth, y + focusWidth,
@@ -240,7 +271,7 @@ public class FlatUIUtils
 		double systemScaleFactor = UIScale.getSystemScaleFactor( g );
 		if( systemScaleFactor != 1 && systemScaleFactor != 2 ) {
 			// paint at scale 1x to avoid clipping on right and bottom edges at 125%, 150% or 175%
-			HiDPIUtils.paintAtScale1x( g, x, y, width, height, systemScaleFactor,
+			HiDPIUtils.paintAtScale1x( g, x, y, width, height,
 				(g2d, x2, y2, width2, height2, scaleFactor) -> {
 					paintComponentBackgroundImpl( g2d, x2, y2, width2, height2,
 						(float) (focusWidth * scaleFactor), (float) (arc * scaleFactor) );
@@ -254,6 +285,9 @@ public class FlatUIUtils
 	private static void paintComponentBackgroundImpl( Graphics2D g, int x, int y, int width, int height,
 		float focusWidth, float arc )
 	{
+		if( arc < 0 )
+			arc = 0;
+
 		g.fill( new RoundRectangle2D.Float(
 			x + focusWidth, y + focusWidth,
 			width - focusWidth * 2, height - focusWidth * 2, arc, arc ) );

flatlaf-core/src/main/java/com/formdev/flatlaf/util/HiDPIUtils.java

@@ -34,10 +34,6 @@ public class HiDPIUtils
 		paintAtScale1x( g, 0, 0, c.getWidth(), c.getHeight(), painter );
 	}
 
-	public static void paintAtScale1x( Graphics2D g, int x, int y, int width, int height, Painter painter ) {
-		paintAtScale1x( g, x, y, width, height, UIScale.getSystemScaleFactor( g ), painter );
-	}
-
 	/**
 	 * Paint at system scale factor 1x to avoid rounding issues at 125%, 150% and 175% scaling.
 	 * <p>
@@ -46,38 +42,29 @@ public class HiDPIUtils
 	 * <p>
 	 * Uses the same scaling calculation as the JRE uses.
 	 */
-	public static void paintAtScale1x( Graphics2D g, int x, int y, int width, int height,
-		double scaleFactor, Painter painter )
-	{
-		if( scaleFactor == 1 ) {
+	public static void paintAtScale1x( Graphics2D g, int x, int y, int width, int height, Painter painter ) {
+		// save original transform
+		AffineTransform transform = g.getTransform();
+
+		// check whether scaled
+		if( transform.getScaleX() == 1 && transform.getScaleY() == 1 ) {
 			painter.paint( g, x, y, width, height, 1 );
 			return;
 		}
 
-		// save original transform
-		AffineTransform transform = g.getTransform();
-
 		// scale rectangle
 		Rectangle2D.Double scaledRect = scale( transform, x, y, width, height );
 
 		try {
-			// unscale to factor 1.0
-			double scale = 1.0 / scaleFactor;
-			g.scale( scale, scale );
-
-			// compute origin delta x/y
-			double dx = Math.floor( scaledRect.x ) - transform.getTranslateX();
-			double dy = Math.floor( scaledRect.y ) - transform.getTranslateY();
-
-			// move origin to make sure that origin x/y are at whole numbers
-			if( dx != 0 || dy != 0 )
-				g.translate( dx, dy );
+			// unscale to factor 1.0 and move origin (to whole numbers)
+			g.setTransform( new AffineTransform( 1, 0, 0, 1,
+				Math.floor( scaledRect.x ), Math.floor( scaledRect.y ) ) );
 
 			int swidth = (int) scaledRect.width;
 			int sheight = (int) scaledRect.height;
 
 			// paint
-			painter.paint( g, 0, 0, swidth, sheight, scaleFactor );
+			painter.paint( g, 0, 0, swidth, sheight, transform.getScaleX() );
 		} finally {
 			// restore original transform
 			g.setTransform( transform );

flatlaf-core/src/main/java/com/formdev/flatlaf/util/UIScale.java

@@ -24,6 +24,7 @@ import java.awt.GraphicsEnvironment;
 import java.awt.Insets;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
 import java.lang.reflect.Method;
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
@@ -48,12 +49,15 @@ import javax.swing.plaf.UIResource;
  *
  * 2) user scaling mode
  *
- * This mode is mainly for Java 8 compatibility, but is also used on Linux.
+ * This mode is mainly for Java 8 compatibility, but is also used on Linux
+ * or if the default font is changed.
  * The user scale factor is computed based on the used font.
  * The JRE does not scale anything.
  * So we have to invoke {@link #scale(float)} where necessary.
  * There is only one user scale factor for all displays.
- * The user scale factor may change if the active LaF or "Label.font" has changed.
+ * The user scale factor may change if the active LaF, "defaultFont" or "Label.font" has changed.
+ * If system scaling mode is available the user scale factor is usually 1,
+ * but may be larger on Linux or if the default font is changed.
  *
  * @author Karl Tauber
  */
@@ -61,6 +65,20 @@ public class UIScale
 {
 	private static final boolean DEBUG = false;
 
+	private static PropertyChangeSupport changeSupport;
+
+	public static void addPropertyChangeListener( PropertyChangeListener listener ) {
+		if( changeSupport == null )
+			changeSupport = new PropertyChangeSupport( UIScale.class );
+		changeSupport.addPropertyChangeListener( listener );
+	}
+
+	public static void removePropertyChangeListener( PropertyChangeListener listener ) {
+		if( changeSupport == null )
+			return;
+		changeSupport.removePropertyChangeListener( listener );
+	}
+
 	//---- system scaling (Java 9) --------------------------------------------
 
 	private static Boolean jreHiDPI;
@@ -97,7 +115,7 @@ public class UIScale
 	}
 
 	public static double getSystemScaleFactor( GraphicsConfiguration gc ) {
-		return isSystemScalingEnabled() ? gc.getDefaultTransform().getScaleX() : 1;
+		return (isSystemScalingEnabled() && gc != null) ? gc.getDefaultTransform().getScaleX() : 1;
 	}
 
 	//---- user scaling (Java 8) ----------------------------------------------
@@ -110,27 +128,33 @@ public class UIScale
 			return;
 		initialized = true;
 
-		if( isUserScalingEnabled() ) {
-			// listener to update scale factor if LaF changed or if Label.font changed
-			// (e.g. option "Override default fonts" in IntelliJ IDEA)
-			PropertyChangeListener listener = new PropertyChangeListener() {
-				@Override
-				public void propertyChange( PropertyChangeEvent e ) {
-					String propName = e.getPropertyName();
-					if( "lookAndFeel".equals( propName ) ) {
+		if( !isUserScalingEnabled() )
+			return;
+
+		// listener to update scale factor if LaF changed, "defaultFont" or "Label.font" changed
+		PropertyChangeListener listener = new PropertyChangeListener() {
+			@Override
+			public void propertyChange( PropertyChangeEvent e ) {
+				switch( e.getPropertyName() ) {
+					case "lookAndFeel":
 						// it is not necessary (and possible) to remove listener of old LaF defaults
 						if( e.getNewValue() instanceof LookAndFeel )
 							UIManager.getLookAndFeelDefaults().addPropertyChangeListener( this );
 						updateScaleFactor();
-					} else if( "Label.font".equals( propName ) )
-						updateScaleFactor();
-				}
-			};
-			UIManager.addPropertyChangeListener( listener );
-			UIManager.getLookAndFeelDefaults().addPropertyChangeListener( listener );
+						break;
 
-			updateScaleFactor();
-		}
+					case "defaultFont":
+					case "Label.font":
+						updateScaleFactor();
+						break;
+				}
+			}
+		};
+		UIManager.addPropertyChangeListener( listener );
+		UIManager.getDefaults().addPropertyChangeListener( listener );
+		UIManager.getLookAndFeelDefaults().addPropertyChangeListener( listener );
+
+		updateScaleFactor();
 	}
 
 	private static void updateScaleFactor() {
@@ -141,7 +165,9 @@ public class UIScale
 		// because even if we are on a HiDPI display it is not sure
 		// that a larger font size is set by the current LaF
 		// (e.g. can avoid large icons with small text)
-		Font font = UIManager.getFont( "Label.font" );
+		Font font = UIManager.getFont( "defaultFont" );
+		if( font == null )
+			font = UIManager.getFont( "Label.font" );
 
 		setUserScaleFactor( computeScaleFactor( font ) );
 	}
@@ -156,6 +182,9 @@ public class UIScale
 			// Tahoma 11 is used at 100%
 			if( "Tahoma".equals( font.getFamily() ) )
 				fontSizeDivider = 11f;
+		} else if( SystemInfo.IS_MAC ) {
+			// default font size on macOS is 13
+			fontSizeDivider = 13f;
 		} else if( SystemInfo.IS_LINUX ) {
 			// default font size for Unity and Gnome is 15 and for KDE it is 13
 			fontSizeDivider = SystemInfo.IS_KDE ? 13f : 15f;
@@ -165,26 +194,17 @@ public class UIScale
 	}
 
 	private static boolean isUserScalingEnabled() {
-		if( isSystemScalingEnabled() && !SystemInfo.IS_LINUX )
-			return false; // disable user scaling if JRE scales
-
 		// same as in IntelliJ IDEA
 		String hidpi = System.getProperty( "hidpi" );
 		return (hidpi != null) ? Boolean.parseBoolean( hidpi ) : true;
 	}
 
 	/**
-	 * Applies a custom scale factor given in system properties "flatlaf.uiScale"
-	 * or "sun.java2d.uiScale" to the given font.
+	 * Applies a custom scale factor given in system property "flatlaf.uiScale"
+	 * to the given font.
 	 */
 	public static FontUIResource applyCustomScaleFactor( FontUIResource font ) {
-		if( UIScale.isSystemScalingEnabled() )
-			return font;
-
 		String uiScale = System.getProperty( "flatlaf.uiScale" );
-		if( uiScale == null )
-			uiScale = System.getProperty( "sun.java2d.uiScale" );
-
 		float scaleFactor = parseScaleFactor( uiScale );
 		if( scaleFactor <= 0 )
 			return font;
@@ -194,15 +214,7 @@ public class UIScale
 			return font;
 
 		int newFontSize = Math.round( (font.getSize() / fontScaleFactor) * scaleFactor );
-		return new FontUIResource( font.getFamily(), font.getStyle(), newFontSize );
-	}
-
-	/**
-	 * Scales the given font.
-	 */
-	public static FontUIResource scaleFont( FontUIResource font, float scaleFactor ) {
-		int newFontSize = Math.round( font.getSize() * scaleFactor );
-		return new FontUIResource( font.getFamily(), font.getStyle(), newFontSize );
+		return new FontUIResource( font.deriveFont( (float) newFontSize ) );
 	}
 
 	/**
@@ -242,10 +254,14 @@ public class UIScale
 		else // round scale factor to 1/4
 			scaleFactor = Math.round( scaleFactor * 4f ) / 4f;
 
+		float oldScaleFactor = UIScale.scaleFactor;
 		UIScale.scaleFactor = scaleFactor;
 
 		if( DEBUG )
 			System.out.println( "HiDPI scale factor " + scaleFactor );
+
+		if( changeSupport != null )
+			changeSupport.firePropertyChange( "userScaleFactor", oldScaleFactor, scaleFactor );
 	}
 
 	public static float scale( float value ) {

flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties

@@ -131,6 +131,34 @@ Component.focusColor=#3d6185
 Component.linkColor=#589df6
 
 
+#---- Desktop ----
+
+Desktop.background=#3E434C
+
+
+#---- DesktopIcon ----
+
+DesktopIcon.background=lighten($Desktop.background,10%)
+
+
+#---- InternalFrame ----
+
+InternalFrame.activeTitleBackground=darken(@background,10%)
+InternalFrame.activeTitleForeground=@foreground
+InternalFrame.inactiveTitleBackground=darken(@background,5%)
+InternalFrame.inactiveTitleForeground=@disabledText
+
+InternalFrame.activeBorderColor=lighten($Component.borderColor,10%)
+InternalFrame.inactiveBorderColor=$Component.borderColor
+
+InternalFrame.buttonHoverBackground=lighten(10%,autoInverse)
+InternalFrame.buttonPressedBackground=lighten(20%,autoInverse)
+InternalFrame.closeHoverBackground=lazy(Actions.Red)
+InternalFrame.closePressedBackground=darken(Actions.Red,10%,lazy)
+InternalFrame.closeHoverForeground=#fff
+InternalFrame.closePressedForeground=#fff
+
+
 #---- List ----
 
 List.background=@textComponentBackground
@@ -154,6 +182,11 @@ MenuItemCheckBox.icon.checkmarkColor=#A7A7A7
 MenuItemCheckBox.icon.disabledCheckmarkColor=#606060
 
 
+#---- PasswordField ----
+
+PasswordField.capsLockIconColor=#ffffff64
+
+
 #---- PopupMenu ----
 
 PopupMenu.borderColor=#5e5e5e
@@ -170,9 +203,9 @@ ProgressBar.selectionBackground=@foreground
 #---- ScrollBar ----
 
 ScrollBar.track=#3F4244
-ScrollBar.thumb=#5B5E5F
-ScrollBar.hoverTrackColor=#434647
-ScrollBar.hoverThumbColor=#666868
+ScrollBar.thumb=lighten($ScrollBar.track,10%)
+ScrollBar.hoverTrackColor=lighten($ScrollBar.track,4%)
+ScrollBar.hoverThumbColor=lighten($ScrollBar.thumb,10%)
 
 
 #---- Separator ----
@@ -208,14 +241,14 @@ TabbedPane.contentAreaColor=#323232
 #---- Table ----
 
 Table.background=@textComponentBackground
-Table.gridColor=#4F5152
+Table.gridColor=lighten($Table.background,3%)
 
 
 #---- TableHeader ----
 
-TableHeader.background=#45494A
-TableHeader.separatorColor=#585858
-TableHeader.bottomSeparatorColor=#585858
+TableHeader.background=@textComponentBackground
+TableHeader.separatorColor=lighten($TableHeader.background,10%)
+TableHeader.bottomSeparatorColor=$TableHeader.separatorColor
 
 
 #---- ToggleButton ----

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

@@ -21,21 +21,26 @@ CheckBoxUI=com.formdev.flatlaf.ui.FlatCheckBoxUI
 CheckBoxMenuItemUI=com.formdev.flatlaf.ui.FlatCheckBoxMenuItemUI
 ColorChooserUI=com.formdev.flatlaf.ui.FlatColorChooserUI
 ComboBoxUI=com.formdev.flatlaf.ui.FlatComboBoxUI
+DesktopIconUI=com.formdev.flatlaf.ui.FlatDesktopIconUI
+DesktopPaneUI=com.formdev.flatlaf.ui.FlatDesktopPaneUI
 EditorPaneUI=com.formdev.flatlaf.ui.FlatEditorPaneUI
 FileChooserUI=com.formdev.flatlaf.ui.FlatFileChooserUI
 FormattedTextFieldUI=com.formdev.flatlaf.ui.FlatFormattedTextFieldUI
+InternalFrameUI=com.formdev.flatlaf.ui.FlatInternalFrameUI
 LabelUI=com.formdev.flatlaf.ui.FlatLabelUI
 ListUI=com.formdev.flatlaf.ui.FlatListUI
 MenuUI=com.formdev.flatlaf.ui.FlatMenuUI
 MenuBarUI=com.formdev.flatlaf.ui.FlatMenuBarUI
 MenuItemUI=com.formdev.flatlaf.ui.FlatMenuItemUI
 OptionPaneUI=com.formdev.flatlaf.ui.FlatOptionPaneUI
+PanelUI=com.formdev.flatlaf.ui.FlatPanelUI
 PasswordFieldUI=com.formdev.flatlaf.ui.FlatPasswordFieldUI
 PopupMenuUI=com.formdev.flatlaf.ui.FlatPopupMenuUI
 PopupMenuSeparatorUI=com.formdev.flatlaf.ui.FlatPopupMenuSeparatorUI
 ProgressBarUI=com.formdev.flatlaf.ui.FlatProgressBarUI
 RadioButtonUI=com.formdev.flatlaf.ui.FlatRadioButtonUI
 RadioButtonMenuItemUI=com.formdev.flatlaf.ui.FlatRadioButtonMenuItemUI
+RootPaneUI=com.formdev.flatlaf.ui.FlatRootPaneUI
 ScrollBarUI=com.formdev.flatlaf.ui.FlatScrollBarUI
 ScrollPaneUI=com.formdev.flatlaf.ui.FlatScrollPaneUI
 SeparatorUI=com.formdev.flatlaf.ui.FlatSeparatorUI
@@ -87,6 +92,38 @@ info=$ToolTip.background
 infoText=@foreground
 
 
+#---- unused colors ----
+
+# Colors that are defined in BasicLookAndFeel but are not used in FlatLaf.
+# Keep them for compatibility (if used in 3rd party app) and give them useful values.
+
+*.shadow=$controlShadow
+*.darkShadow=$controlDkShadow
+*.light=$controlHighlight
+*.highlight=$controlLtHighlight
+
+ComboBox.buttonShadow=$controlShadow
+ComboBox.buttonDarkShadow=$controlDkShadow
+ComboBox.buttonHighlight=$controlLtHighlight
+
+InternalFrame.borderColor=$control
+InternalFrame.borderShadow=$controlShadow
+InternalFrame.borderDarkShadow=$controlDkShadow
+InternalFrame.borderHighlight=$controlLtHighlight
+InternalFrame.borderLight=$controlHighlight
+
+Label.disabledShadow=$controlShadow
+
+ScrollBar.trackHighlight=$controlDkShadow
+ScrollBar.thumbHighlight=$controlLtHighlight
+ScrollBar.thumbDarkShadow=$controlDkShadow
+ScrollBar.thumbShadow=$controlShadow
+
+Slider.focus=$controlDkShadow
+
+TabbedPane.focus=$controlText
+
+
 #---- Button ----
 
 Button.border=com.formdev.flatlaf.ui.FlatButtonBorder
@@ -100,6 +137,9 @@ Button.defaultButtonFollowsFocus=false
 
 Button.default.borderWidth=1
 
+Button.toolbar.margin=3,3,3,3
+Button.toolbar.spacingInsets=1,2,1,2
+
 
 #---- Caret ----
 
@@ -123,19 +163,22 @@ CheckBoxMenuItem.checkIcon=com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon
 CheckBoxMenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
 CheckBoxMenuItem.margin=@menuItemMargin
 CheckBoxMenuItem.opaque=false
+CheckBoxMenuItem.borderPainted=true
 CheckBoxMenuItem.background=@menuBackground
 
 
 #---- ColorChooser ----
 
-ColorChooser.swatchesSwatchSize=16,16
-ColorChooser.swatchesRecentSwatchSize=16,16
+ColorChooser.swatchesSwatchSize={scaledDimension}16,16
+ColorChooser.swatchesRecentSwatchSize={scaledDimension}16,16
+ColorChooser.swatchesDefaultRecentColor=$control
 
 
 #---- ComboBox ----
 
 ComboBox.border=com.formdev.flatlaf.ui.FlatRoundBorder
 ComboBox.padding=2,6,2,6
+[mac]ComboBox.showPopupOnNavigation=true
 
 
 #---- Component ----
@@ -148,6 +191,14 @@ Component.arrowType=chevron
 Component.hideMnemonics=true
 
 
+#---- DesktopIcon ----
+
+DesktopIcon.border=4,4,4,4
+DesktopIcon.iconSize=64,64
+DesktopIcon.closeSize=20,20
+DesktopIcon.closeIcon=com.formdev.flatlaf.icons.FlatInternalFrameCloseIcon
+
+
 #---- EditorPane ----
 
 EditorPane.border=com.formdev.flatlaf.ui.FlatMarginBorder
@@ -162,6 +213,7 @@ FileChooser.upFolderIcon=com.formdev.flatlaf.icons.FlatFileChooserUpFolderIcon
 FileChooser.homeFolderIcon=com.formdev.flatlaf.icons.FlatFileChooserHomeFolderIcon
 FileChooser.detailsViewIcon=com.formdev.flatlaf.icons.FlatFileChooserDetailsViewIcon
 FileChooser.listViewIcon=com.formdev.flatlaf.icons.FlatFileChooserListViewIcon
+FileChooser.usesSingleFilePane=true
 
 
 #---- FileView ----
@@ -175,7 +227,7 @@ FileView.floppyDriveIcon=com.formdev.flatlaf.icons.FlatFileViewFloppyDriveIcon
 
 #---- FormattedTextField ----
 
-FormattedTextField.border=com.formdev.flatlaf.ui.FlatBorder
+FormattedTextField.border=com.formdev.flatlaf.ui.FlatTextBorder
 FormattedTextField.margin=@textComponentMargin
 FormattedTextField.background=@textComponentBackground
 FormattedTextField.placeholderForeground=@disabledText
@@ -197,9 +249,26 @@ HelpButton.questionMarkColor=$CheckBox.icon.checkmarkColor
 HelpButton.disabledQuestionMarkColor=$CheckBox.icon.disabledCheckmarkColor
 
 
+#---- InternalFrame ----
+
+InternalFrame.border=com.formdev.flatlaf.ui.FlatInternalFrameUI$FlatInternalFrameBorder
+InternalFrame.borderLineWidth=1
+InternalFrame.borderMargins=6,6,6,6
+InternalFrame.buttonSize=24,24
+InternalFrame.closeIcon=com.formdev.flatlaf.icons.FlatInternalFrameCloseIcon
+InternalFrame.iconifyIcon=com.formdev.flatlaf.icons.FlatInternalFrameIconifyIcon
+InternalFrame.maximizeIcon=com.formdev.flatlaf.icons.FlatInternalFrameMaximizeIcon
+InternalFrame.minimizeIcon=com.formdev.flatlaf.icons.FlatInternalFrameMinimizeIcon
+InternalFrame.windowBindings=null
+
+
+#---- InternalFrameTitlePane ----
+
+InternalFrameTitlePane.border=0,8,0,0
+
+
 #---- List ----
 
-List.border=1,0,1,0
 List.border=0,0,0,0
 List.cellMargins=1,6,1,6
 List.cellFocusColor=@cellFocusColor
@@ -217,10 +286,12 @@ List.dropLineColor=@dropLineColor
 
 Menu.border=com.formdev.flatlaf.ui.FlatMenuItemBorder
 Menu.arrowIcon=com.formdev.flatlaf.icons.FlatMenuArrowIcon
+Menu.checkIcon=null
 Menu.margin=@menuItemMargin
 Menu.submenuPopupOffsetX={scaledInteger}-4
 Menu.submenuPopupOffsetY={scaledInteger}-4
 Menu.opaque=false
+Menu.borderPainted=true
 Menu.background=@menuBackground
 
 
@@ -235,9 +306,13 @@ MenuBar.itemMargins=3,3,3,3
 
 MenuItem.border=com.formdev.flatlaf.ui.FlatMenuItemBorder
 MenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
+MenuItem.checkIcon=null
 MenuItem.margin=@menuItemMargin
 MenuItem.opaque=false
+MenuItem.borderPainted=true
 MenuItem.background=@menuBackground
+MenuItem.acceleratorDelimiter=-
+[mac]MenuItem.acceleratorDelimiter=
 
 
 #---- OptionPane ----
@@ -265,10 +340,12 @@ OptionPane.warningIcon=com.formdev.flatlaf.icons.FlatOptionPaneWarningIcon
 
 #---- PasswordField ----
 
-PasswordField.border=com.formdev.flatlaf.ui.FlatBorder
+PasswordField.border=com.formdev.flatlaf.ui.FlatTextBorder
 PasswordField.margin=@textComponentMargin
 PasswordField.background=@textComponentBackground
 PasswordField.placeholderForeground=@disabledText
+PasswordField.echoChar=\u2022
+PasswordField.capsLockIcon=com.formdev.flatlaf.icons.FlatCapsLockIcon
 
 
 #---- PopupMenu ----
@@ -312,6 +389,7 @@ RadioButtonMenuItem.checkIcon=com.formdev.flatlaf.icons.FlatRadioButtonMenuItemI
 RadioButtonMenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
 RadioButtonMenuItem.margin=@menuItemMargin
 RadioButtonMenuItem.opaque=false
+RadioButtonMenuItem.borderPainted=true
 RadioButtonMenuItem.background=@menuBackground
 
 
@@ -322,6 +400,7 @@ ScrollBar.showButtons=false
 ScrollBar.squareButtons=false
 ScrollBar.buttonArrowColor=$ComboBox.buttonArrowColor
 ScrollBar.buttonDisabledArrowColor=$ComboBox.buttonDisabledArrowColor
+ScrollBar.allowsAbsolutePositioning=true
 
 
 #---- ScrollPane ----
@@ -383,6 +462,7 @@ TabbedPane.selectedTabPadInsets=0,0,0,0
 TabbedPane.tabRunOverlay=0
 TabbedPane.tabsOverlapBorder=true
 TabbedPane.shadow=@background
+TabbedPane.contentBorderInsets=null
 
 
 #---- Table ----
@@ -400,6 +480,8 @@ Table.cellFocusColor=@cellFocusColor
 Table.cellNoFocusBorder=com.formdev.flatlaf.ui.FlatTableCellBorder$Default
 Table.focusCellHighlightBorder=com.formdev.flatlaf.ui.FlatTableCellBorder$Focused
 Table.focusSelectedCellHighlightBorder=com.formdev.flatlaf.ui.FlatTableCellBorder$Selected
+Table.focusCellBackground=@textComponentBackground
+Table.focusCellForeground=@foreground
 Table.selectionInactiveBackground=@selectionInactiveBackground
 Table.selectionInactiveForeground=@selectionInactiveForeground
 Table.dropCellBackground=@dropCellBackground
@@ -412,6 +494,7 @@ Table.dropLineShortColor=@dropLineShortColor
 
 TableHeader.height=25
 TableHeader.cellBorder=2,3,2,3
+TableHeader.focusCellBackground=$TableHeader.background
 
 
 #---- TextArea ----
@@ -425,11 +508,12 @@ TextArea.background=@textComponentBackground
 
 # allowed values: "never", "once" (default) or "always"
 TextComponent.selectAllOnFocusPolicy=once
+TextComponent.arc=0
 
 
 #---- TextField ----
 
-TextField.border=com.formdev.flatlaf.ui.FlatBorder
+TextField.border=com.formdev.flatlaf.ui.FlatTextBorder
 TextField.margin=@textComponentMargin
 TextField.background=@textComponentBackground
 TextField.placeholderForeground=@disabledText
@@ -473,16 +557,25 @@ ToggleButton.tab.focusBackground=$TabbedPane.focusColor
 #---- ToolBar ----
 
 ToolBar.border=com.formdev.flatlaf.ui.FlatToolBarBorder
+ToolBar.borderMargins=2,2,2,2
 ToolBar.isRollover=true
-ToolBar.buttonMargins=3,3,3,3
 ToolBar.gripColor=@icon
 ToolBar.dockingBackground=@background
+ToolBar.dockingForeground=@foreground
 ToolBar.floatingBackground=@background
+ToolBar.floatingForeground=@disabledText
 
 ToolBar.separatorSize=null
 ToolBar.separatorWidth=7
 ToolBar.separatorColor=$Separator.foreground
 
+ToolBar.spacingBorder=$Button.toolbar.spacingInsets
+
+
+#---- ToolTipManager ----
+
+ToolTipManager.enableToolTipMode=activeApplication
+
 
 #---- ToolTip ----
 
@@ -505,6 +598,7 @@ Tree.dropLineColor=@dropLineColor
 Tree.rendererFillBackground=false
 Tree.rendererMargins=1,2,1,2
 Tree.wideSelection=true
+Tree.repaintWholeRow=true
 Tree.paintLines=false
 Tree.leftChildIndent=7
 Tree.rightChildIndent=11

flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties

@@ -133,11 +133,39 @@ Component.focusColor=#97c3f3
 Component.linkColor=#2470B3
 
 
+#---- Desktop ----
+
+Desktop.background=#E6EBF0
+
+
+#---- DesktopIcon ----
+
+DesktopIcon.background=darken($Desktop.background,10%)
+
+
 #---- HelpButton ----
 
 HelpButton.questionMarkColor=#4F9EE3
 
 
+#---- InternalFrame ----
+
+InternalFrame.activeTitleBackground=#fff
+InternalFrame.activeTitleForeground=@foreground
+InternalFrame.inactiveTitleBackground=#fafafa
+InternalFrame.inactiveTitleForeground=@disabledText
+
+InternalFrame.activeBorderColor=darken($Component.borderColor,20%)
+InternalFrame.inactiveBorderColor=$Component.borderColor
+
+InternalFrame.buttonHoverBackground=darken(10%,autoInverse)
+InternalFrame.buttonPressedBackground=darken(20%,autoInverse)
+InternalFrame.closeHoverBackground=lazy(Actions.Red)
+InternalFrame.closePressedBackground=darken(Actions.Red,10%,lazy)
+InternalFrame.closeHoverForeground=#fff
+InternalFrame.closePressedForeground=#fff
+
+
 #---- List ----
 
 List.background=@textComponentBackground
@@ -161,6 +189,11 @@ MenuItemCheckBox.icon.checkmarkColor=#4F9EE3
 MenuItemCheckBox.icon.disabledCheckmarkColor=#ABABAB
 
 
+#---- PasswordField ----
+
+PasswordField.capsLockIconColor=#00000064
+
+
 #---- PopupMenu ----
 
 PopupMenu.borderColor=#adadad
@@ -177,9 +210,9 @@ ProgressBar.selectionBackground=@foreground
 #---- ScrollBar ----
 
 ScrollBar.track=#F5F5F5
-ScrollBar.thumb=#DBDBDB
-ScrollBar.hoverTrackColor=#e6e6e6
-ScrollBar.hoverThumbColor=#c6c6c6
+ScrollBar.thumb=darken($ScrollBar.track,10%)
+ScrollBar.hoverTrackColor=darken($ScrollBar.track,3%)
+ScrollBar.hoverThumbColor=darken($ScrollBar.thumb,10%)
 
 
 #---- Separator ----
@@ -215,14 +248,14 @@ TabbedPane.contentAreaColor=#bfbfbf
 #---- Table ----
 
 Table.background=@textComponentBackground
-Table.gridColor=#F7F7F7
+Table.gridColor=darken($Table.background,3%)
 
 
 #---- TableHeader ----
 
-TableHeader.background=#ffffff
-TableHeader.separatorColor=#e5e5e5
-TableHeader.bottomSeparatorColor=#e5e5e5
+TableHeader.background=@textComponentBackground
+TableHeader.separatorColor=darken($TableHeader.background,10%)
+TableHeader.bottomSeparatorColor=$TableHeader.separatorColor
 
 
 #---- ToggleButton ----

flatlaf-core/svg/CapsLockIcon.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="16" height="16" fill="#6E6E6E" rx="3"/>
+    <rect width="6" height="2" x="5" y="12" fill="#FFF"/>
+    <path fill="#FFF" d="M2,8 L8,2 L14,8 L11,8 L11,10 L5,10 L5,8 L2,8 Z"/>
+  </g>
+</svg>

flatlaf-demo/DemoLaf.properties

@@ -0,0 +1,13 @@
+# This file demonstrates using a FlatLaf theme file in the FlatLaf Demo application.
+# Must be in the working directory of the Demo application.
+# Shown in the "Themes" list under category "Current Directory".
+#
+# Modifications to this file are automatically loaded by the FlatLaf Demo application
+# when the Demo window is activated.
+
+
+# base theme (light, dark, intellij or darcula)
+@baseTheme=light
+
+# add you theme defaults here
+@background=#ccc

flatlaf-demo/build.gradle.kts

@@ -14,11 +14,17 @@
  * limitations under the License.
  */
 
-version = rootProject.version
-
 plugins {
 	`java-library`
-	id( "com.jfrog.bintray" ) version "1.8.4"
+	id( "com.jfrog.bintray" )
+
+	// Although artifactory plugin is not used in this subproject, the plugin is required
+	// because otherwise gradle fails with following error:
+	//     Caused by: org.codehaus.groovy.runtime.typehandling.GroovyCastException:
+	//     Cannot cast object 'task ':bintrayUpload''
+	//     with class 'com.jfrog.bintray.gradle.tasks.BintrayUploadTask_Decorated'
+	//     to class 'com.jfrog.bintray.gradle.tasks.BintrayUploadTask'
+	id( "com.jfrog.artifactory" )
 }
 
 dependencies {
@@ -28,11 +34,6 @@ dependencies {
 	implementation( "com.jgoodies:jgoodies-forms:1.9.0" )
 }
 
-java {
-	sourceCompatibility = JavaVersion.VERSION_1_8
-	targetCompatibility = JavaVersion.VERSION_1_8
-}
-
 tasks {
 	jar {
 		dependsOn( ":flatlaf-core:jar" )
@@ -46,14 +47,18 @@ tasks {
 
 		// include all dependencies in jar
 		from( {
-			configurations.runtimeClasspath.get().filter { it.name.endsWith( "jar" ) }.map { zipTree( it ) }
+			configurations.runtimeClasspath.get()
+				.filter { it.name.endsWith( "jar" ) }
+				.map { zipTree( it ).matching {
+					exclude( "META-INF/LICENSE" )
+				} }
 		} )
 	}
 }
 
 bintray {
-	user = System.getenv( "BINTRAY_USER" ) ?: System.getProperty( "bintray.user" )
-	key = System.getenv( "BINTRAY_KEY" ) ?: System.getProperty( "bintray.key" )
+	user = rootProject.extra["bintray.user"] as String?
+	key = rootProject.extra["bintray.key"] as String?
 
 	setConfigurations( "archives" )
 
@@ -67,6 +72,7 @@ bintray {
 			name = project.version.toString()
 		}
 
-		publish = true
+		publish = rootProject.extra["bintray.publish"] as Boolean
+		dryRun = rootProject.extra["bintray.dryRun"] as Boolean
 	}
 }

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/BasicComponentsPanel.java

@@ -310,14 +310,13 @@ class BasicComponentsPanel
 		add(comboBox4, "cell 4 4,growx");
 
 		//---- comboBox5 ----
-		comboBox5.setPrototypeDisplayValue("12345");
 		comboBox5.setModel(new DefaultComboBoxModel<>(new String[] {
 			"wide popup if text is longer",
 			"aa",
 			"bbb",
 			"cccc"
 		}));
-		add(comboBox5, "cell 5 4,growx");
+		add(comboBox5, "cell 5 4,growx,wmax 100");
 
 		//---- spinnerLabel ----
 		spinnerLabel.setText("JSpinner:");

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/BasicComponentsPanel.jfd

@@ -242,7 +242,6 @@ new FormModel {
 			} )
 			add( new FormComponent( "javax.swing.JComboBox" ) {
 				name: "comboBox5"
-				"prototypeDisplayValue": "12345"
 				"model": new javax.swing.DefaultComboBoxModel {
 					selectedItem: "wide popup if text is longer"
 					addElement( "wide popup if text is longer" )
@@ -251,7 +250,7 @@ new FormModel {
 					addElement( "cccc" )
 				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 5 4,growx"
+				"value": "cell 5 4,growx,wmax 100"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "spinnerLabel"

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ControlBar.java

@@ -83,6 +83,11 @@ class ControlBar
 				} );
 			}
 		} );
+
+		UIScale.addPropertyChangeListener( e -> {
+			// update info label because user scale factor may change
+			updateInfoLabel();
+		} );
 	}
 
 	void initialize( JFrame frame, JTabbedPane tabbedPane ) {

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DataComponentsPanel.java

@@ -81,6 +81,11 @@ class DataComponentsPanel
 		JScrollPane scrollPane5 = new JScrollPane();
 		table1 = new JTable();
 		dndCheckBox = new JCheckBox();
+		JPopupMenu popupMenu2 = new JPopupMenu();
+		JMenuItem menuItem3 = new JMenuItem();
+		JMenuItem menuItem4 = new JMenuItem();
+		JMenuItem menuItem5 = new JMenuItem();
+		JMenuItem menuItem6 = new JMenuItem();
 
 		//======== this ========
 		setLayout(new MigLayout(
@@ -126,6 +131,7 @@ class DataComponentsPanel
 				@Override
 				public String getElementAt(int i) { return values[i]; }
 			});
+			list1.setComponentPopupMenu(popupMenu2);
 			scrollPane1.setViewportView(list1);
 		}
 		add(scrollPane1, "cell 1 0,growx");
@@ -198,6 +204,7 @@ class DataComponentsPanel
 						add(node1);
 					}
 				}));
+			tree1.setComponentPopupMenu(popupMenu2);
 			scrollPane3.setViewportView(tree1);
 		}
 		add(scrollPane3, "cell 1 1,growx");
@@ -287,6 +294,7 @@ class DataComponentsPanel
 					}))));
 			}
 			table1.setAutoCreateRowSorter(true);
+			table1.setComponentPopupMenu(popupMenu2);
 			scrollPane5.setViewportView(table1);
 		}
 		add(scrollPane5, "cell 1 2 2 1,growx,width 300");
@@ -296,6 +304,27 @@ class DataComponentsPanel
 		dndCheckBox.setMnemonic('D');
 		dndCheckBox.addActionListener(e -> dndChanged());
 		add(dndCheckBox, "cell 0 3 3 1");
+
+		//======== popupMenu2 ========
+		{
+
+			//---- menuItem3 ----
+			menuItem3.setText("Some Action");
+			popupMenu2.add(menuItem3);
+
+			//---- menuItem4 ----
+			menuItem4.setText("More Action");
+			popupMenu2.add(menuItem4);
+			popupMenu2.addSeparator();
+
+			//---- menuItem5 ----
+			menuItem5.setText("No Action");
+			popupMenu2.add(menuItem5);
+
+			//---- menuItem6 ----
+			menuItem6.setText("Noop Action");
+			popupMenu2.add(menuItem6);
+		}
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents
 
 		((JComboBox)((DefaultCellEditor)table1.getColumnModel().getColumn( 3 ).getCellEditor()).getComponent()).setEditable( true );

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DataComponentsPanel.jfd

@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.0.0.194" Java: "13.0.1" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.2" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
@@ -39,6 +39,7 @@ new FormModel {
 						addElement( "item 14" )
 						addElement( "item 15" )
 					}
+					"componentPopupMenu": new FormReference( "popupMenu2" )
 					auxiliary() {
 						"JavaCodeGenerator.typeParameters": "String"
 						"JavaCodeGenerator.variableLocal": false
@@ -143,6 +144,7 @@ new FormModel {
 							} )
 						} )
 					} )
+					"componentPopupMenu": new FormReference( "popupMenu2" )
 					auxiliary() {
 						"JavaCodeGenerator.variableLocal": false
 					}
@@ -299,6 +301,7 @@ new FormModel {
 						add( null )
 					} )
 					"autoCreateRowSorter": true
+					"componentPopupMenu": new FormReference( "popupMenu2" )
 					auxiliary() {
 						"JavaCodeGenerator.variableLocal": false
 					}
@@ -321,5 +324,29 @@ new FormModel {
 			"location": new java.awt.Point( 0, 0 )
 			"size": new java.awt.Dimension( 790, 715 )
 		} )
+		add( new FormContainer( "javax.swing.JPopupMenu", new FormLayoutManager( class javax.swing.JPopupMenu ) ) {
+			name: "popupMenu2"
+			add( new FormComponent( "javax.swing.JMenuItem" ) {
+				name: "menuItem3"
+				"text": "Some Action"
+			} )
+			add( new FormComponent( "javax.swing.JMenuItem" ) {
+				name: "menuItem4"
+				"text": "More Action"
+			} )
+			add( new FormComponent( "javax.swing.JPopupMenu$Separator" ) {
+				name: "separator1"
+			} )
+			add( new FormComponent( "javax.swing.JMenuItem" ) {
+				name: "menuItem5"
+				"text": "No Action"
+			} )
+			add( new FormComponent( "javax.swing.JMenuItem" ) {
+				name: "menuItem6"
+				"text": "Noop Action"
+			} )
+		}, new FormLayoutConstraints( null ) {
+			"location": new java.awt.Point( 0, 740 )
+		} )
 	}
 }

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java

@@ -20,6 +20,7 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.text.DefaultEditorKit;
+import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.demo.intellijthemes.*;
 import com.formdev.flatlaf.extras.FlatSVGIcon;
 import net.miginfocom.swing.*;
@@ -52,12 +53,53 @@ class DemoFrame
 		DemoPrefs.getState().putInt( FlatLafDemo.KEY_TAB, tabbedPane.getSelectedIndex() );
 	}
 
-	private void menuItemActionPerformed(ActionEvent e) {
+	private void menuItemActionPerformed( ActionEvent e ) {
 		SwingUtilities.invokeLater( () -> {
 			JOptionPane.showMessageDialog( this, e.getActionCommand(), "Menu Item", JOptionPane.PLAIN_MESSAGE );
 		} );
 	}
 
+	private void fontFamilyChanged( ActionEvent e ) {
+		String fontFamily = e.getActionCommand();
+
+		Font font = UIManager.getFont( "defaultFont" );
+		Font newFont = new Font( fontFamily, font.getStyle(), font.getSize() );
+		UIManager.put( "defaultFont", newFont );
+
+		FlatLaf.updateUI();
+	}
+
+	private void fontSizeChanged( ActionEvent e ) {
+		String fontSizeStr = e.getActionCommand();
+
+		Font font = UIManager.getFont( "defaultFont" );
+		Font newFont = font.deriveFont( (float) Integer.parseInt( fontSizeStr ) );
+		UIManager.put( "defaultFont", newFont );
+
+		FlatLaf.updateUI();
+	}
+
+	private void restoreFont() {
+		UIManager.put( "defaultFont", null );
+		FlatLaf.updateUI();
+	}
+
+	private void incrFont() {
+		Font font = UIManager.getFont( "defaultFont" );
+		Font newFont = font.deriveFont( (float) (font.getSize() + 1) );
+		UIManager.put( "defaultFont", newFont );
+
+		FlatLaf.updateUI();
+	}
+
+	private void decrFont() {
+		Font font = UIManager.getFont( "defaultFont" );
+		Font newFont = font.deriveFont( (float) Math.max( font.getSize() - 1, 8 ) );
+		UIManager.put( "defaultFont", newFont );
+
+		FlatLaf.updateUI();
+	}
+
 	private void initComponents() {
 		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
 		JMenuBar menuBar1 = new JMenuBar();
@@ -86,6 +128,10 @@ class DemoFrame
 		JRadioButtonMenuItem radioButtonMenuItem1 = new JRadioButtonMenuItem();
 		JRadioButtonMenuItem radioButtonMenuItem2 = new JRadioButtonMenuItem();
 		JRadioButtonMenuItem radioButtonMenuItem3 = new JRadioButtonMenuItem();
+		fontMenu = new JMenu();
+		JMenuItem restoreFontMenuItem = new JMenuItem();
+		JMenuItem incrFontMenuItem = new JMenuItem();
+		JMenuItem decrFontMenuItem = new JMenuItem();
 		JMenu helpMenu = new JMenu();
 		JMenuItem aboutMenuItem = new JMenuItem();
 		JToolBar toolBar1 = new JToolBar();
@@ -285,6 +331,30 @@ class DemoFrame
 			}
 			menuBar1.add(viewMenu);
 
+			//======== fontMenu ========
+			{
+				fontMenu.setText("Font");
+
+				//---- restoreFontMenuItem ----
+				restoreFontMenuItem.setText("Restore Font");
+				restoreFontMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_0, KeyEvent.CTRL_MASK));
+				restoreFontMenuItem.addActionListener(e -> restoreFont());
+				fontMenu.add(restoreFontMenuItem);
+
+				//---- incrFontMenuItem ----
+				incrFontMenuItem.setText("Increase Font Size");
+				incrFontMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_PLUS, KeyEvent.CTRL_MASK));
+				incrFontMenuItem.addActionListener(e -> incrFont());
+				fontMenu.add(incrFontMenuItem);
+
+				//---- decrFontMenuItem ----
+				decrFontMenuItem.setText("Decrease Font Size");
+				decrFontMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, KeyEvent.CTRL_MASK));
+				decrFontMenuItem.addActionListener(e -> decrFont());
+				fontMenu.add(decrFontMenuItem);
+			}
+			menuBar1.add(fontMenu);
+
 			//======== helpMenu ========
 			{
 				helpMenu.setText("Help");
@@ -387,9 +457,30 @@ class DemoFrame
 		cutMenuItem.addActionListener( new DefaultEditorKit.CutAction() );
 		copyMenuItem.addActionListener( new DefaultEditorKit.CopyAction() );
 		pasteMenuItem.addActionListener( new DefaultEditorKit.PasteAction() );
+
+		// add font families
+		fontMenu.addSeparator();
+		String[] fontFamilies = { "Arial", "Comic Sans MS", "Courier New", "Dialog",
+			"Monospaced", "SansSerif", "Serif", "Tahoma", "Verdana" };
+		for( String fontFamily : fontFamilies ) {
+			JMenuItem fontItem = new JMenuItem( fontFamily );
+			fontItem.addActionListener( this::fontFamilyChanged );
+			fontMenu.add( fontItem );
+		}
+
+		// add font sizes
+		fontMenu.addSeparator();
+		int[] fontSizes = { 8, 10, 12, 14, 16, 18, 20, 24, 28 };
+		for( int fontSize : fontSizes ) {
+			String fontSizeStr = Integer.toString( fontSize );
+			JMenuItem fontItem = new JMenuItem( fontSizeStr );
+			fontItem.addActionListener( this::fontSizeChanged );
+			fontMenu.add( fontItem );
+		}
 	}
 
 	// JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
+	private JMenu fontMenu;
 	private JTabbedPane tabbedPane;
 	private ControlBar controlBar;
 	// JFormDesigner - End of variables declaration  //GEN-END:variables

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.jfd

@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.0.0.194" Java: "13.0.1" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.2" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
@@ -285,6 +285,31 @@ new FormModel {
 						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "menuItemActionPerformed", true ) )
 					} )
 				} )
+				add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+					name: "fontMenu"
+					"text": "Font"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "restoreFontMenuItem"
+						"text": "Restore Font"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 48, 130, false )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "restoreFont", false ) )
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "incrFontMenuItem"
+						"text": "Increase Font Size"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 521, 130, false )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "incrFont", false ) )
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "decrFontMenuItem"
+						"text": "Decrease Font Size"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 45, 130, false )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "decrFont", false ) )
+					} )
+				} )
 				add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
 					name: "helpMenu"
 					"text": "Help"

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoPrefs.java

@@ -16,6 +16,7 @@
 
 package com.formdev.flatlaf.demo;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.util.prefs.Preferences;
 import javax.swing.UIManager;
@@ -23,6 +24,8 @@ import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.FlatLightLaf;
 import com.formdev.flatlaf.IntelliJTheme;
 import com.formdev.flatlaf.demo.intellijthemes.IJThemesPanel;
+import com.formdev.flatlaf.demo.intellijthemes.IJThemesPanel.PropertiesLaf;
+import com.formdev.flatlaf.util.StringUtils;
 
 /**
  * @author Karl Tauber
@@ -30,12 +33,12 @@ import com.formdev.flatlaf.demo.intellijthemes.IJThemesPanel;
 public class DemoPrefs
 {
 	public static final String KEY_LAF = "laf";
-	public static final String KEY_LAF_INTELLIJ_THEME = "lafIntelliJTheme";
+	public static final String KEY_LAF_THEME = "lafTheme";
 
 	public static final String RESOURCE_PREFIX = "res:";
 	public static final String FILE_PREFIX = "file:";
 
-	public static final String INTELLIJ_THEME_UI_KEY = "__FlatLaf.demo.intelliJTheme";
+	public static final String THEME_UI_KEY = "__FlatLaf.demo.theme";
 
 	private static Preferences state;
 
@@ -55,16 +58,27 @@ public class DemoPrefs
 			else {
 				String lafClassName = state.get( KEY_LAF, FlatLightLaf.class.getName() );
 				if( IntelliJTheme.ThemeLaf.class.getName().equals( lafClassName ) ) {
-					String intelliJTheme = state.get( KEY_LAF_INTELLIJ_THEME, "" );
-					if( intelliJTheme.startsWith( RESOURCE_PREFIX ) )
-						IntelliJTheme.install( IJThemesPanel.class.getResourceAsStream( intelliJTheme.substring( RESOURCE_PREFIX.length() ) ) );
-					else if( intelliJTheme.startsWith( FILE_PREFIX ) )
-					    FlatLaf.install( IntelliJTheme.createLaf( new FileInputStream( intelliJTheme.substring( FILE_PREFIX.length() ) ) ) );
+					String theme = state.get( KEY_LAF_THEME, "" );
+					if( theme.startsWith( RESOURCE_PREFIX ) )
+						IntelliJTheme.install( IJThemesPanel.class.getResourceAsStream( theme.substring( RESOURCE_PREFIX.length() ) ) );
+					else if( theme.startsWith( FILE_PREFIX ) )
+					    FlatLaf.install( IntelliJTheme.createLaf( new FileInputStream( theme.substring( FILE_PREFIX.length() ) ) ) );
 					else
 						FlatLightLaf.install();
 
-					if( !intelliJTheme.isEmpty() )
-						UIManager.getLookAndFeelDefaults().put( INTELLIJ_THEME_UI_KEY, intelliJTheme );
+					if( !theme.isEmpty() )
+						UIManager.getLookAndFeelDefaults().put( THEME_UI_KEY, theme );
+				} else if( IJThemesPanel.PropertiesLaf.class.getName().equals( lafClassName ) ) {
+					String theme = state.get( KEY_LAF_THEME, "" );
+					if( theme.startsWith( FILE_PREFIX ) ) {
+						File themeFile = new File( theme.substring( FILE_PREFIX.length() ) );
+						String themeName = StringUtils.removeTrailing( themeFile.getName(), ".properties" );
+						FlatLaf.install( new PropertiesLaf( themeName, themeFile ) );
+					} else
+						FlatLightLaf.install();
+
+					if( !theme.isEmpty() )
+						UIManager.getLookAndFeelDefaults().put( THEME_UI_KEY, theme );
 				} else
 					UIManager.setLookAndFeel( lafClassName );
 			}

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.jfd

@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.0.0.194" Java: "11.0.2" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.2" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
@@ -243,7 +243,7 @@ new FormModel {
 			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new java.awt.Point( 0, 0 )
-			"size": new java.awt.Dimension( 790, 840 )
+			"size": new java.awt.Dimension( 840, 900 )
 		} )
 	}
 }

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesManager.java

@@ -68,7 +68,9 @@ class IJThemesManager
 		// get current working directory
 		File directory = new File( "" ).getAbsoluteFile();
 
-		File[] themeFiles = directory.listFiles( (dir, name) -> name.endsWith( ".theme.json" ) );
+		File[] themeFiles = directory.listFiles( (dir, name) -> {
+			return name.endsWith( ".theme.json" ) || name.endsWith( ".properties" );
+		} );
 		if( themeFiles == null )
 			return;
 
@@ -77,7 +79,10 @@ class IJThemesManager
 
 		moreThemes.clear();
 		for( File f : themeFiles ) {
-			String name = StringUtils.removeTrailing( f.getName(), ".theme.json" );
+			String fname = f.getName();
+			String name = fname.endsWith( ".properties" )
+				? StringUtils.removeTrailing( fname, ".properties" )
+				: StringUtils.removeTrailing( fname, ".theme.json" );
 			moreThemes.add( new IJThemeInfo( name, null, null, null, null, null, f, null ) );
 			lastModifiedMap.put( f, f.lastModified() );
 		}

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java

@@ -28,6 +28,7 @@ import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
@@ -37,6 +38,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
+import java.util.Properties;
 import java.util.function.Predicate;
 import javax.swing.*;
 import javax.swing.border.CompoundBorder;
@@ -71,6 +73,7 @@ public class IJThemesPanel
 	private Window window;
 
 	private File lastDirectory;
+	private boolean isAdjustingThemesList;
 
 	public IJThemesPanel() {
 		initComponents();
@@ -134,6 +137,10 @@ public class IJThemesPanel
 		themes.add( new IJThemeInfo( "Flat IntelliJ", null, null, null, null, null, null, FlatIntelliJLaf.class.getName() ) );
 		themes.add( new IJThemeInfo( "Flat Darcula", null, null, null, null, null, null, FlatDarculaLaf.class.getName() ) );
 
+		// add themes from directory
+		categories.put( themes.size(), "Current Directory" );
+		themes.addAll( themesManager.moreThemes );
+
 		// add uncategorized bundled themes
 		categories.put( themes.size(), "IntelliJ Themes" );
 		for( IJThemeInfo ti : themesManager.bundledThemes ) {
@@ -157,10 +164,6 @@ public class IJThemesPanel
 			themes.add( ti );
 		}
 
-		// add themes from directory
-		categories.put( themes.size(), "Current Directory" );
-		themes.addAll( themesManager.moreThemes );
-
 		// remember selection
 		IJThemeInfo oldSel = themesList.getSelectedValue();
 
@@ -193,7 +196,7 @@ public class IJThemesPanel
 	}
 
 	private void themesListValueChanged( ListSelectionEvent e ) {
-		if( e.getValueIsAdjusting() )
+		if( e.getValueIsAdjusting() || isAdjustingThemesList )
 			return;
 
 		IJThemeInfo themeInfo = themesList.getSelectedValue();
@@ -223,15 +226,19 @@ public class IJThemesPanel
 			}
 		} else if( themeInfo.themeFile != null ) {
 			try {
-			    FlatLaf.install( IntelliJTheme.createLaf( new FileInputStream( themeInfo.themeFile ) ) );
-			    DemoPrefs.getState().put( DemoPrefs.KEY_LAF_INTELLIJ_THEME, DemoPrefs.FILE_PREFIX + themeInfo.themeFile );
+				if( themeInfo.themeFile.getName().endsWith( ".properties" ) ) {
+				    FlatLaf.install( new PropertiesLaf( themeInfo.name, themeInfo.themeFile ) );
+				} else
+				    FlatLaf.install( IntelliJTheme.createLaf( new FileInputStream( themeInfo.themeFile ) ) );
+
+				DemoPrefs.getState().put( DemoPrefs.KEY_LAF_THEME, DemoPrefs.FILE_PREFIX + themeInfo.themeFile );
 			} catch( Exception ex ) {
 				ex.printStackTrace();
 				showInformationDialog( "Failed to load '" + themeInfo.themeFile + "'.", ex );
 			}
 		} else {
 			IntelliJTheme.install( getClass().getResourceAsStream( themeInfo.resourceName ) );
-		    DemoPrefs.getState().put( DemoPrefs.KEY_LAF_INTELLIJ_THEME, DemoPrefs.RESOURCE_PREFIX + themeInfo.resourceName );
+		    DemoPrefs.getState().put( DemoPrefs.KEY_LAF_THEME, DemoPrefs.RESOURCE_PREFIX + themeInfo.resourceName );
 		}
 
 		// update all components
@@ -331,17 +338,17 @@ public class IJThemesPanel
 
 	private void selectedCurrentLookAndFeel() {
 		LookAndFeel lookAndFeel = UIManager.getLookAndFeel();
-		String intelliJTheme = UIManager.getLookAndFeelDefaults().getString( DemoPrefs.INTELLIJ_THEME_UI_KEY );
+		String theme = UIManager.getLookAndFeelDefaults().getString( DemoPrefs.THEME_UI_KEY );
 
-		if( intelliJTheme == null && lookAndFeel instanceof IntelliJTheme.ThemeLaf )
+		if( theme == null && (lookAndFeel instanceof IntelliJTheme.ThemeLaf || lookAndFeel instanceof PropertiesLaf) )
 			return;
 
 		Predicate<IJThemeInfo> test;
-		if( intelliJTheme != null && intelliJTheme.startsWith( DemoPrefs.RESOURCE_PREFIX ) ) {
-			String resourceName = intelliJTheme.substring( DemoPrefs.RESOURCE_PREFIX.length() );
+		if( theme != null && theme.startsWith( DemoPrefs.RESOURCE_PREFIX ) ) {
+			String resourceName = theme.substring( DemoPrefs.RESOURCE_PREFIX.length() );
 			test = ti -> Objects.equals( ti.resourceName, resourceName );
-		} else if( intelliJTheme != null && intelliJTheme.startsWith( DemoPrefs.FILE_PREFIX ) ) {
-			File themeFile = new File( intelliJTheme.substring( DemoPrefs.FILE_PREFIX.length() ) );
+		} else if( theme != null && theme.startsWith( DemoPrefs.FILE_PREFIX ) ) {
+			File themeFile = new File( theme.substring( DemoPrefs.FILE_PREFIX.length() ) );
 			test = ti -> Objects.equals( ti.themeFile, themeFile );
 		} else {
 			String lafClassName = lookAndFeel.getClass().getName();
@@ -356,11 +363,13 @@ public class IJThemesPanel
 			}
 		}
 
+		isAdjustingThemesList = true;
 		if( newSel >= 0 ) {
 			if( newSel != themesList.getSelectedIndex() )
 				themesList.setSelectedIndex( newSel );
 		} else
 			themesList.clearSelection();
+		isAdjustingThemesList = false;
 	}
 
 	private void initComponents() {
@@ -420,4 +429,78 @@ public class IJThemesPanel
 	private JScrollPane themesScrollPane;
 	private JList<IJThemeInfo> themesList;
 	// JFormDesigner - End of variables declaration  //GEN-END:variables
+
+	//---- class PropertiesLaf ------------------------------------------------
+
+	public static class PropertiesLaf
+		extends FlatLaf
+	{
+		private final String name;
+		private final String baseTheme;
+		private final boolean dark;
+		private final Properties properties;
+
+		public PropertiesLaf( String name, File propertiesFile )
+			throws IOException
+		{
+			this.name = name;
+
+			properties = new Properties();
+			try( InputStream in = new FileInputStream( propertiesFile ) ) {
+				if( in != null )
+					properties.load( in );
+			}
+
+			baseTheme = properties.getProperty( "@baseTheme", "light" );
+			dark = "dark".equalsIgnoreCase( baseTheme ) || "darcula".equalsIgnoreCase( baseTheme );
+		}
+
+		@Override
+		public String getName() {
+			return name;
+		}
+
+		@Override
+		public String getDescription() {
+			return name;
+		}
+
+		@Override
+		public boolean isDark() {
+			return dark;
+		}
+
+		@Override
+		protected ArrayList<Class<?>> getLafClassesForDefaultsLoading() {
+			ArrayList<Class<?>> lafClasses = new ArrayList<>();
+			lafClasses.add( FlatLaf.class );
+			switch( baseTheme.toLowerCase() ) {
+				default:
+				case "light":
+					lafClasses.add( FlatLightLaf.class );
+					break;
+
+				case "dark":
+					lafClasses.add( FlatDarkLaf.class );
+					break;
+
+				case "intellij":
+					lafClasses.add( FlatLightLaf.class );
+					lafClasses.add( FlatIntelliJLaf.class );
+					break;
+
+				case "darcula":
+					lafClasses.add( FlatDarkLaf.class );
+					lafClasses.add( FlatDarculaLaf.class );
+					break;
+			}
+			lafClasses.add( PropertiesLaf.class );
+			return lafClasses;
+		}
+
+		@Override
+		protected Properties getAdditionalDefaults() {
+			return properties;
+		}
+	}
 }

flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Gradianto.LICENSE.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 thvardhan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Gradianto_dark_fuchsia.theme.json

@@ -0,0 +1,267 @@
+{
+  "name": "Gradianto Dark Fuchsia",
+  "dark": true,
+  "author": "",
+  "editorScheme": "/Gradianto_dark_fuchsia.xml",
+  "ui": {
+    "*": {
+      "background": "#20022d",
+      "foreground": "#9ca9af",
+
+      "infoForeground": "#6aaf41",
+
+      "selectionBackground": "#4d086d",
+      "selectionForeground": "#c9c9c9",
+      "selectionInactiveBackground": "#37064e",
+
+
+      "disabledForeground": "#646464",
+      "disabledBackground": "#250434",
+      "inactiveBackground": "#250434",
+
+      "errorForeground": "#cd860b",
+
+      "disabledText": "#646464",
+      "Borders.ContrastBorderColor" : "#2b033b",
+      "borderColor": "#38044e",
+      "disabledBorderColor": "#22022f",
+      "focusColor" : "#550979",
+      "focusedBorderColor": "#550979",
+
+      "separatorColor": "#2d033f"
+    },
+
+    "ActionButton": {
+      "hoverBackground": "#320647",
+      "pressedBackground": "#42075c",
+      "hoverBorderColor": "#58077c",
+      "pressedBorderColor": "#3c0555"
+    },
+
+    "Borders": {
+      "color": "#38044e",
+      "ContrastBorderColor": "#38044e"
+    },
+
+
+    "Button": {
+      "startBackground": "#41295a",
+      "endBackground": "#2F0743",
+      "startBorderColor": "#400080",
+      "endBorderColor": "#6300c5",
+      "shadowColor" : "#400080",
+      "focusedBorderColor" : "#550979",
+      "default.focusColor": "#550979",
+      "disabledBorderColor" : "#2e005d",
+      "default": {
+        "startBackground": "#41295a",
+        "endBackground": "#2f0743",
+        "startBorderColor": "#400080",
+        "endBorderColor": "#6300c5",
+        "focusedBorderColor": "#550979",
+        "focusColor": "#550979"
+      }
+
+    },
+
+    "RadioButton": {
+      "background" : "#41295a",
+      "foreground": "#2f0743"
+    },
+
+    "CompletionPopup":  {
+      "matchForeground": "#652683",
+      "matchSelectionForeground": "#9057f2"
+    },
+
+    "MenuBar.borderColor": "#550979",
+    "Menu.borderColor": "#2f0743",
+
+    "NavBar.borderColor": "#2f0743",
+
+
+    "Notification": {
+
+      "errorForeground": "#abb2bf",
+      "errorBackground": "#280e29",
+      "errorBorderColor": "#692746",
+
+      "ToolWindow": {
+        "informativeForeground": "#abb2bf",
+        "informativeBackground": "#4b1d62",
+        "informativeBorderColor": "#3f2d55",
+
+        "warningForeground": "#abb2bf",
+        "warningBackground": "#735822",
+        "warningBorderColor": "#5f4422",
+
+        "errorForeground": "#abb2bf",
+        "errorBackground": "#802d43",
+        "errorBorderColor": "#552029"
+      }
+    },
+
+    "ComboBox": {
+      "background" : "#300444",
+      "nonEditableBackground": "#170b16",
+      "ArrowButton": {
+        "iconColor": "#aeb0b2",
+        "disabledIconColor": "#2a043c",
+        "nonEditableBackground": "#2c152a"
+      }
+    },
+
+    "Editor": {
+      "shortcutForeground": "#477924"
+    },
+
+    "EditorTabs": {
+
+      "selectedForeground": "#c9c9c9",
+      "selectedBackground": "#4e086f",
+      "underlinedTabBackground": "58097e",
+      "underlineColor": "#58097e",
+      "inactiveMaskColor": "#280a2fff"
+    },
+
+    "Link": {
+      "activeForeground": "#ede891",
+      "hoverForeground": "#ede891",
+      "pressedForeground": "#ede891",
+      "visitedForeground": "#ede891"
+    },
+
+    "FileColor": {
+      "Yellow": "#d19a6614",
+      "Green": "#98c37915",
+      "Blue": "#61afef15",
+      "Violet": "#542a4f",
+      "Orange": "#d13c0015",
+      "Rose": "#ae002f20"
+    },
+
+    "Tree.background": "#2d0340",
+
+    "SearchEverywhere": {
+
+
+      "Tab": {
+        "selectedForeground": "#c9c9c9",
+        "selectedBackground": "#4d086d"
+      }
+    },
+
+    "SearchMatch": {
+      "startBackground": "#d379f2",
+      "endBackground": "#d379f2"
+    },
+
+    "WelcomeScreen": {
+      "Projects.selectionInactiveBackground": "#37064e",
+      "separatorColor": "#2d033f"
+    },
+
+    "ValidationTooltip": {
+      "errorBackground": "#802d43",
+      "errorBorderColor": "#802d43",
+      "warningBackground": "#735822",
+      "warningBorderColor": "#5f4422"
+    },
+
+    "Table": {
+      "stripeColor": "#2d033f",
+      "selectionForeground": "#c9c9c9",
+      "dropLineColor": "#2d033f",
+      "focusCellForeground": "#abb2bf",
+      "gridColor": "#35064c"
+    },
+
+    "ProgressBar": {
+      "trackColor": "#280a2f",
+      "progressColor": "#e78af2",
+      "indeterminateStartColor": "#e78af2",
+      "indeterminateEndColor": "#523569",
+      "failedColor": "#ad3864",
+      "failedEndColor": "#47221d",
+      "passedColor": "#60649e",
+      "passedEndColor": "#251642"
+    },
+
+    "PopupMenu.translucentBackground": "#4d086d",
+
+    "Popup": {
+      "paintBorder": true,
+      "Header.activeBackground": "#4e086f",
+      "Header.inactiveBackground": "#4d086d",
+      "separatorColor" : "#5e0a85",
+      "separatorForeground": "#5e0a85",
+      "Advertiser": {
+        "background": "#490768",
+        "borderColor": "#490768",
+        "borderInsets": "3,8,5,0"
+      }
+    },
+    "ToggleButton": {
+      "onForeground": "#4d086d",
+      "onBackground": "#9ca9af",
+      "offForeground": "#646464",
+      "offBackground": "#280a2f",
+      "buttonColor":  "#4e086f",
+      "borderColor": "#4e086f"
+    },
+    "ToolTip": {
+      "background": "#450073",
+      "Actions.background": "#331432"
+    },
+
+    "ToolWindow": {
+      "Header": {
+        "background": "#3b0063",
+        "inactiveBackground": "#370c41"
+      },
+
+      "HeaderTab": {
+        "selectedBackground": "#9C23D9FF",
+        "selectedInactiveBackground": "#4D0080FF",
+        "hoverBackground": "#9C23D9FF",
+        "hoverInactiveBackground": "#4D0080FF"
+      },
+
+      "Button": {
+        "hoverBackground": "#320647",
+        "selectedBackground": "#42075c",
+        "selectedForeground": "#9ca9af"
+      }
+    },
+    "DragAndDrop": {
+      "areaForeground": "#FFFFFF",
+      "areaBackground": "#42075c",
+      "areaBorderColor": "#4d0080"
+    },
+    "Plugins": {
+      "SectionHeader.background": "#4d0080",
+      "tagBackground": "#42075c",
+      "lightSelectionBackground": "#41075b"
+    },
+    "EditorPane.inactiveBackground": "#1a0225"
+  },
+  "icons": {
+    "ColorPalette": {
+      "Checkbox.Background.Default.Dark": "#3c0555",
+      "Checkbox.Border.Default.Dark": "#460561",
+      "Checkbox.Foreground.Selected.Dark": "#6aae41",
+
+      "Objects.Grey": "#9b8ebe",
+      "Objects.Blue": "#05b4a1",
+      "Objects.RedStatus": "#a8191aff",
+      "Objects.Red": "#aa3c3aff",
+      "Objects.Pink": "#d16979ff",
+      "Objects.Yellow": "#be9418ff",
+      "Objects.Green": "#009c0eff",
+      "Objects.Purple": "#6b48a6ff",
+      "Objects.BlackText": "#131313ff",
+      "Objects.YellowDark": "#8a6c1aff",
+      "Objects.GreenAndroid": "#008b14ff"
+    }
+  }
+}

flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Gradianto_deep_ocean.theme.json

@@ -0,0 +1,240 @@
+{
+  "name": "Gradianto Deep Ocean",
+  "dark": true,
+  "author": "",
+  "editorScheme": "/Gradianto_deep_ocean.xml",
+  "ui": {
+    "*": {
+      "background": "#1c2739",
+      "foreground": "#c1c1c1",
+
+      "infoForeground": "#d7ff18c1",
+
+      "selectionBackground": "#39487e",
+      "selectionForeground": "#e2e2e2",
+      "selectionInactiveBackground": "#2c3d59",
+
+
+      "disabledForeground": "#a3a3a3",
+      "disabledBackground": "#222f44",
+      "inactiveBackground": "#325180",
+
+      "errorForeground": "#b5b5b5",
+
+      "disabledText": "#adadad",
+      "Borders.ContrastBorderColor" : "#0e1624",
+      "borderColor": "#151d2c",
+      "disabledBorderColor": "#0d1022",
+      "focusColor" : "#25334b",
+      "focusedBorderColor": "#2b416a",
+
+      "separatorColor": "#1d304b"
+    },
+    "Tree.background": "#24334a",
+
+    "ActionButton": {
+      "hoverBackground": "#324565",
+      "pressedBackground": "#284267",
+      "hoverBorderColor": "#141834",
+      "pressedBorderColor": "#171c3c"
+    },
+    "Borders": {
+      "color": "#2b3858cc",
+      "ContrastBorderColor": "#0e1624"
+    },
+    "Button": {
+      "startBackground": "#4a75a2",
+      "endBackground": "#4a75a2",
+      "startBorderColor": "#252e4b",
+      "endBorderColor": "#252e4b",
+      "focusedBorderColor" : "#4a75a2",
+      "default.focusColor": "#4a75a2",
+      "disabledBorderColor" : "#193c81",
+      "default": {
+        "startBackground": "#4a75a2",
+        "endBackground": "#4a75a2",
+        "focusColor": "#2969a2"
+      }
+
+    },
+    "CompletionPopup": {
+      "matchForeground": "#568AF2"
+    },
+
+
+    "Notification": {
+
+      "errorForeground": "#f5f5f5",
+      "errorBackground": "#c4131e",
+      "errorBorderColor": "#c55e4a",
+
+      "ToolWindow": {
+        "informativeForeground": "#f5f5f5",
+        "informativeBackground": "#414f66",
+        "informativeBorderColor": "#d4745c",
+
+        "warningForeground": "#abb2bf",
+        "warningBackground": "#896a28",
+        "warningBorderColor": "#5f4422",
+
+        "errorForeground": "#abb2bf",
+        "errorBackground": "#923849",
+        "errorBorderColor": "#552029"
+      }
+    },
+    "ComboBox": {
+      "background" : "#3c557c",
+      "nonEditableBackground": "#466391",
+      "ArrowButton": {
+        "iconColor": "#e3e2f1",
+        "disabledIconColor": "#83828b",
+        "nonEditableBackground": "#607691"
+      }
+    },
+    "Editor": {
+      "shortcutForeground": "#3f5079"
+    },
+    "EditorTabs": {
+
+      "selectedForeground": "#ececec",
+      "selectedBackground": "#324d65",
+      "underlinedTabBackground": "#324d65",
+      "background": "#243647",
+      "underlineColor": "#46628f",
+      "hoverMaskColor": "#46628f",
+      "inactiveMaskColor": "#24334aff"
+    },
+
+    "Link": {
+      "activeForeground": "#ede891",
+      "hoverForeground": "#ede891",
+      "pressedForeground": "#ede891",
+      "visitedForeground": "#ede891"
+    },
+    "FileColor": {
+      "Yellow": "#d1b14225",
+      "Green": "#98c37925",
+      "Blue": "#61afef25",
+      "Violet": "#542a4f25",
+      "Orange": "#d13c0025",
+      "Rose": "#ae002f25"
+    },
+    "SearchEverywhere": {
+      "Tab": {
+        "selectedForeground": "#ffffff",
+        "selectedBackground": "#314f8f"
+      }
+    },
+    "SearchMatch": {
+      "startBackground": "#67849d",
+      "endBackground": "#2d3f71"
+    },
+
+    "WelcomeScreen": {
+      "Projects.selectionInactiveBackground": "#325180",
+      "separatorColor": "#223757"
+    },
+    "ValidationTooltip": {
+      "errorBackground": "#802d43",
+      "errorBorderColor": "#802d43",
+      "warningBackground": "#735822",
+      "warningBorderColor": "#5f4422"
+    },
+    "Table": {
+      "stripeColor": "#475a6f",
+      "selectionForeground": "#e4e4e4",
+      "dropLineColor": "#586b8d",
+      "focusCellForeground": "#e3e3e3",
+      "gridColor": "#45526f"
+    },
+
+    "ProgressBar": {
+      "trackColor": "#131b2f",
+      "progressColor": "#608fcf",
+      "indeterminateStartColor": "#68a2f2",
+      "indeterminateEndColor": "#304869",
+      "failedColor": "#ad3864",
+      "failedEndColor": "#47221d",
+      "passedColor": "#83d68d",
+      "passedEndColor": "#2f422f"
+    },
+    "windowBorder" : "#282c57",
+    "window": "#282c57",
+    "PopupMenu.translucentBackground": "#26366d",
+    "Popup": {
+      "inactiveBorderColor" : "#252649",
+      "paintBorder": true,
+      "Header.activeBackground": "#39487e",
+      "Header.inactiveBackground": "#325180",
+      "separatorColor" : "#223757",
+      "separatorForeground": "#426aa8",
+      "Advertiser": {
+        "background": "#2f3347",
+        "borderColor": "#141834",
+        "borderInsets": "3,8,5,0"
+      }
+    },
+    "ToggleButton": {
+      "onForeground": "#274368",
+      "onBackground": "#9ca9af",
+      "offForeground": "#646464",
+      "offBackground": "#1c2732",
+      "buttonColor": "#3c5285"
+    },
+    "ToolTip": {
+      "background": "#445a83",
+      "Actions.background": "#252c3a"
+    },
+    "ToolWindow": {
+      "Header": {
+        "background": "#3766ae",
+        "inactiveBackground": "#325180"
+      },
+
+      "HeaderTab": {
+        "selectedBackground": "#39487eff",
+        "selectedInactiveBackground": "#2c3d59ff",
+        "hoverBackground": "#384d71ff",
+        "hoverInactiveBackground": "#25334aff"
+      },
+
+      "Button": {
+        "hoverBackground": "#384d71ff",
+        "selectedBackground": "#39487eff",
+        "selectedForeground": "#b1bfc6"
+      }
+    },
+    "DragAndDrop": {
+      "areaForeground": "#e5e5e5",
+      "areaBackground": "#242b39",
+      "areaBorderColor": "#141834"
+    },
+    "Plugins": {
+      "SectionHeader.background": "#2a3563",
+      "tagBackground": "#3d445a",
+      "lightSelectionBackground": "#3c4b7e"
+    },
+    "EditorPane.inactiveBackground": "#040c25"
+  },
+  "icons": {
+    "ColorPalette": {
+      "Checkbox.Background.Default.Dark": "#3c4861",
+      "Checkbox.Foreground.Selected.Dark": "#00d66e",
+
+      "Checkbox.Background.Disabled": "#212735",
+      "Checkbox.Background.Disabled.Dark": "#212735",
+
+      "Objects.Grey": "#e3e3e3c0",
+      "Objects.Blue": "#4fc3f7c0",
+      "Objects.RedStatus": "#ff5722c0",
+      "Objects.Red": "#ff7274c0",
+      "Objects.Pink": "#ff97b1c0",
+      "Objects.Yellow": "#ffca57c0",
+      "Objects.Green": "#76da84c0",
+      "Objects.Purple": "#d199ffc0",
+      "Objects.BlackText": "#2e2e2ec0",
+      "Objects.YellowDark": "#ffca1ec0",
+      "Objects.GreenAndroid": "#18e66bc0"
+    }
+  }
+}

flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Gradianto_midnight_blue.theme.json

@@ -0,0 +1,241 @@
+{
+  "name": "Gradianto Midnight Blue",
+  "dark": true,
+  "author": "",
+  "editorScheme": "/Gradianto_midnight_blue.xml",
+  "ui": {
+    "*": {
+      "background": "#282839",
+      "foreground": "#d4d4d4",
+
+      "infoForeground": "#00d66e",
+
+      "selectionBackground": "#544092",
+      "selectionForeground": "#e2e2e2",
+      "selectionInactiveBackground": "#48387e",
+
+
+      "disabledForeground": "#a3a3a3",
+      "disabledBackground": "#3f3571",
+      "inactiveBackground": "#52408f",
+
+      "errorForeground": "#ebf1f2",
+
+      "disabledText": "#adadad",
+      "Borders.ContrastBorderColor" : "#221b3c",
+      "borderColor": "#221b3c",
+      "disabledBorderColor": "#221b3c",
+      "focusColor" : "#161227",
+      "focusedBorderColor": "#161227",
+
+      "separatorColor": "#383850"
+    },
+
+    "Tree.background": "#2c2c3e",
+
+    "ActionButton": {
+      "hoverBackground": "#6d55bd",
+      "pressedBackground": "#4b3a81",
+      "hoverBorderColor": "#6d55bd",
+      "pressedBorderColor": "#4b3a81"
+    },
+    "Borders": {
+      "color": "#1b092f",
+      "ContrastBorderColor": "#1a1328"
+    },
+    "Button": {
+      "startBackground": "#544c91",
+      "endBackground": "#544c91",
+      "startBorderColor": "#544c91",
+      "endBorderColor": "#544c91",
+      "focusedBorderColor" : "#5631a2",
+      "default.focusColor": "#5631a2",
+      "disabledBorderColor" : "#442781",
+      "default": {
+        "startBackground": "#544c91",
+        "endBackground": "#544c91",
+        "startBorderColor": "#544c91",
+        "endBorderColor": "#442781",
+        "focusedBorderColor": "#5631a2",
+        "focusColor": "#5631a2"
+      }
+
+    },
+    "CompletionPopup":  {
+      "matchForeground": "#cecb46",
+      "matchSelectionForeground": "#ffcd7e"
+    },
+    "MenuBar.borderColor": "#221b3c",
+    "Menu.borderColor": "#140928",
+    "NavBar.borderColor": "#140928",
+
+    "Notification": {
+
+      "errorForeground": "#f5f5f5",
+      "errorBackground": "#c4131e",
+      "errorBorderColor": "#c55e4a",
+
+      "ToolWindow": {
+        "informativeForeground": "#f5f5f5",
+        "informativeBackground": "#4a4a66",
+        "informativeBorderColor": "#d4745c",
+
+        "warningForeground": "#abb2bf",
+        "warningBackground": "#896a28",
+        "warningBorderColor": "#5f4422",
+
+        "errorForeground": "#abb2bf",
+        "errorBackground": "#923849",
+        "errorBorderColor": "#552029"
+      }
+    },
+    "ComboBox": {
+      "background" : "#5d5d84",
+      "nonEditableBackground": "#4a4a68",
+      "ArrowButton": {
+        "iconColor": "#e3e2f1",
+        "disabledIconColor": "#667286",
+        "nonEditableBackground": "#464662"
+      }
+    },
+    "Editor": {
+      "shortcutForeground": "#745279"
+    },
+
+    "EditorTabs": {
+      "underlinedTabBackground": "#3d3d56",
+      "selectedBackground": "#3d3d56",
+      "underlineColor": "#44346e"
+    },
+
+    "Link": {
+      "activeForeground": "#ede891",
+      "hoverForeground": "#ede891",
+      "pressedForeground": "#ede891",
+      "visitedForeground": "#ede891"
+    },
+    "FileColor": {
+      "Yellow": "#d19a6625",
+      "Green": "#98c37925",
+      "Blue": "#61afef25",
+      "Violet": "#542a4f25",
+      "Orange": "#d13c0025",
+      "Rose": "#ae002f25"
+    },
+    "SearchEverywhere": {
+      "Tab": {
+        "selectedForeground": "#ffffff",
+        "selectedBackground": "#52408f"
+      }
+    },
+    "SearchMatch": {
+      "startBackground": "#8787c1",
+      "endBackground": "#8787c1"
+    },
+
+    "WelcomeScreen": {
+      "Projects.selectionInactiveBackground": "#323247",
+      "separatorColor": "#323247"
+    },
+
+    "ValidationTooltip": {
+      "errorBackground": "#802d43",
+      "errorBorderColor": "#802d43",
+      "warningBackground": "#735822",
+      "warningBorderColor": "#5f4422"
+    },
+    "Table": {
+      "stripeColor": "#4e4e6f",
+      "selectionForeground": "#ffffff",
+      "dropLineColor": "#63638d",
+      "focusCellForeground": "#ffffff",
+      "gridColor": "#4e4e6f"
+    },
+
+    "ProgressBar": {
+      "trackColor": "#280a2f",
+      "progressColor": "#8769cf",
+      "indeterminateStartColor": "#a088f2",
+      "indeterminateEndColor": "#3d3f69",
+      "failedColor": "#ad3864",
+      "failedEndColor": "#47221d",
+      "passedColor": "#83d68d",
+      "passedEndColor": "#2f422f"
+    },
+    "PopupMenu.translucentBackground": "#37256d",
+
+    "Popup": {
+      "paintBorder": true,
+      "Header.activeBackground": "#5841a7",
+      "Header.inactiveBackground": "#48388b",
+      "separatorColor" : "#5640a2",
+      "separatorForeground": "#654bbe",
+      "Advertiser": {
+        "background": "#323247",
+        "borderColor": "#140928",
+        "borderInsets": "3,8,5,0"
+      }
+    },
+    "ToggleButton": {
+      "onForeground": "#9ca9af",
+      "onBackground": "#3f2c6d",
+      "offForeground": "#646464",
+      "offBackground": "#232332",
+      "buttonColor": "#411e85",
+      "borderColor": "#140928"
+    },
+    "ToolTip": {
+      "background": "#5c5c83",
+      "Actions.background": "#29293a"
+    },
+    "ToolWindow": {
+      "Header": {
+        "background": "#504896",
+        "inactiveBackground": "#443577"
+      },
+
+      "HeaderTab": {
+        "selectedBackground": "#41415eff",
+        "selectedInactiveBackground": "#363647ff",
+        "hoverBackground": "#4e4e70ff",
+        "hoverInactiveBackground": "#414157ff"
+      },
+
+      "Button": {
+        "hoverBackground": "#4e4e70",
+        "selectedBackground": "#41415e",
+        "selectedForeground": "#9ca9af"
+      }
+    },
+    "DragAndDrop": {
+      "areaForeground": "#f5f5f5",
+      "areaBackground": "#282839",
+      "areaBorderColor": "#140928"
+    },
+    "Plugins": {
+      "SectionHeader.background": "#392c63",
+      "tagBackground": "#40405a",
+      "lightSelectionBackground": "#48387e"
+    },
+    "EditorPane.inactiveBackground": "#1a0225"
+  },
+  "icons": {
+    "ColorPalette": {
+      "Checkbox.Background.Default.Dark": "#444461",
+      "Checkbox.Foreground.Selected.Dark": "#00d66e",
+
+
+      "Objects.Grey": "#d6d6d6c0",
+      "Objects.Blue": "#4fc3f7c0",
+      "Objects.RedStatus": "#ff5722c0",
+      "Objects.Red": "#ff7274c0",
+      "Objects.Pink": "#ff97b1c0",
+      "Objects.Yellow": "#ffca57c0",
+      "Objects.Green": "#76da84c0",
+      "Objects.Purple": "#d199ffc0",
+      "Objects.BlackText": "#2e2e2ec0",
+      "Objects.YellowDark": "#ffca1ec0",
+      "Objects.GreenAndroid": "#18e66bc0"
+    }
+  }
+}

flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Hiberbee.theme.json

@@ -1,114 +1,124 @@
 {
+  "name": "Hiberbee",
   "author": "Vlad Volkov",
+  "dark": true,
+  "editorScheme": "/colors/Hiberbee.xml",
   "colors": {
     "accent": "#FFC83C",
+    "desaturatedBlue": "#1e282d",
+    "desaturatedOrange": "#8049117f",
+    "green": "#5B8021",
     "greyDot15": "#d8d8d8",
+    "greyDot20": "#cccccc",
     "greyDot25": "#bfbfbf",
     "greyDot33": "#aaaaaa",
     "greyDot50": "#7d7d7d",
+    "greyDot60": "#666666",
     "greyDot65": "#5a5a5a",
     "greyDot70": "#4d4d4d",
     "greyDot75": "#434343",
     "greyDot80": "#323232",
     "greyDot85": "#252525",
-    "greyDot90": "#191919",
+    "greyDot90": "#1f2021",
+    "lightBlue": "#57D1EB",
     "navyDot85": "#191d21",
     "navyDot90": "#1f2021",
-    "lightBlue": "#90dae6",
-    "green": "#5B8021",
     "red": "#800040",
-    "desaturatedBlue": "#1e282d",
-    "desaturatedOrange": "#8049117f",
     "transparentGreen": "#5B80217f",
     "transparentRed": "#8000407f",
-    "transparentYellow": "#8066357f",
     "transparentViolet": "#9478F67f",
+    "transparentYellow": "#8066357f",
     "yellow": "#806635"
   },
-  "dark": true,
-  "editorScheme": "/Hiberbee.xml",
   "icons": {
     "ColorPalette": {
+      "Actions.Blue": "#57D1EB",
+      "Actions.Green": "#92D923",
       "Actions.Grey": "#afafaf",
-      "Actions.Red": "#ff0072",
-      "Actions.Yellow": "#f7cd46",
-      "Actions.Green": "#A6E22E",
-      "Actions.Blue": "#307bf6",
-      "Actions.GreyInline": "#afafaf",
-      "Actions.GreyInline.Dark": "#7d7d7d",
-      "Objects.Grey": "#c8c8c8",
-      "Objects.RedStatus": "#EC5F5D",
-      "Objects.Red": "#ff0072",
+      "Actions.GreyInline": "#7f7f7f",
+      "Actions.GreyInline.Dark": "#646464",
+      "Actions.Red": "#ff6188",
+      "Actions.Yellow": "#FFC83C",
+      "Objects.BlackText": "greyDot33",
+      "Objects.Blue": "#57D1EB",
+      "Objects.Green": "#92D923",
+      "Objects.GreenAndroid": "#92D923",
+      "Objects.Grey": "#7f7f7f",
       "Objects.Pink": "#ffa9ca",
-      "Objects.Yellow": "#f7cd46",
-      "Objects.Green": "#78b756",
-      "Objects.Purple": "#9478f6",
-      "Objects.BlackText": "#4d4d4d",
-      "Objects.Blue": "#49b0f1",
-      "Objects.YellowDark": "#fd971f",
-      "Objects.GreenAndroid": "#78c856"
+      "Objects.Purple": "#9380FF",
+      "Objects.Red": "#ed005c",
+      "Objects.RedStatus": "#EC5F5D",
+      "Objects.Yellow": "#FFC83C",
+      "Objects.YellowDark": "#FD971F"
     }
   },
-  "name": "Hiberbee",
   "ui": {
-    "ActionButton.hoverBackground": "greyDot65",
-    "ActionButton.hoverBorderColor": "greyDot50",
-    "ActionButton.pressedBackground": "greyDot65",
-    "Borders.ContrastBorderColor": "greyDot65",
-    "ActionButton.pressedBorderColor": "lightBlue",
-    "Borders.color": "greyDot65",
-    "Button.arc": "5",
-    "Button.background": "greyDot80",
+    "*": {
+      "arc": "3",
+      "shadow": "greyDot75",
+      "background": "greyDot80",
+      "borderColor": "greyDot70",
+      "caretForeground": "accent",
+      "color": "greyDot50",
+      "foreground": "greyDot20",
+      "hoverBackground": "greyDot70",
+      "selectedBackground": "greyDot85",
+      "selectedForeground": "greyDot15",
+      "selectedInactiveBackground": "greyDot70",
+      "selectionBackground": "navyDot85",
+      "selectionForeground": "accent",
+      "separatorColor": "greyDot75",
+      "underlineHeight": 1
+    },
+    "ActionButton": {
+      "hoverBorderColor": "greyDot50",
+      "pressedBackground": "greyDot65",
+      "pressedBorderColor": "greyDot50"
+    },
+    "Borders": {
+      "ContrastBorderColor": "greyDot65",
+      "color": "greyDot70"
+    },
     "Button.default.endBackground": "greyDot80",
     "Button.default.endBorderColor": "greyDot65",
-    "Button.default.startBorderColor": "greyDot65",
-    "Button.default.focusColor": "greyDot50",
-    "Button.default.focusedBorderColor": "lightBlue",
-    "Button.default.foreground": "greyDot25",
-    "Button.default.shadowColor": "navyDot90",
+    "Button.default.focusColor": "greyDot80",
+    "Button.default.focusedBorderColor": "greyDot15",
+    "Button.default.foreground": "greyDot15",
     "Button.default.startBackground": "greyDot80",
+    "Button.default.startBorderColor": "greyDot65",
     "Button.endBackground": "greyDot80",
-    "Button.startBorderColor": "greyDot65",
     "Button.endBorderColor": "greyDot65",
     "Button.focusedBorderColor": "accent",
-    "Button.foreground": "greyDot25",
-    "Button.shadowColor": "navyDot90",
-    "Button.shadowWidth": "0",
     "Button.startBackground": "greyDot80",
-    "CheckBox.background": "greyDot80",
-    "CheckBoxMenuItem.background": "greyDot80",
-    "CheckBoxMenuItem.disabledBackground": "greyDot85",
-    "CheckBoxMenuItem.selectionForeground": "accent",
+    "Button.startBorderColor": "greyDot65",
+    "CheckBox.disabledText": "greyDot33",
+    "CheckBox.select": "greyDot50",
+    "CheckBoxMenuItem.disabledBackground": "greyDot80",
     "ComboBox.ArrowButton.disabledIconColor": "greyDot50",
     "ComboBox.ArrowButton.iconColor": "accent",
     "ComboBox.ArrowButton.nonEditableBackground": "greyDot70",
-    "ComboBox.background": "greyDot80",
     "ComboBox.modifiedItemForeground": "accent",
+    "ComboBox.disabledForeground": "greyDot70",
     "ComboBox.nonEditableBackground": "greyDot75",
-    "ComboPopup.border": "1,1,1,1,5a5a5a",
-    "CompletionPopup.foreground": "greyDot25",
-    "CompletionPopup.matchForeground": "accent",
-    "CompletionPopup.selectionBackground": "navyDot85",
-    "CompletionPopup.selectionInactiveBackground": "greyDot80",
-    "Component.arc": "5",
-    "Component.borderColor": "greyDot65",
-    "Component.errorFocusColor": "red",
-    "Component.focusColor": "accent",
+    "ComboPopup.border": "1,1,1,1,4d4d4d",
+    "CompletionPopup": {
+      "foreground": "greyDot20",
+      "matchForeground": "accent"
+    },
+    "Component.arc": "3",
+    "Label.foreground": "greyDot15",
+    "Component.disabledBorderColor": "greyDot70",
+    "Component.infoForeground": "greyDot50",
+    "Component.errorFocusColor": "#F65F87",
+    "Component.focusColor": "greyDot50",
     "Component.focusWidth": "0",
     "Component.focusedBorderColor": "greyDot50",
     "Component.hoverIconColor": "accent",
-    "Component.iconColor": "lightBlue",
     "Component.inactiveErrorFocusColor": "transparentRed",
     "Component.inactiveWarningFocusColor": "transparentYellow",
     "Component.warningFocusColor": "yellow",
-    "Counter.background": "greyDot80",
-    "Counter.foreground": "greyDot25",
     "Debugger.Variables.changedValueForeground": "accent",
     "Debugger.Variables.evaluatingExpressionForeground": "lightBlue",
-    "DebuggerPopup.borderColor": "greyDot65",
-    "DefaultTabs.background": "greyDot80",
-    "DefaultTabs.borderColor": "greyDot65",
-    "DefaultTabs.hoverBackground": "navyDot85",
     "DefaultTabs.underlineColor": "accent",
     "DefaultTabs.underlineHeight": 1,
     "DefaultTabs.underlinedTabBackground": "greyDot75",
@@ -116,14 +126,8 @@
     "DragAndDrop.areaBackground": "greyDot75",
     "DragAndDrop.areaForeground": "greyDot25",
     "Editor.background": "greyDot90",
-    "Editor.foreground": "greyDot25",
-    "EditorPane.background": "greyDot80",
-    "EditorPane.caretForeground": "accent",
-    "EditorPane.foreground": "greyDot25",
     "EditorPane.inactiveBackground": "greyDot85",
     "EditorPane.inactiveForeground": "greyDot50",
-    "EditorPane.selectionBackground": "navyDot85",
-    "EditorPane.selectionForeground": "accent",
     "EditorTabs.underlineHeight": 1,
     "FileColor.Blue": "#23282d",
     "FileColor.Green": "#232d28",
@@ -131,55 +135,45 @@
     "FileColor.Rose": "#2d2323",
     "FileColor.Violet": "#2D232D",
     "FileColor.Yellow": "#2d2d23",
+    "FormattedTextField.inactiveBackground": "greyDot80",
+    "FormattedTextField.background": "greyDot75",
     "GutterTooltip.infoForeground": "greyDot50",
-    "InplaceRefactoringPopup.borderColor": "lightBlue",
-    "Label.background": "greyDot80",
+    "Label": {
+      "foreground": "greyDot25",
+      "infoForeground": "greyDot50"
+    },
     "Link.activeForeground": "lightBlue",
     "Link.hoverForeground": "accent",
     "Link.pressedForeground": "lightBlue",
     "Link.visitedForeground": "greyDot25",
-    "List.background": "greyDot80",
-    "List.selectionBackground": "navyDot85",
-    "List.selectionForeground": "accent",
     "MemoryIndicator.allocatedBackground": "green",
     "MemoryIndicator.usedBackground": "red",
     "Menu.acceleratorForeground": "greyDot25",
-    "Menu.acceleratorSelectionForeground": "accent",
-    "Menu.background": "greyDot80",
-    "Menu.borderColor": "greyDot65",
-    "Menu.foreground": "greyDot25",
-    "Menu.selectionForeground": "accent",
-    "Menu.separatorColor": "greyDot65",
-    "MenuBar.borderColor": "greyDot65",
-    "MenuBar.selectionBackground": "navyDot85",
-    "MenuBar.shadow": "navyDot90",
-    "MenuItem.selectionForeground": "accent",
-    "Notification.MoreButton.background": "greyDot85",
     "Notification.MoreButton.innerBorderColor": "greyDot65",
-    "Notification.ToolWindow.errorBackground": "red",
-    "Notification.ToolWindow.errorBorderColor": "greyDot50",
-    "Notification.ToolWindow.errorForeground": "greyDot15",
-    "Notification.ToolWindow.informativeBackground": "#304000",
-    "Notification.ToolWindow.informativeBorderColor": "greyDot65",
-    "Notification.ToolWindow.informativeForeground": "greyDot15",
-    "Notification.ToolWindow.warningBackground": "yellow",
-    "Notification.ToolWindow.warningBorderColor": "greyDot65",
-    "Notification.ToolWindow.warningForeground": "greyDot15",
+    "Notification.ToolWindow.errorBackground": "greyDot85",
+    "Notification.ToolWindow.errorBorderColor": "#ed005c",
+    "Notification.ToolWindow.errorForeground": "#F65F87",
+    "Notification.ToolWindow.informativeBackground": "greyDot85",
+    "Notification.ToolWindow.informativeBorderColor": "#92D923",
+    "Notification.ToolWindow.informativeForeground": "#92D923",
+    "Notification.ToolWindow.warningBackground": "greyDot85",
+    "Notification.ToolWindow.warningBorderColor": "accent",
+    "Notification.ToolWindow.warningForeground": "accent",
     "Notification.background": "greyDot85",
-    "Notification.errorBackground": "red",
-    "Notification.errorBorderColor": "greyDot65",
-    "Notification.errorForeground": "greyDot15",
-    "Notification.foreground": "greyDot25",
+    "Notification.errorBackground": "greyDot85",
+    "Notification.errorBorderColor": "#ed005c",
+    "Notification.errorForeground": "#F65F87",
     "OptionPane.background": "greyDot80",
-    "OptionPane.foreground": "greyDot25",
+    "OptionPane.foreground": "greyDot33",
     "Panel.background": "greyDot80",
-    "Panel.foreground": "greyDot25",
+    "Panel.foreground": "greyDot20",
     "ParameterInfo.background": "greyDot85",
-    "ParameterInfo.currentOverloadBackground": "lightBlue",
-    "ParameterInfo.currentParameterForeground": "accent",
     "ParameterInfo.foreground": "greyDot25",
+    "ParameterInfo.currentOverloadBackground": "greyDot65",
+    "ParameterInfo.currentParameterForeground": "accent",
     "ParameterInfo.infoForeground": "greyDot33",
-    "ParameterInfo.lineSeparatorColor": "greyDot70",
+    "ParameterInfo.lineSeparatorColor": "greyDot75",
+    "PasswordField.background": "greyDot75",
     "Plugins.Button.installBackground": "greyDot80",
     "Plugins.Button.installBorderColor": "greyDot65",
     "Plugins.Button.installFillBackground": "greyDot80",
@@ -187,136 +181,99 @@
     "Plugins.Button.installForeground": "accent",
     "Plugins.SearchField.background": "greyDot75",
     "Plugins.SectionHeader.background": "greyDot75",
-    "Plugins.SectionHeader.foreground": "greyDot25",
-    "Plugins.Tab.hoverBackground": "navyDot85",
-    "Plugins.Tab.selectedBackground": "greyDot85",
+    "Plugins.Tab.hoverBackground": "greyDot65",
     "Plugins.background": "greyDot80",
     "Plugins.disabledForeground": "greyDot50",
-    "Plugins.lightSelectionBackground": "greyDot70",
+    "Plugins.lightSelectionBackground": "navyDot85",
     "Plugins.tagBackground": "greyDot85",
-    "Plugins.tagForeground": "greyDot25",
     "Popup.Advertiser.background": "greyDot85",
     "Popup.Advertiser.foreground": "greyDot50",
     "Popup.Header.activeBackground": "greyDot75",
     "Popup.Header.inactiveBackground": "greyDot85",
     "Popup.paintBorder": true,
     "PopupMenu.background": "greyDot80",
-    "PopupMenu.foreground": "greyDot25",
-    "PopupMenu.selectionBackground": "navyDot85",
-    "PopupMenu.selectionForeground": "lightBlue",
     "PopupMenuSeparator.stripeWidth": 1,
-    "ProgressBar.failedColor": "red",
-    "ProgressBar.failedEndColor": "greyDot65",
-    "ProgressBar.indeterminateEndColor": "greyDot25",
+    "ProgressBar.failedColor": "#ed005c",
+    "ProgressBar.failedEndColor": "greyDot75",
     "ProgressBar.indeterminateStartColor": "accent",
-    "ProgressBar.passedColor": "green",
-    "ProgressBar.passedEndColor": "greyDot65",
+    "ProgressBar.indeterminateEndColor": "#FD971F",
+    "ProgressBar.passedColor": "#92D923",
+    "ProgressBar.passedEndColor": "greyDot75",
     "ProgressBar.progressColor": "accent",
     "ProgressBar.trackColor": "greyDot75",
-    "RadioButton.background": "greyDot75",
-    "ScrollBar.Mac.hoverTrackColor": "greyDot75",
-    "ScrollBar.Mac.trackColor": "greyDot75",
-    "ScrollPane.background": "greyDot85",
-    "ScrollPane.foreground": "greyDot25",
-    "SearchEverywhere.Advertiser.background": "greyDot85",
-    "SearchEverywhere.Advertiser.foreground": "greyDot33",
-    "SearchEverywhere.Header.background": "greyDot85",
-    "SearchEverywhere.List.separatorColor": "greyDot70",
-    "SearchEverywhere.List.separatorForeground": "greyDot70",
+    "RadioButton.background": "greyDot80",
+    "RadioButtonMenuItem.disabledBackground": "greyDot80",
+    "ScrollPane.background": "greyDot80",
+    "SearchEverywhere.Advertiser.foreground": "greyDot50",
+    "SearchEverywhere.List.separatorForeground": "greyDot50",
+    "SearchEverywhere.SearchField.infoForeground": "greyDot33",
     "SearchEverywhere.SearchField.background": "greyDot75",
-    "SearchEverywhere.SearchField.borderColor": "greyDot70",
-    "SearchEverywhere.SearchField.infoForeground": "greyDot50",
-    "SearchEverywhere.Tab.selectedBackground": "greyDot70",
-    "SearchEverywhere.Tab.selectedForeground": "accent",
+    "SearchEverywhere.Header.background": "greyDot80",
+    "SearchEverywhere.Tab.selectedBackground": "greyDot80",
     "SearchMatch.endBackground": "accent",
     "SearchMatch.startBackground": "accent",
-    "Separator.separatorColor": "greyDot70",
     "SidePanel.background": "greyDot85",
-    "Slider.background": "greyDot80",
-    "Slider.focus": "greyDot65",
-    "SpeedSearch.background": "greyDot80",
-    "SpeedSearch.borderColor": "greyDot70",
-    "SpeedSearch.errorForeground": "red",
+    "SpeedSearch.errorForeground": "#F65F87",
     "SpeedSearch.foreground": "accent",
-    "SplitPane.background": "greyDot80",
-    "SplitPane.darkShadow": "navyDot90",
     "SplitPane.highlight": "accent",
-    "SplitPane.shadow": "navyDot90",
-    "TabbedPane.background": "greyDot80",
-    "TabbedPane.contentAreaColor": "greyDot80",
-    "TabbedPane.disabledUnderlineColor": "greyDot75",
+    "PopupMenu.translucentBackground": "greyDot50",
+    "TabbedPane.disabledUnderlineColor": "greyDot65",
     "TabbedPane.focusColor": "greyDot65",
-    "TabbedPane.foreground": "greyDot25",
-    "TabbedPane.hoverColor": "navyDot85",
     "TabbedPane.tabSelectionHeight": 1,
     "TabbedPane.underlineColor": "accent",
-    "Table.background": "greyDot80",
     "Table.dropLineColor": "greyDot75",
     "Table.dropLineShortColor": "greyDot70",
+    "Table.focusCellBackground": "greyDot85",
     "Table.focusCellForeground": "accent",
-    "Table.selectionBackground": "navyDot85",
-    "Table.selectionForeground": "accent",
     "Table.sortIconColor": "accent",
     "Table.stripeColor": "greyDot75",
     "TableHeader.background": "greyDot85",
-    "TableHeader.bottomSeparatorColor": "greyDot75",
-    "TableHeader.separatorColor": "greyDot70",
-    "TextArea.background": "greyDot85",
+    "TableHeader.bottomSeparatorColor": "greyDot65",
+    "TextArea.background": "greyDot75",
     "TextArea.caretForeground": "accent",
-    "TextArea.foreground": "greyDot25",
-    "TextArea.selectionBackground": "navyDot85",
+    "TextArea.inactiveBackground": "greyDot80",
     "TextField.background": "greyDot75",
-    "TextField.caretForeground": "accent",
-    "TextField.darkShadow": "navyDot90",
     "TextField.foreground": "greyDot25",
+    "TextField.caretForeground": "accent",
     "TextField.highlight": "greyDot15",
-    "TextField.selectionBackground": "navyDot85",
-    "TextPane.background": "greyDot80",
+    "TextField.inactiveForeground": "greyDot33",
+    "TextPane.inactiveBackground": "greyDot80",
     "TitlePane.background": "greyDot85",
-    "ToggleButton.borderColor": "greyDot70",
-    "ToggleButton.buttonColor": "greyDot75",
+    "ToggleButton.buttonColor": "greyDot65",
     "ToggleButton.offBackground": "greyDot75",
     "ToggleButton.offForeground": "greyDot25",
-    "ToggleButton.onBackground": "greyDot50",
-    "ToggleButton.onForeground": "accent",
-    "ToolBar.background": "greyDot80",
-    "ToolBar.borderHandleColor": "greyDot70",
-    "ToolBar.darkShadow": "navyDot90",
-    "ToolBar.shadow": "navyDot90",
+    "ToggleButton.onBackground": "accent",
+    "ToggleButton.onForeground": "greyDot80",
+    "ToolBar.borderHandleColor": "greyDot65",
     "ToolTip.Actions.background": "greyDot80",
     "ToolTip.Actions.infoForeground": "greyDot50",
     "ToolTip.background": "greyDot75",
-    "ToolTip.foreground": "greyDot25",
     "ToolTip.infoForeground": "greyDot50",
-    "ToolWindow.Button.hoverBackground": "navyDot85",
-    "ToolWindow.Button.selectedBackground": "greyDot70",
-    "ToolWindow.Button.selectedForeground": "accent",
+    "ToolWindow.Button.hoverBackground": "greyDot65",
+    "ToolWindow.Button.selectedBackground": "greyDot85",
+    "ToolWindow.Button.selectedForeground": "lightBlue",
     "ToolWindow.Header.background": "greyDot85",
     "ToolWindow.Header.inactiveBackground": "greyDot80",
-    "ToolWindow.HeaderTab.hoverBackground": "navyDot85",
-    "ToolWindow.HeaderTab.hoverInactiveBackground": "navyDot90",
+    "ToolWindow.HeaderTab.hoverBackground": "greyDot65",
+    "ToolWindow.HeaderTab.hoverInactiveBackground": "greyDot85",
     "ToolWindow.HeaderTab.inactiveUnderlineColor": "greyDot75",
-    "ToolWindow.HeaderTab.selectedInactiveBackground": "greyDot80",
     "ToolWindow.HeaderTab.underlineColor": "accent",
     "ToolWindow.HeaderTab.underlineHeight": 1,
+    "ToolWindow.HeaderTab.underlinedTabBackground": "greyDot90",
     "ToolWindow.HeaderTab.underlinedTabInactiveBackground": "greyDot75",
     "Tree.background": "greyDot85",
+    "Tree.foreground": "greyDot15",
     "Tree.modifiedItemForeground": "accent",
-    "Tree.paintLines": 0,
-    "Tree.rowHeight": 20,
-    "Tree.selectionBackground": "navyDot85",
-    "Tree.selectionForeground": "accent",
-    "Tree.selectionInactiveBackground": "navyDot90",
-    "ValidationTooltip.errorBackground": "red",
-    "ValidationTooltip.errorBorderColor": "greyDot65",
-    "ValidationTooltip.warningBackground": "#805e00",
-    "ValidationTooltip.warningBorderColor": "greyDot65",
+    "ValidationTooltip.errorBackground": "greyDot85",
+    "ValidationTooltip.errorBorderColor": "#ed005c",
+    "ValidationTooltip.warningBackground": "greyDot85",
+    "ValidationTooltip.warningBorderColor": "accent",
     "VersionControl.FileHistory.Commit.selectedBranchBackground": "greyDot70",
     "VersionControl.Log.Commit.currentBranchBackground": "greyDot85",
     "VersionControl.Log.Commit.unmatchedForeground": "greyDot25",
     "WelcomeScreen.Projects.selectionBackground": "navyDot85",
     "WelcomeScreen.Projects.selectionInactiveBackground": "navyDot90",
     "WelcomeScreen.separatorColor": "greyDot65",
-    "Window.border": "0,0,0,0,5a5a5a"
+    "Window.border": "1,1,1,1,4d4d4d"
   }
 }

flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/arc-theme-orange.theme.json

@@ -36,6 +36,8 @@
 	  }
 	},
 
+	"ToolBar.background" : "#F5F5F5",
+	"Popup.Toolbar.background" : "#F5F5F5",
 	"Panel.background": "#F5F5F5",
 	"Panel.foreground" : "#5c616c",
 	"Window.border" : "1,1,1,1,#5c616c",
@@ -48,11 +50,11 @@
 	"Menu.foreground" : "#5c616c",
 	"MenuItem.foreground" : "#5c616c",
 	"MenuItem.background" : "#ffffff",
-	"PopupMenuSeparator.height" : "1",
+	"PopupMenuSeparator.height" : "2",
 	"Separator.separatorColor" : "#9ba2ab",
+	"Group.separatorColor" : "#9ba2ab",
 
 	"Tree.background" : "#ffffff",
-	"Tree.rowHeight": "23",
 
 	"ProgressBar.background" : "#f57900",
 	"ProgressBar.foreground" : "#f57900",
@@ -84,6 +86,8 @@
 	"Table.lightSelectionForeground" : "#ffffff",
 	"Table.focusCellBackground" : "#f57900",
 	"Table.focusCellForeground" : "#ffffff",
+	"Table.dropLineColor": "#f57900",
+	"Table.dropLineShortColor": "#f57900",
 
 	"TabbedPane.underlineColor" : "#f57900",
 	"TabbedPane.tabSelectionHeight" : 2,
@@ -154,7 +158,9 @@
 	"EditorTabs.underlineColor" : "#f57900",
 	"EditorTabs.background" : "#F5F5F5",
 
-	"Notification.background" : "#F5F5F5"
+	"Notification.background" : "#F5F5F5",
+	"Notification.MoreButton.background" : "#dddee1",
+	"ScrollBar.background" : "#F5F5F5"
 
   },
 

flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/arc-theme.theme.json

@@ -36,6 +36,8 @@
       }
     },
 
+    "ToolBar.background" : "#F5F5F5",
+    "Popup.Toolbar.background" : "#F5F5F5",
     "Panel.background": "#F5F5F5",
     "Panel.foreground" : "#5c616c",
     "Window.border" : "1,1,1,1,#5c616c",
@@ -48,11 +50,11 @@
     "Menu.foreground" : "#5c616c",
     "MenuItem.foreground" : "#5c616c",
     "MenuItem.background" : "#ffffff",
-    "PopupMenuSeparator.height" : "1",
+    "PopupMenuSeparator.height" : "2",
     "Separator.separatorColor" : "#9ba2ab",
+    "Group.separatorColor" : "#9ba2ab",
 
     "Tree.background" : "#ffffff",
-    "Tree.rowHeight": "23",
 
     "ProgressBar.background" : "#2679db",
     "ProgressBar.foreground" : "#2679db",
@@ -84,6 +86,8 @@
     "Table.lightSelectionForeground" : "#ffffff",
     "Table.focusCellBackground" : "#2679db",
     "Table.focusCellForeground" : "#ffffff",
+    "Table.dropLineColor": "#2679db",
+    "Table.dropLineShortColor": "#2679db",
 
     "TabbedPane.underlineColor" : "#2679db",
     "TabbedPane.tabSelectionHeight" : 2,
@@ -154,7 +158,9 @@
     "EditorTabs.underlineColor" : "#2679db",
     "EditorTabs.background" : "#F5F5F5",
 
-    "Notification.background" : "#F5F5F5"
+    "Notification.background" : "#F5F5F5",
+    "Notification.MoreButton.background" : "#dddee1",
+    "ScrollBar.background" : "#F5F5F5"
 
   },
 

flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/nord.theme.json

@@ -85,7 +85,7 @@
       "matchSelectionForeground": "#88c0d0",
       "nonFocusedState": "#2e3440",
       "selectionBackground": "#4c566a",
-      "selectionInactiveBackground": "#3b4252",
+      "selectionInactiveBackground": "#4c566a",
       "selectionInactiveInfoForeground": "#4c566a",
       "selectionInfoForeground": "#eceff4"
     },

flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json

@@ -41,6 +41,27 @@
 		"sourceCodeUrl": "https://github.com/dracula/jetbrains",
 		"sourceCodePath": "blob/master/src/main/resources/themes/Dracula.theme.json"
 	},
+	"Gradianto_dark_fuchsia.theme.json": {
+		"name": "Gradianto Dark Fuchsia",
+		"license": "MIT",
+		"licenseFile": "Gradianto.LICENSE.txt",
+		"sourceCodeUrl": "https://github.com/thvardhan/Gradianto",
+		"sourceCodePath": "blob/master/resources/Gradianto_dark_fuchsia.theme.json"
+	},
+	"Gradianto_deep_ocean.theme.json": {
+		"name": "Gradianto Deep Ocean",
+		"license": "MIT",
+		"licenseFile": "Gradianto.LICENSE.txt",
+		"sourceCodeUrl": "https://github.com/thvardhan/Gradianto",
+		"sourceCodePath": "blob/master/resources/Gradianto_deep_ocean.theme.json"
+	},
+	"Gradianto_midnight_blue.theme.json": {
+		"name": "Gradianto Midnight Blue",
+		"license": "MIT",
+		"licenseFile": "Gradianto.LICENSE.txt",
+		"sourceCodeUrl": "https://github.com/thvardhan/Gradianto",
+		"sourceCodePath": "blob/master/resources/Gradianto_midnight_blue.theme.json"
+	},
 	"Gray.theme.json": {
 		"name": "Gray",
 		"license": "MIT",

flatlaf-extras/build.gradle.kts

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-version = rootProject.version
-
 plugins {
 	`java-library`
 }
@@ -24,8 +22,3 @@ dependencies {
 	implementation( project( ":flatlaf-core" ) )
 	implementation( "com.formdev:svgSalamander:1.1.2.1" )
 }
-
-java {
-	sourceCompatibility = JavaVersion.VERSION_1_8
-	targetCompatibility = JavaVersion.VERSION_1_8
-}

flatlaf-jide-oss/build.gradle.kts

@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-version = rootProject.version
-
 plugins {
 	`java-library`
 	`maven-publish`
-	id( "com.jfrog.bintray" ) version "1.8.4"
+	id( "com.jfrog.bintray" )
+	id( "com.jfrog.artifactory" )
 }
 
 dependencies {
@@ -27,11 +26,6 @@ dependencies {
 	implementation( "com.jidesoft:jide-oss:3.6.18" )
 }
 
-java {
-	sourceCompatibility = JavaVersion.VERSION_1_8
-	targetCompatibility = JavaVersion.VERSION_1_8
-}
-
 tasks {
 	assemble {
 		dependsOn(
@@ -101,8 +95,8 @@ publishing {
 }
 
 bintray {
-	user = System.getenv( "BINTRAY_USER" ) ?: System.getProperty( "bintray.user" )
-	key = System.getenv( "BINTRAY_KEY" ) ?: System.getProperty( "bintray.key" )
+	user = rootProject.extra["bintray.user"] as String?
+	key = rootProject.extra["bintray.key"] as String?
 
 	setPublications( "maven" )
 
@@ -116,6 +110,29 @@ bintray {
 			name = project.version.toString()
 		}
 
-		publish = true
+		publish = rootProject.extra["bintray.publish"] as Boolean
+		dryRun = rootProject.extra["bintray.dryRun"] as Boolean
 	}
 }
+
+artifactory {
+	setContextUrl( "https://oss.jfrog.org" )
+
+	publish( closureOf<org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig> {
+		repository( delegateClosureOf<groovy.lang.GroovyObject> {
+			setProperty( "repoKey", "oss-snapshot-local" )
+			setProperty( "username", rootProject.extra["bintray.user"] as String? )
+			setProperty( "password", rootProject.extra["bintray.key"] as String? )
+		} )
+
+		defaults( delegateClosureOf<groovy.lang.GroovyObject> {
+			invokeMethod( "publications", "maven" )
+			setProperty( "publishArtifacts", true )
+			setProperty( "publishPom", true )
+		} )
+	} )
+
+	resolve( delegateClosureOf<org.jfrog.gradle.plugin.artifactory.dsl.ResolverConfig> {
+		setProperty( "repoKey", "jcenter" )
+	} )
+}

flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJideTabbedPaneUI.java

@@ -216,7 +216,7 @@ public class FlatJideTabbedPaneUI
 		g.setColor( enabled && _tabPane.isEnabledAt( tabIndex ) &&
 				(_indexMouseOver == tabIndex || (_closeButtons != null && ((JideTabbedPane.NoFocusButton)_closeButtons[tabIndex]).isMouseOver()))
 			? hoverColor
-			: (enabled && isSelected && _tabPane.hasFocus()
+			: (enabled && isSelected && FlatUIUtils.isPermanentFocusOwner( _tabPane )
 				? focusColor
 				: _tabPane.getBackgroundAt( tabIndex )) );
 		g.fillRect( x, y, w, h );

flatlaf-swingx/build.gradle.kts

@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-version = rootProject.version
-
 plugins {
 	`java-library`
 	`maven-publish`
-	id( "com.jfrog.bintray" ) version "1.8.4"
+	id( "com.jfrog.bintray" )
+	id( "com.jfrog.artifactory" )
 }
 
 dependencies {
@@ -27,11 +26,6 @@ dependencies {
 	implementation( "org.swinglabs.swingx:swingx-all:1.6.5-1" )
 }
 
-java {
-	sourceCompatibility = JavaVersion.VERSION_1_8
-	targetCompatibility = JavaVersion.VERSION_1_8
-}
-
 tasks {
 	assemble {
 		dependsOn(
@@ -101,8 +95,8 @@ publishing {
 }
 
 bintray {
-	user = System.getenv( "BINTRAY_USER" ) ?: System.getProperty( "bintray.user" )
-	key = System.getenv( "BINTRAY_KEY" ) ?: System.getProperty( "bintray.key" )
+	user = rootProject.extra["bintray.user"] as String?
+	key = rootProject.extra["bintray.key"] as String?
 
 	setPublications( "maven" )
 
@@ -116,6 +110,29 @@ bintray {
 			name = project.version.toString()
 		}
 
-		publish = true
+		publish = rootProject.extra["bintray.publish"] as Boolean
+		dryRun = rootProject.extra["bintray.dryRun"] as Boolean
 	}
 }
+
+artifactory {
+	setContextUrl( "https://oss.jfrog.org" )
+
+	publish( closureOf<org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig> {
+		repository( delegateClosureOf<groovy.lang.GroovyObject> {
+			setProperty( "repoKey", "oss-snapshot-local" )
+			setProperty( "username", rootProject.extra["bintray.user"] as String? )
+			setProperty( "password", rootProject.extra["bintray.key"] as String? )
+		} )
+
+		defaults( delegateClosureOf<groovy.lang.GroovyObject> {
+			invokeMethod( "publications", "maven" )
+			setProperty( "publishArtifacts", true )
+			setProperty( "publishPom", true )
+		} )
+	} )
+
+	resolve( delegateClosureOf<org.jfrog.gradle.plugin.artifactory.dsl.ResolverConfig> {
+		setProperty( "repoKey", "jcenter" )
+	} )
+}

flatlaf-swingx/src/main/java/com/formdev/flatlaf/swingx/ui/FlatDatePickerBorder.java

@@ -20,6 +20,7 @@ import java.awt.Component;
 import javax.swing.JTable;
 import org.jdesktop.swingx.JXDatePicker;
 import com.formdev.flatlaf.ui.FlatRoundBorder;
+import com.formdev.flatlaf.ui.FlatUIUtils;
 
 /**
  * Border for {@link org.jdesktop.swingx.JXDatePicker}.
@@ -32,7 +33,7 @@ public class FlatDatePickerBorder
 	@Override
 	protected boolean isFocused( Component c ) {
 		if( c instanceof JXDatePicker )
-			return ((JXDatePicker)c).getEditor().hasFocus();
+			return FlatUIUtils.isPermanentFocusOwner( ((JXDatePicker)c).getEditor() );
 
 		return super.isFocused( c );
 	}

flatlaf-testing/build.gradle.kts

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-version = rootProject.version
-
 plugins {
 	`java-library`
 }
@@ -38,8 +36,3 @@ dependencies {
 //	implementation( "com.weblookandfeel:weblaf-ui:1.2.12" )
 //	implementation( "com.jgoodies:jgoodies-looks:2.7.0" )
 }
-
-java {
-	sourceCompatibility = JavaVersion.VERSION_1_8
-	targetCompatibility = JavaVersion.VERSION_1_8
-}

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.java

@@ -54,6 +54,15 @@ public class FlatComponentsTest
 		progressBar4.setIndeterminate( indeterminate );
 	}
 
+	private void contentAreaFilledChanged() {
+		boolean contentAreaFilled = contentAreaFilledCheckBox.isSelected();
+
+		for( Component c : getComponents() ) {
+			if( c instanceof AbstractButton )
+				((AbstractButton)c).setContentAreaFilled( contentAreaFilled );
+		}
+	}
+
 	private void initComponents() {
 		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
 		JLabel labelLabel = new JLabel();
@@ -78,18 +87,23 @@ public class FlatComponentsTest
 		JToggleButton toggleButton10 = new JToggleButton();
 		JToggleButton toggleButton3 = new JToggleButton();
 		JToggleButton toggleButton4 = new JToggleButton();
-		JToggleButton toggleButton5 = new JToggleButton();
-		JToggleButton toggleButton8 = new JToggleButton();
+		JToggleButton toggleButton11 = new JToggleButton();
+		JToggleButton toggleButton12 = new JToggleButton();
+		JToggleButton toggleButton13 = new JToggleButton();
+		JToggleButton toggleButton14 = new JToggleButton();
 		JLabel checkBoxLabel = new JLabel();
 		JCheckBox checkBox1 = new JCheckBox();
 		JCheckBox checkBox2 = new JCheckBox();
 		JCheckBox checkBox3 = new JCheckBox();
 		JCheckBox checkBox4 = new JCheckBox();
+		JToggleButton toggleButton5 = new JToggleButton();
+		JToggleButton toggleButton8 = new JToggleButton();
 		JLabel radioButtonLabel = new JLabel();
 		JRadioButton radioButton1 = new JRadioButton();
 		JRadioButton radioButton2 = new JRadioButton();
 		JRadioButton radioButton3 = new JRadioButton();
 		JRadioButton radioButton4 = new JRadioButton();
+		contentAreaFilledCheckBox = new JCheckBox();
 		JLabel comboBoxLabel = new JLabel();
 		JComboBox<String> comboBox1 = new JComboBox<>();
 		JComboBox<String> comboBox2 = new JComboBox<>();
@@ -151,6 +165,7 @@ public class FlatComponentsTest
 		JLabel scrollPaneLabel = new JLabel();
 		JScrollPane scrollPane13 = new JScrollPane();
 		JPanel panel1 = new JPanel();
+		JButton button19 = new JButton();
 		JScrollBar scrollBar2 = new JScrollBar();
 		JScrollBar scrollBar3 = new JScrollBar();
 		JScrollBar scrollBar7 = new JScrollBar();
@@ -193,6 +208,9 @@ public class FlatComponentsTest
 		JButton button7 = new JButton();
 		JButton button8 = new JButton();
 		JToggleButton toggleButton6 = new JToggleButton();
+		JToggleButton toggleButton15 = new JToggleButton();
+		JToggleButton toggleButton16 = new JToggleButton();
+		JToggleButton toggleButton17 = new JToggleButton();
 
 		//======== this ========
 		setLayout(new MigLayout(
@@ -343,18 +361,25 @@ public class FlatComponentsTest
 		toggleButton4.setSelected(true);
 		add(toggleButton4, "cell 4 2");
 
-		//---- toggleButton5 ----
-		toggleButton5.setText("tab");
-		toggleButton5.putClientProperty("JButton.buttonType", "tab");
-		toggleButton5.setSelected(true);
-		add(toggleButton5, "cell 5 2");
+		//---- toggleButton11 ----
+		toggleButton11.setIcon(UIManager.getIcon("Tree.closedIcon"));
+		toggleButton11.setSelected(true);
+		add(toggleButton11, "cell 5 2");
 
-		//---- toggleButton8 ----
-		toggleButton8.setText("tab");
-		toggleButton8.putClientProperty("JButton.buttonType", "tab");
-		toggleButton8.setEnabled(false);
-		toggleButton8.setSelected(true);
-		add(toggleButton8, "cell 5 2");
+		//---- toggleButton12 ----
+		toggleButton12.setText("...");
+		toggleButton12.setSelected(true);
+		add(toggleButton12, "cell 5 2");
+
+		//---- toggleButton13 ----
+		toggleButton13.setText("\u2026");
+		toggleButton13.setSelected(true);
+		add(toggleButton13, "cell 5 2");
+
+		//---- toggleButton14 ----
+		toggleButton14.setText("#");
+		toggleButton14.setSelected(true);
+		add(toggleButton14, "cell 5 2");
 
 		//---- checkBoxLabel ----
 		checkBoxLabel.setText("JCheckBox");
@@ -382,6 +407,19 @@ public class FlatComponentsTest
 		checkBox4.setEnabled(false);
 		add(checkBox4, "cell 4 3");
 
+		//---- toggleButton5 ----
+		toggleButton5.setText("tab");
+		toggleButton5.putClientProperty("JButton.buttonType", "tab");
+		toggleButton5.setSelected(true);
+		add(toggleButton5, "cell 5 3");
+
+		//---- toggleButton8 ----
+		toggleButton8.setText("tab");
+		toggleButton8.putClientProperty("JButton.buttonType", "tab");
+		toggleButton8.setEnabled(false);
+		toggleButton8.setSelected(true);
+		add(toggleButton8, "cell 5 3");
+
 		//---- radioButtonLabel ----
 		radioButtonLabel.setText("JRadioButton:");
 		add(radioButtonLabel, "cell 0 4");
@@ -408,6 +446,12 @@ public class FlatComponentsTest
 		radioButton4.setEnabled(false);
 		add(radioButton4, "cell 4 4");
 
+		//---- contentAreaFilledCheckBox ----
+		contentAreaFilledCheckBox.setText("contentAreaFilled");
+		contentAreaFilledCheckBox.setSelected(true);
+		contentAreaFilledCheckBox.addActionListener(e -> contentAreaFilledChanged());
+		add(contentAreaFilledCheckBox, "cell 5 4");
+
 		//---- comboBoxLabel ----
 		comboBoxLabel.setText("JComboBox:");
 		add(comboBoxLabel, "cell 0 5");
@@ -469,14 +513,13 @@ public class FlatComponentsTest
 		add(comboBox4, "cell 4 5,growx");
 
 		//---- comboBox5 ----
-		comboBox5.setPrototypeDisplayValue("12345");
 		comboBox5.setModel(new DefaultComboBoxModel<>(new String[] {
 			"wide popup if text is longer",
 			"aa",
 			"bbb",
 			"cccc"
 		}));
-		add(comboBox5, "cell 5 5,growx");
+		add(comboBox5, "cell 5 5,growx,wmax 100");
 
 		//---- spinnerLabel ----
 		spinnerLabel.setText("JSpinner:");
@@ -760,8 +803,14 @@ public class FlatComponentsTest
 
 			//======== panel1 ========
 			{
-				panel1.setPreferredSize(new Dimension(200, 200));
+				panel1.setPreferredSize(new Dimension(800, 400));
 				panel1.setLayout(new BorderLayout());
+
+				//---- button19 ----
+				button19.setText("I'm a large button");
+				button19.setVerticalAlignment(SwingConstants.TOP);
+				button19.setHorizontalAlignment(SwingConstants.LEFT);
+				panel1.add(button19, BorderLayout.CENTER);
 			}
 			scrollPane13.setViewportView(panel1);
 		}
@@ -963,6 +1012,21 @@ public class FlatComponentsTest
 			toggleButton6.setIcon(UIManager.getIcon("Tree.leafIcon"));
 			toggleButton6.setSelected(true);
 			toolBar1.add(toggleButton6);
+
+			//---- toggleButton15 ----
+			toggleButton15.setIcon(UIManager.getIcon("FileView.computerIcon"));
+			toggleButton15.setSelected(true);
+			toolBar1.add(toggleButton15);
+
+			//---- toggleButton16 ----
+			toggleButton16.setIcon(UIManager.getIcon("FileView.floppyDriveIcon"));
+			toggleButton16.setSelected(true);
+			toolBar1.add(toggleButton16);
+
+			//---- toggleButton17 ----
+			toggleButton17.setIcon(UIManager.getIcon("FileView.hardDriveIcon"));
+			toggleButton17.setSelected(true);
+			toolBar1.add(toggleButton17);
 		}
 		add(toolBar1, "cell 1 23 3 1,growx");
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents
@@ -974,6 +1038,7 @@ public class FlatComponentsTest
 	}
 
 	// JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
+	private JCheckBox contentAreaFilledCheckBox;
 	private JProgressBar progressBar3;
 	private JProgressBar progressBar4;
 	private JSlider slider3;

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.jfd

@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.0.0.194" Java: "13.0.1" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.1" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
@@ -98,7 +98,7 @@ new FormModel {
 			} )
 			add( new FormComponent( "javax.swing.JButton" ) {
 				name: "button13"
-				"icon": new com.jformdesigner.model.SwingIcon( 2, "Tree.closedIcon" )
+				"icon": &SwingIcon0 new com.jformdesigner.model.SwingIcon( 2, "Tree.closedIcon" )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 5 1"
 			} )
@@ -170,18 +170,29 @@ new FormModel {
 				"value": "cell 4 2"
 			} )
 			add( new FormComponent( "javax.swing.JToggleButton" ) {
-				name: "toggleButton5"
-				"text": "tab"
-				"$client.JButton.buttonType": "tab"
+				name: "toggleButton11"
+				"icon": #SwingIcon0
 				"selected": true
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 5 2"
 			} )
 			add( new FormComponent( "javax.swing.JToggleButton" ) {
-				name: "toggleButton8"
-				"text": "tab"
-				"$client.JButton.buttonType": "tab"
-				"enabled": false
+				name: "toggleButton12"
+				"text": "..."
+				"selected": true
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 5 2"
+			} )
+			add( new FormComponent( "javax.swing.JToggleButton" ) {
+				name: "toggleButton13"
+				"text": "…"
+				"selected": true
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 5 2"
+			} )
+			add( new FormComponent( "javax.swing.JToggleButton" ) {
+				name: "toggleButton14"
+				"text": "#"
 				"selected": true
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 5 2"
@@ -222,6 +233,23 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 4 3"
 			} )
+			add( new FormComponent( "javax.swing.JToggleButton" ) {
+				name: "toggleButton5"
+				"text": "tab"
+				"$client.JButton.buttonType": "tab"
+				"selected": true
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 5 3"
+			} )
+			add( new FormComponent( "javax.swing.JToggleButton" ) {
+				name: "toggleButton8"
+				"text": "tab"
+				"$client.JButton.buttonType": "tab"
+				"enabled": false
+				"selected": true
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 5 3"
+			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "radioButtonLabel"
 				"text": "JRadioButton:"
@@ -258,6 +286,17 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 4 4"
 			} )
+			add( new FormComponent( "javax.swing.JCheckBox" ) {
+				name: "contentAreaFilledCheckBox"
+				"text": "contentAreaFilled"
+				"selected": true
+				auxiliary() {
+					"JavaCodeGenerator.variableLocal": false
+				}
+				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "contentAreaFilledChanged", false ) )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 5 4"
+			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "comboBoxLabel"
 				"text": "JComboBox:"
@@ -334,7 +373,6 @@ new FormModel {
 			} )
 			add( new FormComponent( "javax.swing.JComboBox" ) {
 				name: "comboBox5"
-				"prototypeDisplayValue": "12345"
 				"model": new javax.swing.DefaultComboBoxModel {
 					selectedItem: "wide popup if text is longer"
 					addElement( "wide popup if text is longer" )
@@ -343,7 +381,7 @@ new FormModel {
 					addElement( "cccc" )
 				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 5 5,growx"
+				"value": "cell 5 5,growx,wmax 100"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "spinnerLabel"
@@ -689,7 +727,15 @@ new FormModel {
 				"verticalScrollBarPolicy": 22
 				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
 					name: "panel1"
-					"preferredSize": new java.awt.Dimension( 200, 200 )
+					"preferredSize": new java.awt.Dimension( 800, 400 )
+					add( new FormComponent( "javax.swing.JButton" ) {
+						name: "button19"
+						"text": "I'm a large button"
+						"verticalAlignment": 1
+						"horizontalAlignment": 2
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
 				} )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 13,grow,width 70,height 70"
@@ -773,18 +819,18 @@ new FormModel {
 				"orientation": 1
 				add( new FormComponent( "javax.swing.JButton" ) {
 					name: "button9"
-					"icon": &SwingIcon0 new com.jformdesigner.model.SwingIcon( 2, "Tree.closedIcon" )
+					"icon": &SwingIcon1 new com.jformdesigner.model.SwingIcon( 2, "Tree.closedIcon" )
 				} )
 				add( new FormComponent( "javax.swing.JButton" ) {
 					name: "button10"
-					"icon": &SwingIcon1 new com.jformdesigner.model.SwingIcon( 2, "Tree.openIcon" )
+					"icon": &SwingIcon2 new com.jformdesigner.model.SwingIcon( 2, "Tree.openIcon" )
 				} )
 				add( new FormComponent( "javax.swing.JToolBar$Separator" ) {
 					name: "separator5"
 				} )
 				add( new FormComponent( "javax.swing.JButton" ) {
 					name: "button11"
-					"icon": &SwingIcon2 new com.jformdesigner.model.SwingIcon( 2, "Tree.leafIcon" )
+					"icon": &SwingIcon3 new com.jformdesigner.model.SwingIcon( 2, "Tree.leafIcon" )
 				} )
 				add( new FormComponent( "javax.swing.JToggleButton" ) {
 					name: "toggleButton7"
@@ -952,18 +998,18 @@ new FormModel {
 				name: "toolBar1"
 				add( new FormComponent( "javax.swing.JButton" ) {
 					name: "button4"
-					"icon": #SwingIcon0
+					"icon": #SwingIcon1
 				} )
 				add( new FormComponent( "javax.swing.JButton" ) {
 					name: "button6"
-					"icon": #SwingIcon1
+					"icon": #SwingIcon2
 				} )
 				add( new FormComponent( "javax.swing.JToolBar$Separator" ) {
 					name: "separator3"
 				} )
 				add( new FormComponent( "javax.swing.JButton" ) {
 					name: "button7"
-					"icon": #SwingIcon2
+					"icon": #SwingIcon3
 				} )
 				add( new FormComponent( "javax.swing.JToolBar$Separator" ) {
 					name: "separator4"
@@ -979,6 +1025,21 @@ new FormModel {
 					"icon": new com.jformdesigner.model.SwingIcon( 2, "Tree.leafIcon" )
 					"selected": true
 				} )
+				add( new FormComponent( "javax.swing.JToggleButton" ) {
+					name: "toggleButton15"
+					"icon": new com.jformdesigner.model.SwingIcon( 2, "FileView.computerIcon" )
+					"selected": true
+				} )
+				add( new FormComponent( "javax.swing.JToggleButton" ) {
+					name: "toggleButton16"
+					"icon": new com.jformdesigner.model.SwingIcon( 2, "FileView.floppyDriveIcon" )
+					"selected": true
+				} )
+				add( new FormComponent( "javax.swing.JToggleButton" ) {
+					name: "toggleButton17"
+					"icon": new com.jformdesigner.model.SwingIcon( 2, "FileView.hardDriveIcon" )
+					"selected": true
+				} )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 23 3 1,growx"
 			} )

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.java

@@ -81,7 +81,11 @@ public class FlatContainerTest
 		JSplitPane splitPane3 = new JSplitPane();
 		JSplitPane splitPane1 = new JSplitPane();
 		JPanel panel10 = new JPanel();
+		JTextField textField2 = new JTextField();
+		JButton button1 = new JButton();
 		JPanel panel11 = new JPanel();
+		JTextField textField3 = new JTextField();
+		JButton button2 = new JButton();
 		JSplitPane splitPane2 = new JSplitPane();
 		JPanel panel12 = new JPanel();
 		JPanel panel13 = new JPanel();
@@ -89,7 +93,11 @@ public class FlatContainerTest
 		tabbedPane1 = new JTabbedPane();
 		JPanel panel1 = new JPanel();
 		JLabel label1 = new JLabel();
+		JTextField textField4 = new JTextField();
+		JButton button3 = new JButton();
 		JPanel panel2 = new JPanel();
+		JTextField textField5 = new JTextField();
+		JButton button4 = new JButton();
 		JLabel label2 = new JLabel();
 		tabbedPane3 = new JTabbedPane();
 		JPanel panel5 = new JPanel();
@@ -145,6 +153,14 @@ public class FlatContainerTest
 					{
 						panel10.setBackground(Color.orange);
 						panel10.setLayout(new FlowLayout());
+
+						//---- textField2 ----
+						textField2.setText("some text");
+						panel10.add(textField2);
+
+						//---- button1 ----
+						button1.setText("...");
+						panel10.add(button1);
 					}
 					splitPane1.setLeftComponent(panel10);
 
@@ -152,6 +168,14 @@ public class FlatContainerTest
 					{
 						panel11.setBackground(Color.magenta);
 						panel11.setLayout(new FlowLayout());
+
+						//---- textField3 ----
+						textField3.setText("some text");
+						panel11.add(textField3);
+
+						//---- button2 ----
+						button2.setText("...");
+						panel11.add(button2);
 					}
 					splitPane1.setRightComponent(panel11);
 				}
@@ -195,6 +219,14 @@ public class FlatContainerTest
 					//---- label1 ----
 					label1.setText("TOP");
 					panel1.add(label1);
+
+					//---- textField4 ----
+					textField4.setText("some text");
+					panel1.add(textField4);
+
+					//---- button3 ----
+					button3.setText("...");
+					panel1.add(button3);
 				}
 				tabbedPane1.addTab("Tab 1", panel1);
 
@@ -202,6 +234,14 @@ public class FlatContainerTest
 				{
 					panel2.setBorder(new LineBorder(Color.magenta));
 					panel2.setLayout(new FlowLayout());
+
+					//---- textField5 ----
+					textField5.setText("some text");
+					panel2.add(textField5);
+
+					//---- button4 ----
+					button4.setText("...");
+					panel2.add(button4);
 				}
 				tabbedPane1.addTab("Tab 2", panel2);
 

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.jfd

@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.0.0.194" Java: "11.0.2" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.1" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
@@ -32,12 +32,28 @@ new FormModel {
 						add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.FlowLayout ) ) {
 							name: "panel10"
 							"background": sfield java.awt.Color orange
+							add( new FormComponent( "javax.swing.JTextField" ) {
+								name: "textField2"
+								"text": "some text"
+							} )
+							add( new FormComponent( "javax.swing.JButton" ) {
+								name: "button1"
+								"text": "..."
+							} )
 						}, new FormLayoutConstraints( class java.lang.String ) {
 							"value": "left"
 						} )
 						add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.FlowLayout ) ) {
 							name: "panel11"
 							"background": sfield java.awt.Color magenta
+							add( new FormComponent( "javax.swing.JTextField" ) {
+								name: "textField3"
+								"text": "some text"
+							} )
+							add( new FormComponent( "javax.swing.JButton" ) {
+								name: "button2"
+								"text": "..."
+							} )
 						}, new FormLayoutConstraints( class java.lang.String ) {
 							"value": "right"
 						} )
@@ -86,12 +102,28 @@ new FormModel {
 							name: "label1"
 							"text": "TOP"
 						} )
+						add( new FormComponent( "javax.swing.JTextField" ) {
+							name: "textField4"
+							"text": "some text"
+						} )
+						add( new FormComponent( "javax.swing.JButton" ) {
+							name: "button3"
+							"text": "..."
+						} )
 					}, new FormLayoutConstraints( null ) {
 						"title": "Tab 1"
 					} )
 					add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.FlowLayout ) ) {
 						name: "panel2"
 						"border": &LineBorder0 new javax.swing.border.LineBorder( sfield java.awt.Color magenta, 1, false )
+						add( new FormComponent( "javax.swing.JTextField" ) {
+							name: "textField5"
+							"text": "some text"
+						} )
+						add( new FormComponent( "javax.swing.JButton" ) {
+							name: "button4"
+							"text": "..."
+						} )
 					}, new FormLayoutConstraints( null ) {
 						"title": "Tab 2"
 					} )

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatInspector.java

@@ -27,6 +27,7 @@ import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Insets;
 import java.awt.KeyboardFocusManager;
+import java.awt.LayoutManager;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.Toolkit;
@@ -294,6 +295,12 @@ public class FlatInspector
 			}
 		}
 
+		if( c instanceof Container ) {
+			LayoutManager layout = ((Container)c).getLayout();
+			if( layout != null )
+				text += "Layout: " + layout.getClass().getName() + '\n';
+		}
+
 		text += "Enabled: " + c.isEnabled() + '\n';
 		text += "Opaque: " + c.isOpaque() + (c instanceof JComponent &&
 			FlatUIUtils.hasOpaqueBeenExplicitlySet( (JComponent) c ) ? " EXPLICIT" : "") + '\n';
@@ -311,7 +318,8 @@ public class FlatInspector
 		if( insets == null )
 			return "null";
 
-		return insets.top + "," + insets.left + ',' + insets.bottom + ',' + insets.right;
+		return insets.top + "," + insets.left + ',' + insets.bottom + ',' + insets.right
+			+ (insets instanceof UIResource ? " UI" : "");
 	}
 
 	private static String toString( Color c ) {

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatInternalFrameTest.java

@@ -7,6 +7,7 @@ package com.formdev.flatlaf.testing;
 import java.awt.*;
 import java.beans.PropertyVetoException;
 import javax.swing.*;
+import com.formdev.flatlaf.icons.FlatFileViewFloppyDriveIcon;
 import com.formdev.flatlaf.util.UIScale;
 import net.miginfocom.swing.*;
 
@@ -49,10 +50,25 @@ public class FlatInternalFrameTest
 			maximizableCheckBox.isSelected(),
 			iconifiableCheckBox.isSelected() );
 
-		JPanel panel = new JPanel();
-		panel.setBackground( new Color( (int) (Math.random() * 0xffffff) ) );
+		if( iconCheckBox.isSelected() )
+			internalFrame.setFrameIcon( new FlatFileViewFloppyDriveIcon() );
+
+		JPanel panel = new JPanel() {
+			private final Color color = new Color( (int) (Math.random() * 0xffffff) | 0x20000000, true );
+
+			@Override
+			protected void paintComponent( Graphics g ) {
+				super.paintComponent( g );
+
+				g.setColor( color );
+				g.fillRect( 20, 20, getWidth() - 40, getHeight() - 40 );
+			}
+		};
 		internalFrame.setContentPane( panel );
 
+		if( !palette.getComponentOrientation().isLeftToRight() )
+			internalFrame.setComponentOrientation( ComponentOrientation.RIGHT_TO_LEFT );
+
 		internalFrame.setBounds( frameX + UIScale.scale( GAP ) * (frameCount % 10),
 			frameY + UIScale.scale( GAP ) * (frameCount % 10), UIScale.scale( 200 ), UIScale.scale( 200 ) );
 		desktopPane.add( internalFrame, JLayeredPane.DEFAULT_LAYER );
@@ -76,6 +92,7 @@ public class FlatInternalFrameTest
 		closableCheckBox = new JCheckBox();
 		iconifiableCheckBox = new JCheckBox();
 		maximizableCheckBox = new JCheckBox();
+		iconCheckBox = new JCheckBox();
 		titleLabel = new JLabel();
 		titleField = new JTextField();
 		createFrameButton = new JButton();
@@ -107,6 +124,7 @@ public class FlatInternalFrameTest
 					// rows
 					"[fill]0" +
 					"[]0" +
+					"[]0" +
 					"[]unrel" +
 					"[]unrel"));
 
@@ -130,18 +148,22 @@ public class FlatInternalFrameTest
 				maximizableCheckBox.setSelected(true);
 				paletteContentPane.add(maximizableCheckBox, "cell 1 1,alignx left,growx 0");
 
+				//---- iconCheckBox ----
+				iconCheckBox.setText("Frame icon");
+				paletteContentPane.add(iconCheckBox, "cell 0 2");
+
 				//---- titleLabel ----
 				titleLabel.setText("Frame title:");
-				paletteContentPane.add(titleLabel, "cell 0 2");
-				paletteContentPane.add(titleField, "cell 1 2");
+				paletteContentPane.add(titleLabel, "cell 0 3");
+				paletteContentPane.add(titleField, "cell 1 3");
 
 				//---- createFrameButton ----
 				createFrameButton.setText("Create Frame");
 				createFrameButton.addActionListener(e -> createInternalFrame());
-				paletteContentPane.add(createFrameButton, "cell 1 3,alignx right,growx 0");
+				paletteContentPane.add(createFrameButton, "cell 1 4,alignx right,growx 0");
 			}
 			desktopPane.add(palette, JLayeredPane.PALETTE_LAYER);
-			palette.setBounds(15, 25, 220, 160);
+			palette.setBounds(15, 25, 220, 185);
 		}
 		add(desktopPane, "cell 0 0,width 600,height 600");
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents
@@ -157,6 +179,7 @@ public class FlatInternalFrameTest
 	private JCheckBox closableCheckBox;
 	private JCheckBox iconifiableCheckBox;
 	private JCheckBox maximizableCheckBox;
+	private JCheckBox iconCheckBox;
 	private JLabel titleLabel;
 	private JTextField titleField;
 	private JButton createFrameButton;

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatInternalFrameTest.jfd

@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.0.0.194" Java: "11.0.2" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.0.0.194" Java: "13.0.1" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
@@ -14,7 +14,7 @@ new FormModel {
 				add( new FormContainer( "javax.swing.JInternalFrame", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 					"$layoutConstraints": "hidemode 3"
 					"$columnConstraints": "[fill][fill]"
-					"$rowConstraints": "[fill]0[]0[]unrel[]unrel"
+					"$rowConstraints": "[fill]0[]0[]0[]unrel[]unrel"
 				} ) {
 					name: "palette"
 					"visible": true
@@ -50,29 +50,35 @@ new FormModel {
 					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 						"value": "cell 1 1,alignx left,growx 0"
 					} )
+					add( new FormComponent( "javax.swing.JCheckBox" ) {
+						name: "iconCheckBox"
+						"text": "Frame icon"
+					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+						"value": "cell 0 2"
+					} )
 					add( new FormComponent( "javax.swing.JLabel" ) {
 						name: "titleLabel"
 						"text": "Frame title:"
 					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-						"value": "cell 0 2"
+						"value": "cell 0 3"
 					} )
 					add( new FormComponent( "javax.swing.JTextField" ) {
 						name: "titleField"
 					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-						"value": "cell 1 2"
+						"value": "cell 1 3"
 					} )
 					add( new FormComponent( "javax.swing.JButton" ) {
 						name: "createFrameButton"
 						"text": "Create Frame"
 						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "createInternalFrame", false ) )
 					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-						"value": "cell 1 3,alignx right,growx 0"
+						"value": "cell 1 4,alignx right,growx 0"
 					} )
 				}, new FormLayoutConstraints( null ) {
 					"x": 15
 					"y": 25
 					"width": 220
-					"height": 160
+					"height": 185
 					"layer": 100
 				} )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.java

@@ -21,13 +21,14 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import javax.swing.*;
 import javax.swing.border.*;
+import com.formdev.flatlaf.demo.ScrollablePanel;
 import net.miginfocom.swing.*;
 
 /**
  * @author Karl Tauber
  */
 public class FlatOptionPaneTest
-	extends FlatTestPanel
+	extends JScrollPane
 {
 	public static void main( String[] args ) {
 		SwingUtilities.invokeLater( () -> {
@@ -55,6 +56,7 @@ public class FlatOptionPaneTest
 
 	private void initComponents() {
 		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
+		ScrollablePanel panel9 = new ScrollablePanel();
 		JLabel plainLabel = new JLabel();
 		JPanel panel1 = new JPanel();
 		JOptionPane plainOptionPane = new JOptionPane();
@@ -89,194 +91,200 @@ public class FlatOptionPaneTest
 		FlatOptionPaneTest.ShowDialogLinkLabel customShowDialogLabel = new FlatOptionPaneTest.ShowDialogLinkLabel();
 
 		//======== this ========
-		setLayout(new MigLayout(
-			"flowy,ltr,insets dialog,hidemode 3",
-			// columns
-			"[]" +
-			"[]" +
-			"[fill]",
-			// rows
-			"[top]" +
-			"[top]" +
-			"[top]" +
-			"[top]" +
-			"[top]" +
-			"[top]" +
-			"[top]" +
-			"[top]"));
+		setBorder(BorderFactory.createEmptyBorder());
 
-		//---- plainLabel ----
-		plainLabel.setText("Plain");
-		add(plainLabel, "cell 0 0");
-
-		//======== panel1 ========
+		//======== panel9 ========
 		{
-			panel1.setBorder(LineBorder.createGrayLineBorder());
-			panel1.setLayout(new BorderLayout());
+			panel9.setLayout(new MigLayout(
+				"flowy,ltr,insets dialog,hidemode 3",
+				// columns
+				"[]" +
+				"[]" +
+				"[fill]",
+				// rows
+				"[top]" +
+				"[top]" +
+				"[top]" +
+				"[top]" +
+				"[top]" +
+				"[top]" +
+				"[top]" +
+				"[top]"));
 
-			//---- plainOptionPane ----
-			plainOptionPane.setMessage("Hello world.");
-			panel1.add(plainOptionPane, BorderLayout.CENTER);
+			//---- plainLabel ----
+			plainLabel.setText("Plain");
+			panel9.add(plainLabel, "cell 0 0");
+
+			//======== panel1 ========
+			{
+				panel1.setBorder(LineBorder.createGrayLineBorder());
+				panel1.setLayout(new BorderLayout());
+
+				//---- plainOptionPane ----
+				plainOptionPane.setMessage("Hello world.");
+				panel1.add(plainOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel1, "cell 1 0");
+
+			//---- plainShowDialogLabel ----
+			plainShowDialogLabel.setOptionPane(plainOptionPane);
+			plainShowDialogLabel.setTitleLabel(plainLabel);
+			panel9.add(plainShowDialogLabel, "cell 2 0");
+
+			//---- errorLabel ----
+			errorLabel.setText("Error");
+			panel9.add(errorLabel, "cell 0 1");
+
+			//======== panel2 ========
+			{
+				panel2.setBorder(LineBorder.createGrayLineBorder());
+				panel2.setLayout(new BorderLayout());
+
+				//---- errorOptionPane ----
+				errorOptionPane.setMessageType(JOptionPane.ERROR_MESSAGE);
+				errorOptionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
+				errorOptionPane.setMessage("Your PC ran into a problem. Buy a new one.");
+				panel2.add(errorOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel2, "cell 1 1");
+
+			//---- errorShowDialogLabel ----
+			errorShowDialogLabel.setTitleLabel(errorLabel);
+			errorShowDialogLabel.setOptionPane(errorOptionPane);
+			panel9.add(errorShowDialogLabel, "cell 2 1");
+
+			//---- informationLabel ----
+			informationLabel.setText("Information");
+			panel9.add(informationLabel, "cell 0 2");
+
+			//======== panel3 ========
+			{
+				panel3.setBorder(LineBorder.createGrayLineBorder());
+				panel3.setLayout(new BorderLayout());
+
+				//---- informationOptionPane ----
+				informationOptionPane.setMessageType(JOptionPane.INFORMATION_MESSAGE);
+				informationOptionPane.setOptionType(JOptionPane.YES_NO_OPTION);
+				informationOptionPane.setMessage("Text with\nmultiple lines\n(use \\n to separate lines)");
+				panel3.add(informationOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel3, "cell 1 2");
+
+			//---- informationShowDialogLabel ----
+			informationShowDialogLabel.setOptionPane(informationOptionPane);
+			informationShowDialogLabel.setTitleLabel(informationLabel);
+			panel9.add(informationShowDialogLabel, "cell 2 2");
+
+			//---- questionLabel ----
+			questionLabel.setText("Question");
+			panel9.add(questionLabel, "cell 0 3");
+
+			//======== panel4 ========
+			{
+				panel4.setBorder(LineBorder.createGrayLineBorder());
+				panel4.setLayout(new BorderLayout());
+
+				//---- questionOptionPane ----
+				questionOptionPane.setMessageType(JOptionPane.QUESTION_MESSAGE);
+				questionOptionPane.setOptionType(JOptionPane.YES_NO_CANCEL_OPTION);
+				questionOptionPane.setMessage("Answer the question. What question? Don't know. Just writing useless text to make this longer than 80 characters.");
+				panel4.add(questionOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel4, "cell 1 3");
+
+			//---- questionShowDialogLabel ----
+			questionShowDialogLabel.setOptionPane(questionOptionPane);
+			questionShowDialogLabel.setTitleLabel(questionLabel);
+			panel9.add(questionShowDialogLabel, "cell 2 3");
+
+			//---- warningLabel ----
+			warningLabel.setText("Warning");
+			panel9.add(warningLabel, "cell 0 4");
+
+			//======== panel5 ========
+			{
+				panel5.setBorder(LineBorder.createGrayLineBorder());
+				panel5.setLayout(new BorderLayout());
+
+				//---- warningOptionPane ----
+				warningOptionPane.setMessageType(JOptionPane.WARNING_MESSAGE);
+				warningOptionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
+				warningOptionPane.setMessage("<html>I like <b>bold</b>,<br> and I like <i>italic</i>,<br> and I like to have<br> many lines.<br> Lots of lines.");
+				panel5.add(warningOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel5, "cell 1 4");
+
+			//---- warningShowDialogLabel ----
+			warningShowDialogLabel.setOptionPane(warningOptionPane);
+			warningShowDialogLabel.setTitleLabel(warningLabel);
+			panel9.add(warningShowDialogLabel, "cell 2 4");
+
+			//---- inputLabel ----
+			inputLabel.setText("Input");
+			panel9.add(inputLabel, "cell 0 5");
+
+			//======== panel7 ========
+			{
+				panel7.setBorder(LineBorder.createGrayLineBorder());
+				panel7.setLayout(new BorderLayout());
+
+				//---- inputOptionPane ----
+				inputOptionPane.setWantsInput(true);
+				inputOptionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
+				inputOptionPane.setMessage("Enter whatever you want:");
+				panel7.add(inputOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel7, "cell 1 5");
+
+			//---- inputShowDialogLabel ----
+			inputShowDialogLabel.setOptionPane(inputOptionPane);
+			inputShowDialogLabel.setTitleLabel(inputLabel);
+			panel9.add(inputShowDialogLabel, "cell 2 5");
+
+			//---- inputIconLabel ----
+			inputIconLabel.setText("Input + icon");
+			panel9.add(inputIconLabel, "cell 0 6");
+
+			//======== panel8 ========
+			{
+				panel8.setBorder(LineBorder.createGrayLineBorder());
+				panel8.setLayout(new BorderLayout());
+
+				//---- inputIconOptionPane ----
+				inputIconOptionPane.setMessageType(JOptionPane.INFORMATION_MESSAGE);
+				inputIconOptionPane.setWantsInput(true);
+				inputIconOptionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
+				inputIconOptionPane.setMessage("Enter something:");
+				panel8.add(inputIconOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel8, "cell 1 6");
+
+			//---- inputIconShowDialogLabel ----
+			inputIconShowDialogLabel.setTitleLabel(inputIconLabel);
+			inputIconShowDialogLabel.setOptionPane(inputIconOptionPane);
+			panel9.add(inputIconShowDialogLabel, "cell 2 6");
+
+			//---- customLabel ----
+			customLabel.setText("Custom");
+			panel9.add(customLabel, "cell 0 7");
+
+			//======== panel6 ========
+			{
+				panel6.setBorder(LineBorder.createGrayLineBorder());
+				panel6.setLayout(new BorderLayout());
+
+				//---- customOptionPane ----
+				customOptionPane.setIcon(UIManager.getIcon("Tree.leafIcon"));
+				panel6.add(customOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel6, "cell 1 7");
+
+			//---- customShowDialogLabel ----
+			customShowDialogLabel.setOptionPane(customOptionPane);
+			customShowDialogLabel.setTitleLabel(customLabel);
+			panel9.add(customShowDialogLabel, "cell 2 7");
 		}
-		add(panel1, "cell 1 0");
-
-		//---- plainShowDialogLabel ----
-		plainShowDialogLabel.setOptionPane(plainOptionPane);
-		plainShowDialogLabel.setTitleLabel(plainLabel);
-		add(plainShowDialogLabel, "cell 2 0");
-
-		//---- errorLabel ----
-		errorLabel.setText("Error");
-		add(errorLabel, "cell 0 1");
-
-		//======== panel2 ========
-		{
-			panel2.setBorder(LineBorder.createGrayLineBorder());
-			panel2.setLayout(new BorderLayout());
-
-			//---- errorOptionPane ----
-			errorOptionPane.setMessageType(JOptionPane.ERROR_MESSAGE);
-			errorOptionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
-			errorOptionPane.setMessage("Your PC ran into a problem. Buy a new one.");
-			panel2.add(errorOptionPane, BorderLayout.CENTER);
-		}
-		add(panel2, "cell 1 1");
-
-		//---- errorShowDialogLabel ----
-		errorShowDialogLabel.setTitleLabel(errorLabel);
-		errorShowDialogLabel.setOptionPane(errorOptionPane);
-		add(errorShowDialogLabel, "cell 2 1");
-
-		//---- informationLabel ----
-		informationLabel.setText("Information");
-		add(informationLabel, "cell 0 2");
-
-		//======== panel3 ========
-		{
-			panel3.setBorder(LineBorder.createGrayLineBorder());
-			panel3.setLayout(new BorderLayout());
-
-			//---- informationOptionPane ----
-			informationOptionPane.setMessageType(JOptionPane.INFORMATION_MESSAGE);
-			informationOptionPane.setOptionType(JOptionPane.YES_NO_OPTION);
-			informationOptionPane.setMessage("Text with\nmultiple lines\n(use \\n to separate lines)");
-			panel3.add(informationOptionPane, BorderLayout.CENTER);
-		}
-		add(panel3, "cell 1 2");
-
-		//---- informationShowDialogLabel ----
-		informationShowDialogLabel.setOptionPane(informationOptionPane);
-		informationShowDialogLabel.setTitleLabel(informationLabel);
-		add(informationShowDialogLabel, "cell 2 2");
-
-		//---- questionLabel ----
-		questionLabel.setText("Question");
-		add(questionLabel, "cell 0 3");
-
-		//======== panel4 ========
-		{
-			panel4.setBorder(LineBorder.createGrayLineBorder());
-			panel4.setLayout(new BorderLayout());
-
-			//---- questionOptionPane ----
-			questionOptionPane.setMessageType(JOptionPane.QUESTION_MESSAGE);
-			questionOptionPane.setOptionType(JOptionPane.YES_NO_CANCEL_OPTION);
-			questionOptionPane.setMessage("Answer the question. What question? Don't know. Just writing useless text to make this longer than 80 characters.");
-			panel4.add(questionOptionPane, BorderLayout.CENTER);
-		}
-		add(panel4, "cell 1 3");
-
-		//---- questionShowDialogLabel ----
-		questionShowDialogLabel.setOptionPane(questionOptionPane);
-		questionShowDialogLabel.setTitleLabel(questionLabel);
-		add(questionShowDialogLabel, "cell 2 3");
-
-		//---- warningLabel ----
-		warningLabel.setText("Warning");
-		add(warningLabel, "cell 0 4");
-
-		//======== panel5 ========
-		{
-			panel5.setBorder(LineBorder.createGrayLineBorder());
-			panel5.setLayout(new BorderLayout());
-
-			//---- warningOptionPane ----
-			warningOptionPane.setMessageType(JOptionPane.WARNING_MESSAGE);
-			warningOptionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
-			warningOptionPane.setMessage("<html>I like <b>bold</b>,<br> and I like <i>italic</i>,<br> and I like to have<br> many lines.<br> Lots of lines.");
-			panel5.add(warningOptionPane, BorderLayout.CENTER);
-		}
-		add(panel5, "cell 1 4");
-
-		//---- warningShowDialogLabel ----
-		warningShowDialogLabel.setOptionPane(warningOptionPane);
-		warningShowDialogLabel.setTitleLabel(warningLabel);
-		add(warningShowDialogLabel, "cell 2 4");
-
-		//---- inputLabel ----
-		inputLabel.setText("Input");
-		add(inputLabel, "cell 0 5");
-
-		//======== panel7 ========
-		{
-			panel7.setBorder(LineBorder.createGrayLineBorder());
-			panel7.setLayout(new BorderLayout());
-
-			//---- inputOptionPane ----
-			inputOptionPane.setWantsInput(true);
-			inputOptionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
-			inputOptionPane.setMessage("Enter whatever you want:");
-			panel7.add(inputOptionPane, BorderLayout.CENTER);
-		}
-		add(panel7, "cell 1 5");
-
-		//---- inputShowDialogLabel ----
-		inputShowDialogLabel.setOptionPane(inputOptionPane);
-		inputShowDialogLabel.setTitleLabel(inputLabel);
-		add(inputShowDialogLabel, "cell 2 5");
-
-		//---- inputIconLabel ----
-		inputIconLabel.setText("Input + icon");
-		add(inputIconLabel, "cell 0 6");
-
-		//======== panel8 ========
-		{
-			panel8.setBorder(LineBorder.createGrayLineBorder());
-			panel8.setLayout(new BorderLayout());
-
-			//---- inputIconOptionPane ----
-			inputIconOptionPane.setMessageType(JOptionPane.INFORMATION_MESSAGE);
-			inputIconOptionPane.setWantsInput(true);
-			inputIconOptionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
-			inputIconOptionPane.setMessage("Enter something:");
-			panel8.add(inputIconOptionPane, BorderLayout.CENTER);
-		}
-		add(panel8, "cell 1 6");
-
-		//---- inputIconShowDialogLabel ----
-		inputIconShowDialogLabel.setTitleLabel(inputIconLabel);
-		inputIconShowDialogLabel.setOptionPane(inputIconOptionPane);
-		add(inputIconShowDialogLabel, "cell 2 6");
-
-		//---- customLabel ----
-		customLabel.setText("Custom");
-		add(customLabel, "cell 0 7");
-
-		//======== panel6 ========
-		{
-			panel6.setBorder(LineBorder.createGrayLineBorder());
-			panel6.setLayout(new BorderLayout());
-
-			//---- customOptionPane ----
-			customOptionPane.setIcon(UIManager.getIcon("Tree.leafIcon"));
-			panel6.add(customOptionPane, BorderLayout.CENTER);
-		}
-		add(panel6, "cell 1 7");
-
-		//---- customShowDialogLabel ----
-		customShowDialogLabel.setOptionPane(customOptionPane);
-		customShowDialogLabel.setTitleLabel(customLabel);
-		add(customShowDialogLabel, "cell 2 7");
+		setViewportView(panel9);
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents
 	}
 

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.jfd

@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.0.0.194" Java: "11.0.2" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.2" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
@@ -6,240 +6,244 @@ new FormModel {
 		auxiliary() {
 			"JavaCodeGenerator.defaultVariableLocal": true
 		}
-		add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
-			"$layoutConstraints": "flowy,ltr,insets dialog,hidemode 3"
-			"$columnConstraints": "[][][fill]"
-			"$rowConstraints": "[top][top][top][top][top][top][top][top]"
-		} ) {
+		add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
 			name: "this"
-			add( new FormComponent( "javax.swing.JLabel" ) {
-				name: "plainLabel"
-				"text": "Plain"
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 0"
-			} )
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-				name: "panel1"
-				"border": &LineBorder0 new javax.swing.border.LineBorder( sfield java.awt.Color gray, 1, false )
-				add( new FormComponent( "javax.swing.JOptionPane" ) {
-					name: "plainOptionPane"
-					"message": "Hello world."
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
+			"border": new javax.swing.border.EmptyBorder( 0, 0, 0, 0 )
+			add( new FormContainer( "com.formdev.flatlaf.demo.ScrollablePanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
+				"$layoutConstraints": "flowy,ltr,insets dialog,hidemode 3"
+				"$columnConstraints": "[][][fill]"
+				"$rowConstraints": "[top][top][top][top][top][top][top][top]"
+			} ) {
+				name: "panel9"
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "plainLabel"
+					"text": "Plain"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 0"
 				} )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 0"
-			} )
-			add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
-				name: "plainShowDialogLabel"
-				"optionPane": new FormReference( "plainOptionPane" )
-				"titleLabel": new FormReference( "plainLabel" )
-				auxiliary() {
-					"JavaCodeGenerator.variableLocal": false
-				}
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 0"
-			} )
-			add( new FormComponent( "javax.swing.JLabel" ) {
-				name: "errorLabel"
-				"text": "Error"
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 1"
-			} )
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-				name: "panel2"
-				"border": #LineBorder0
-				add( new FormComponent( "javax.swing.JOptionPane" ) {
-					name: "errorOptionPane"
-					"messageType": 0
-					"optionType": 2
-					"message": "Your PC ran into a problem. Buy a new one."
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel1"
+					"border": &LineBorder0 new javax.swing.border.LineBorder( sfield java.awt.Color gray, 1, false )
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "plainOptionPane"
+						"message": "Hello world."
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 0"
 				} )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 1"
-			} )
-			add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
-				name: "errorShowDialogLabel"
-				"titleLabel": new FormReference( "errorLabel" )
-				"optionPane": new FormReference( "errorOptionPane" )
-				auxiliary() {
-					"JavaCodeGenerator.variableLocal": false
-				}
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 1"
-			} )
-			add( new FormComponent( "javax.swing.JLabel" ) {
-				name: "informationLabel"
-				"text": "Information"
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 2"
-			} )
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-				name: "panel3"
-				"border": #LineBorder0
-				add( new FormComponent( "javax.swing.JOptionPane" ) {
-					name: "informationOptionPane"
-					"messageType": 1
-					"optionType": 0
-					"message": "Text with\nmultiple lines\n(use \\n to separate lines)"
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
-				} )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 2"
-			} )
-			add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
-				name: "informationShowDialogLabel"
-				"optionPane": new FormReference( "informationOptionPane" )
-				"titleLabel": new FormReference( "informationLabel" )
-				auxiliary() {
-					"JavaCodeGenerator.variableLocal": false
-				}
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 2"
-			} )
-			add( new FormComponent( "javax.swing.JLabel" ) {
-				name: "questionLabel"
-				"text": "Question"
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 3"
-			} )
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-				name: "panel4"
-				"border": #LineBorder0
-				add( new FormComponent( "javax.swing.JOptionPane" ) {
-					name: "questionOptionPane"
-					"messageType": 3
-					"optionType": 1
-					"message": "Answer the question. What question? Don't know. Just writing useless text to make this longer than 80 characters."
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
-				} )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 3"
-			} )
-			add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
-				name: "questionShowDialogLabel"
-				"optionPane": new FormReference( "questionOptionPane" )
-				"titleLabel": new FormReference( "questionLabel" )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 3"
-			} )
-			add( new FormComponent( "javax.swing.JLabel" ) {
-				name: "warningLabel"
-				"text": "Warning"
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 4"
-			} )
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-				name: "panel5"
-				"border": #LineBorder0
-				add( new FormComponent( "javax.swing.JOptionPane" ) {
-					name: "warningOptionPane"
-					"messageType": 2
-					"optionType": 2
-					"message": "<html>I like <b>bold</b>,<br> and I like <i>italic</i>,<br> and I like to have<br> many lines.<br> Lots of lines."
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
-				} )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 4"
-			} )
-			add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
-				name: "warningShowDialogLabel"
-				"optionPane": new FormReference( "warningOptionPane" )
-				"titleLabel": new FormReference( "warningLabel" )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 4"
-			} )
-			add( new FormComponent( "javax.swing.JLabel" ) {
-				name: "inputLabel"
-				"text": "Input"
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 5"
-			} )
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-				name: "panel7"
-				"border": #LineBorder0
-				add( new FormComponent( "javax.swing.JOptionPane" ) {
-					name: "inputOptionPane"
-					"wantsInput": true
-					"optionType": 2
-					"message": "Enter whatever you want:"
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
-				} )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 5"
-			} )
-			add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
-				name: "inputShowDialogLabel"
-				"optionPane": new FormReference( "inputOptionPane" )
-				"titleLabel": new FormReference( "inputLabel" )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 5"
-			} )
-			add( new FormComponent( "javax.swing.JLabel" ) {
-				name: "inputIconLabel"
-				"text": "Input + icon"
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 6"
-			} )
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-				name: "panel8"
-				"border": #LineBorder0
-				add( new FormComponent( "javax.swing.JOptionPane" ) {
-					name: "inputIconOptionPane"
-					"messageType": 1
-					"wantsInput": true
-					"optionType": 2
-					"message": "Enter something:"
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
-				} )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 6"
-			} )
-			add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
-				name: "inputIconShowDialogLabel"
-				"titleLabel": new FormReference( "inputIconLabel" )
-				"optionPane": new FormReference( "inputIconOptionPane" )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 6"
-			} )
-			add( new FormComponent( "javax.swing.JLabel" ) {
-				name: "customLabel"
-				"text": "Custom"
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 7"
-			} )
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-				name: "panel6"
-				"border": #LineBorder0
-				add( new FormComponent( "javax.swing.JOptionPane" ) {
-					name: "customOptionPane"
-					"icon": new com.jformdesigner.model.SwingIcon( 2, "Tree.leafIcon" )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "plainShowDialogLabel"
+					"optionPane": new FormReference( "plainOptionPane" )
+					"titleLabel": new FormReference( "plainLabel" )
 					auxiliary() {
 						"JavaCodeGenerator.variableLocal": false
 					}
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 0"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "errorLabel"
+					"text": "Error"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 1"
+				} )
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel2"
+					"border": #LineBorder0
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "errorOptionPane"
+						"messageType": 0
+						"optionType": 2
+						"message": "Your PC ran into a problem. Buy a new one."
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 1"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "errorShowDialogLabel"
+					"titleLabel": new FormReference( "errorLabel" )
+					"optionPane": new FormReference( "errorOptionPane" )
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 1"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "informationLabel"
+					"text": "Information"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 2"
+				} )
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel3"
+					"border": #LineBorder0
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "informationOptionPane"
+						"messageType": 1
+						"optionType": 0
+						"message": "Text with\nmultiple lines\n(use \\n to separate lines)"
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 2"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "informationShowDialogLabel"
+					"optionPane": new FormReference( "informationOptionPane" )
+					"titleLabel": new FormReference( "informationLabel" )
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 2"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "questionLabel"
+					"text": "Question"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 3"
+				} )
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel4"
+					"border": #LineBorder0
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "questionOptionPane"
+						"messageType": 3
+						"optionType": 1
+						"message": "Answer the question. What question? Don't know. Just writing useless text to make this longer than 80 characters."
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 3"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "questionShowDialogLabel"
+					"optionPane": new FormReference( "questionOptionPane" )
+					"titleLabel": new FormReference( "questionLabel" )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 3"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "warningLabel"
+					"text": "Warning"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 4"
+				} )
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel5"
+					"border": #LineBorder0
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "warningOptionPane"
+						"messageType": 2
+						"optionType": 2
+						"message": "<html>I like <b>bold</b>,<br> and I like <i>italic</i>,<br> and I like to have<br> many lines.<br> Lots of lines."
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 4"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "warningShowDialogLabel"
+					"optionPane": new FormReference( "warningOptionPane" )
+					"titleLabel": new FormReference( "warningLabel" )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 4"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "inputLabel"
+					"text": "Input"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 5"
+				} )
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel7"
+					"border": #LineBorder0
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "inputOptionPane"
+						"wantsInput": true
+						"optionType": 2
+						"message": "Enter whatever you want:"
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 5"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "inputShowDialogLabel"
+					"optionPane": new FormReference( "inputOptionPane" )
+					"titleLabel": new FormReference( "inputLabel" )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 5"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "inputIconLabel"
+					"text": "Input + icon"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 6"
+				} )
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel8"
+					"border": #LineBorder0
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "inputIconOptionPane"
+						"messageType": 1
+						"wantsInput": true
+						"optionType": 2
+						"message": "Enter something:"
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 6"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "inputIconShowDialogLabel"
+					"titleLabel": new FormReference( "inputIconLabel" )
+					"optionPane": new FormReference( "inputIconOptionPane" )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 6"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "customLabel"
+					"text": "Custom"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 7"
+				} )
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel6"
+					"border": #LineBorder0
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "customOptionPane"
+						"icon": new com.jformdesigner.model.SwingIcon( 2, "Tree.leafIcon" )
+						auxiliary() {
+							"JavaCodeGenerator.variableLocal": false
+						}
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 7"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "customShowDialogLabel"
+					"optionPane": new FormReference( "customOptionPane" )
+					"titleLabel": new FormReference( "customLabel" )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 7"
 				} )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 7"
-			} )
-			add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
-				name: "customShowDialogLabel"
-				"optionPane": new FormReference( "customOptionPane" )
-				"titleLabel": new FormReference( "customLabel" )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 7"
 			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new java.awt.Point( 0, 0 )
-			"size": new java.awt.Dimension( 790, 920 )
+			"size": new java.awt.Dimension( 840, 900 )
 		} )
 	}
 }

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingTest.java

@@ -0,0 +1,472 @@
+/*
+ * Copyright 2020 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.testing;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import javax.swing.*;
+import com.formdev.flatlaf.ui.FlatUIUtils;
+import com.formdev.flatlaf.util.HiDPIUtils;
+import com.formdev.flatlaf.util.UIScale;
+import net.miginfocom.swing.*;
+
+/**
+ * @author Karl Tauber
+ */
+public class FlatPaintingTest
+	extends JScrollPane
+{
+	public static void main( String[] args ) {
+		SwingUtilities.invokeLater( () -> {
+			FlatTestFrame frame = FlatTestFrame.create( args, "FlatPaintingTest" );
+			frame.showFrame( FlatPaintingTest::new );
+		} );
+	}
+
+	FlatPaintingTest() {
+		initComponents();
+	}
+
+	private void initComponents() {
+		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
+		FlatTestPanel flatTestPanel1 = new FlatTestPanel();
+		FlatPaintingTest.BorderPainter borderPainter9 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter1 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter6 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter13 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter17 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter21 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter29 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter10 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter2 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter7 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter14 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter18 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter22 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter28 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter11 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter3 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter5 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter15 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter19 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter23 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter27 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter12 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter4 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter8 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter16 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter20 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter24 = new FlatPaintingTest.BorderPainter();
+		FlatPaintingTest.BorderPainter borderPainter26 = new FlatPaintingTest.BorderPainter();
+		JLabel label1 = new JLabel();
+		JLabel label2 = new JLabel();
+		JLabel label3 = new JLabel();
+		JLabel label4 = new JLabel();
+		JLabel label5 = new JLabel();
+		JLabel label6 = new JLabel();
+		JLabel label7 = new JLabel();
+
+		//======== this ========
+		setBorder(null);
+
+		//======== flatTestPanel1 ========
+		{
+			flatTestPanel1.setLayout(new MigLayout(
+				"ltr,insets dialog,hidemode 3",
+				// columns
+				"[fill]" +
+				"[left]" +
+				"[left]" +
+				"[fill]" +
+				"[fill]" +
+				"[fill]" +
+				"[fill]" +
+				"[fill]",
+				// rows
+				"[top]" +
+				"[top]" +
+				"[top]" +
+				"[top]" +
+				"[]"));
+
+			//---- borderPainter9 ----
+			borderPainter9.setScale(8.0F);
+			borderPainter9.setPaintBorder(false);
+			borderPainter9.setPaintFocus(false);
+			borderPainter9.setFocusWidth(0);
+			flatTestPanel1.add(borderPainter9, "cell 0 0");
+
+			//---- borderPainter1 ----
+			borderPainter1.setScale(8.0F);
+			borderPainter1.setPaintBorder(false);
+			borderPainter1.setPaintFocus(false);
+			flatTestPanel1.add(borderPainter1, "cell 1 0");
+
+			//---- borderPainter6 ----
+			borderPainter6.setScale(8.0F);
+			borderPainter6.setPaintBorder(false);
+			borderPainter6.setPaintFocus(false);
+			borderPainter6.setW(25);
+			borderPainter6.setArc(10);
+			flatTestPanel1.add(borderPainter6, "cell 2 0");
+
+			//---- borderPainter13 ----
+			borderPainter13.setScale(8.0F);
+			borderPainter13.setPaintBorder(false);
+			borderPainter13.setPaintFocus(false);
+			borderPainter13.setW(25);
+			borderPainter13.setArc(20);
+			flatTestPanel1.add(borderPainter13, "cell 3 0");
+
+			//---- borderPainter17 ----
+			borderPainter17.setScale(8.0F);
+			borderPainter17.setPaintBorder(false);
+			borderPainter17.setPaintFocus(false);
+			borderPainter17.setFocusWidth(0);
+			borderPainter17.setArc(0);
+			flatTestPanel1.add(borderPainter17, "cell 4 0");
+
+			//---- borderPainter21 ----
+			borderPainter21.setScale(8.0F);
+			borderPainter21.setPaintBorder(false);
+			borderPainter21.setPaintFocus(false);
+			borderPainter21.setArc(0);
+			flatTestPanel1.add(borderPainter21, "cell 5 0");
+
+			//---- borderPainter29 ----
+			borderPainter29.setScale(8.0F);
+			borderPainter29.setArc(3);
+			borderPainter29.setFocusWidth(1);
+			borderPainter29.setLineWidth(3);
+			flatTestPanel1.add(borderPainter29, "cell 7 0");
+
+			//---- borderPainter10 ----
+			borderPainter10.setScale(8.0F);
+			borderPainter10.setPaintBackground(false);
+			borderPainter10.setPaintFocus(false);
+			borderPainter10.setFocusWidth(0);
+			flatTestPanel1.add(borderPainter10, "cell 0 1");
+
+			//---- borderPainter2 ----
+			borderPainter2.setScale(8.0F);
+			borderPainter2.setPaintBackground(false);
+			borderPainter2.setPaintFocus(false);
+			flatTestPanel1.add(borderPainter2, "cell 1 1");
+
+			//---- borderPainter7 ----
+			borderPainter7.setScale(8.0F);
+			borderPainter7.setPaintBackground(false);
+			borderPainter7.setPaintFocus(false);
+			borderPainter7.setW(25);
+			borderPainter7.setArc(10);
+			flatTestPanel1.add(borderPainter7, "cell 2 1");
+
+			//---- borderPainter14 ----
+			borderPainter14.setScale(8.0F);
+			borderPainter14.setPaintBackground(false);
+			borderPainter14.setPaintFocus(false);
+			borderPainter14.setW(25);
+			borderPainter14.setArc(20);
+			flatTestPanel1.add(borderPainter14, "cell 3 1");
+
+			//---- borderPainter18 ----
+			borderPainter18.setScale(8.0F);
+			borderPainter18.setPaintBackground(false);
+			borderPainter18.setPaintFocus(false);
+			borderPainter18.setFocusWidth(0);
+			borderPainter18.setArc(0);
+			flatTestPanel1.add(borderPainter18, "cell 4 1");
+
+			//---- borderPainter22 ----
+			borderPainter22.setScale(8.0F);
+			borderPainter22.setPaintBackground(false);
+			borderPainter22.setPaintFocus(false);
+			borderPainter22.setArc(0);
+			flatTestPanel1.add(borderPainter22, "cell 5 1");
+
+			//---- borderPainter28 ----
+			borderPainter28.setScale(8.0F);
+			borderPainter28.setArc(2);
+			borderPainter28.setFocusWidth(1);
+			borderPainter28.setLineWidth(3);
+			flatTestPanel1.add(borderPainter28, "cell 7 1");
+
+			//---- borderPainter11 ----
+			borderPainter11.setScale(8.0F);
+			borderPainter11.setPaintBorder(false);
+			borderPainter11.setPaintBackground(false);
+			borderPainter11.setFocusWidth(0);
+			flatTestPanel1.add(borderPainter11, "cell 0 2");
+
+			//---- borderPainter3 ----
+			borderPainter3.setScale(8.0F);
+			borderPainter3.setPaintBorder(false);
+			borderPainter3.setPaintBackground(false);
+			flatTestPanel1.add(borderPainter3, "cell 1 2");
+
+			//---- borderPainter5 ----
+			borderPainter5.setScale(8.0F);
+			borderPainter5.setPaintBorder(false);
+			borderPainter5.setPaintBackground(false);
+			borderPainter5.setArc(10);
+			borderPainter5.setW(25);
+			flatTestPanel1.add(borderPainter5, "cell 2 2");
+
+			//---- borderPainter15 ----
+			borderPainter15.setScale(8.0F);
+			borderPainter15.setPaintBorder(false);
+			borderPainter15.setPaintBackground(false);
+			borderPainter15.setArc(20);
+			borderPainter15.setW(25);
+			flatTestPanel1.add(borderPainter15, "cell 3 2");
+
+			//---- borderPainter19 ----
+			borderPainter19.setScale(8.0F);
+			borderPainter19.setPaintBorder(false);
+			borderPainter19.setPaintBackground(false);
+			borderPainter19.setFocusWidth(0);
+			borderPainter19.setArc(0);
+			flatTestPanel1.add(borderPainter19, "cell 4 2");
+
+			//---- borderPainter23 ----
+			borderPainter23.setScale(8.0F);
+			borderPainter23.setPaintBorder(false);
+			borderPainter23.setPaintBackground(false);
+			borderPainter23.setArc(0);
+			flatTestPanel1.add(borderPainter23, "cell 5 2");
+
+			//---- borderPainter27 ----
+			borderPainter27.setScale(8.0F);
+			borderPainter27.setArc(1);
+			borderPainter27.setFocusWidth(1);
+			borderPainter27.setLineWidth(3);
+			flatTestPanel1.add(borderPainter27, "cell 7 2");
+
+			//---- borderPainter12 ----
+			borderPainter12.setScale(8.0F);
+			borderPainter12.setFocusWidth(0);
+			flatTestPanel1.add(borderPainter12, "cell 0 3");
+
+			//---- borderPainter4 ----
+			borderPainter4.setScale(8.0F);
+			flatTestPanel1.add(borderPainter4, "cell 1 3");
+
+			//---- borderPainter8 ----
+			borderPainter8.setScale(8.0F);
+			borderPainter8.setW(25);
+			borderPainter8.setArc(10);
+			flatTestPanel1.add(borderPainter8, "cell 2 3");
+
+			//---- borderPainter16 ----
+			borderPainter16.setScale(8.0F);
+			borderPainter16.setW(25);
+			borderPainter16.setArc(20);
+			flatTestPanel1.add(borderPainter16, "cell 3 3");
+
+			//---- borderPainter20 ----
+			borderPainter20.setScale(8.0F);
+			borderPainter20.setFocusWidth(0);
+			borderPainter20.setArc(0);
+			flatTestPanel1.add(borderPainter20, "cell 4 3");
+
+			//---- borderPainter24 ----
+			borderPainter24.setScale(8.0F);
+			borderPainter24.setArc(0);
+			flatTestPanel1.add(borderPainter24, "cell 5 3");
+
+			//---- borderPainter26 ----
+			borderPainter26.setScale(8.0F);
+			borderPainter26.setArc(0);
+			borderPainter26.setFocusWidth(1);
+			borderPainter26.setLineWidth(3);
+			flatTestPanel1.add(borderPainter26, "cell 7 3");
+
+			//---- label1 ----
+			label1.setText("fw 0,  lw 1,  arc 6");
+			flatTestPanel1.add(label1, "cell 0 4");
+
+			//---- label2 ----
+			label2.setText("fw 2,  lw 1,  arc 6");
+			flatTestPanel1.add(label2, "cell 1 4");
+
+			//---- label3 ----
+			label3.setText("fw 2,  lw 1,  arc 10");
+			flatTestPanel1.add(label3, "cell 2 4");
+
+			//---- label4 ----
+			label4.setText("fw 2,  lw 1,  arc 20");
+			flatTestPanel1.add(label4, "cell 3 4");
+
+			//---- label5 ----
+			label5.setText("fw 0,  lw 1,  arc 0");
+			flatTestPanel1.add(label5, "cell 4 4");
+
+			//---- label6 ----
+			label6.setText("fw 2,  lw 1,  arc 0");
+			flatTestPanel1.add(label6, "cell 5 4");
+
+			//---- label7 ----
+			label7.setText("fw 1,  lw 3,  arc 3,2,1,0");
+			flatTestPanel1.add(label7, "cell 7 4");
+		}
+		setViewportView(flatTestPanel1);
+		// JFormDesigner - End of component initialization  //GEN-END:initComponents
+	}
+
+	// JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
+	// JFormDesigner - End of variables declaration  //GEN-END:variables
+
+	//---- class Preview ----
+
+	public static class BorderPainter
+		extends JComponent
+	{
+		private int w = 20;
+		private int h = 20;
+		private int focusWidth = 2;
+		private int lineWidth = 1;
+		private int arc = 6;
+		private float scale = 1;
+		private boolean paintBackground = true;
+		private boolean paintBorder = true;
+		private boolean paintFocus = true;
+
+		public BorderPainter() {
+		}
+
+		public int getW() {
+			return w;
+		}
+
+		public void setW( int w ) {
+			this.w = w;
+		}
+
+		public int getH() {
+			return h;
+		}
+
+		public void setH( int h ) {
+			this.h = h;
+		}
+
+		public int getFocusWidth() {
+			return focusWidth;
+		}
+
+		public void setFocusWidth( int focusWidth ) {
+			this.focusWidth = focusWidth;
+		}
+
+		public int getLineWidth() {
+			return lineWidth;
+		}
+
+		public void setLineWidth( int lineWidth ) {
+			this.lineWidth = lineWidth;
+		}
+
+		public int getArc() {
+			return arc;
+		}
+
+		public void setArc( int arc ) {
+			this.arc = arc;
+		}
+
+		public float getScale() {
+			return scale;
+		}
+
+		public void setScale( float scale ) {
+			this.scale = scale;
+		}
+
+		public boolean isPaintBackground() {
+			return paintBackground;
+		}
+
+		public void setPaintBackground( boolean paintBackground ) {
+			this.paintBackground = paintBackground;
+		}
+
+		public boolean isPaintBorder() {
+			return paintBorder;
+		}
+
+		public void setPaintBorder( boolean paintBorder ) {
+			this.paintBorder = paintBorder;
+		}
+
+		public boolean isPaintFocus() {
+			return paintFocus;
+		}
+
+		public void setPaintFocus( boolean paintFocus ) {
+			this.paintFocus = paintFocus;
+		}
+
+		@Override
+		public Dimension getPreferredSize() {
+			return UIScale.scale( new Dimension( (int) ((w + 2) * scale), (int) ((h + 2) * scale) ) );
+		}
+
+		@Override
+		public Dimension getMinimumSize() {
+			return getPreferredSize();
+		}
+
+		@Override
+		protected void paintComponent( Graphics g ) {
+			Graphics2D g2 = (Graphics2D) g;
+			FlatUIUtils.setRenderingHints( g2 );
+
+			g2.scale( scale, scale );
+			g2.translate( 1, 1 );
+
+			int width = UIScale.scale( w );
+			int height = UIScale.scale( h );
+			float focusWidth = UIScale.scale( (float) this.focusWidth );
+			float lineWidth = UIScale.scale( (float) this.lineWidth );
+			float arc = UIScale.scale( (float) this.arc );
+
+			if( paintBackground ) {
+				g.setColor( Color.green );
+				FlatUIUtils.paintComponentBackground( g2, 0, 0, width, height, focusWidth, arc );
+			}
+
+			if( paintFocus ) {
+				g.setColor( Color.blue );
+				FlatUIUtils.paintComponentOuterBorder( g2, 0, 0, width, height, focusWidth, lineWidth, arc );
+			}
+
+			if( paintBorder ) {
+				g.setColor( Color.red );
+				FlatUIUtils.paintComponentBorder( g2, 0, 0, width, height, focusWidth, lineWidth, arc );
+			}
+
+			HiDPIUtils.paintAtScale1x( g2, 0, 0, width, height,
+				(g2d, x2, y2, width2, height2, scaleFactor) -> {
+					int gap = 3;
+					g2d.setColor( Color.magenta );
+					g2d.drawRect( x2 - gap, y2 - gap, width2 + (gap * 2) - 1, height2 + (gap * 2) - 1 );
+				} );
+		}
+	}
+}

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingTest.jfd

@@ -0,0 +1,314 @@
+JFDML JFormDesigner: "7.0.0.0.194" Java: "13.0.1" encoding: "UTF-8"
+
+new FormModel {
+	contentType: "form/swing"
+	root: new FormRoot {
+		auxiliary() {
+			"JavaCodeGenerator.defaultVariableLocal": true
+		}
+		add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
+			name: "this"
+			"border": sfield com.jformdesigner.model.FormObject NULL_VALUE
+			add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
+				"$layoutConstraints": "ltr,insets dialog,hidemode 3"
+				"$columnConstraints": "[fill][left][left][fill][fill][fill][fill][fill]"
+				"$rowConstraints": "[top][top][top][top][]"
+			} ) {
+				name: "flatTestPanel1"
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter9"
+					"scale": 8.0f
+					"paintBorder": false
+					"paintFocus": false
+					"focusWidth": 0
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 0"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter1"
+					"scale": 8.0f
+					"paintBorder": false
+					"paintFocus": false
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 0"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter6"
+					"scale": 8.0f
+					"paintBorder": false
+					"paintFocus": false
+					"w": 25
+					"arc": 10
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 0"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter13"
+					"scale": 8.0f
+					"paintBorder": false
+					"paintFocus": false
+					"w": 25
+					"arc": 20
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 3 0"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter17"
+					"scale": 8.0f
+					"paintBorder": false
+					"paintFocus": false
+					"focusWidth": 0
+					"arc": 0
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 4 0"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter21"
+					"scale": 8.0f
+					"paintBorder": false
+					"paintFocus": false
+					"arc": 0
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 5 0"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter29"
+					"scale": 8.0f
+					"arc": 3
+					"focusWidth": 1
+					"lineWidth": 3
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 7 0"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter10"
+					"scale": 8.0f
+					"paintBackground": false
+					"paintFocus": false
+					"focusWidth": 0
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 1"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter2"
+					"scale": 8.0f
+					"paintBackground": false
+					"paintFocus": false
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 1"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter7"
+					"scale": 8.0f
+					"paintBackground": false
+					"paintFocus": false
+					"w": 25
+					"arc": 10
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 1"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter14"
+					"scale": 8.0f
+					"paintBackground": false
+					"paintFocus": false
+					"w": 25
+					"arc": 20
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 3 1"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter18"
+					"scale": 8.0f
+					"paintBackground": false
+					"paintFocus": false
+					"focusWidth": 0
+					"arc": 0
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 4 1"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter22"
+					"scale": 8.0f
+					"paintBackground": false
+					"paintFocus": false
+					"arc": 0
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 5 1"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter28"
+					"scale": 8.0f
+					"arc": 2
+					"focusWidth": 1
+					"lineWidth": 3
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 7 1"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter11"
+					"scale": 8.0f
+					"paintBorder": false
+					"paintBackground": false
+					"focusWidth": 0
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 2"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter3"
+					"scale": 8.0f
+					"paintBorder": false
+					"paintBackground": false
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 2"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter5"
+					"scale": 8.0f
+					"paintBorder": false
+					"paintBackground": false
+					"arc": 10
+					"w": 25
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 2"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter15"
+					"scale": 8.0f
+					"paintBorder": false
+					"paintBackground": false
+					"arc": 20
+					"w": 25
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 3 2"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter19"
+					"scale": 8.0f
+					"paintBorder": false
+					"paintBackground": false
+					"focusWidth": 0
+					"arc": 0
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 4 2"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter23"
+					"scale": 8.0f
+					"paintBorder": false
+					"paintBackground": false
+					"arc": 0
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 5 2"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter27"
+					"scale": 8.0f
+					"arc": 1
+					"focusWidth": 1
+					"lineWidth": 3
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 7 2"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter12"
+					"scale": 8.0f
+					"focusWidth": 0
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 3"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter4"
+					"scale": 8.0f
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 3"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter8"
+					"scale": 8.0f
+					"w": 25
+					"arc": 10
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 3"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter16"
+					"scale": 8.0f
+					"w": 25
+					"arc": 20
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 3 3"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter20"
+					"scale": 8.0f
+					"focusWidth": 0
+					"arc": 0
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 4 3"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter24"
+					"scale": 8.0f
+					"arc": 0
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 5 3"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatPaintingTest$BorderPainter" ) {
+					name: "borderPainter26"
+					"scale": 8.0f
+					"arc": 0
+					"focusWidth": 1
+					"lineWidth": 3
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 7 3"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label1"
+					"text": "fw 0,  lw 1,  arc 6"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 4"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label2"
+					"text": "fw 2,  lw 1,  arc 6"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 4"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label3"
+					"text": "fw 2,  lw 1,  arc 10"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 4"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label4"
+					"text": "fw 2,  lw 1,  arc 20"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 3 4"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label5"
+					"text": "fw 0,  lw 1,  arc 0"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 4 4"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label6"
+					"text": "fw 2,  lw 1,  arc 0"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 5 4"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label7"
+					"text": "fw 1,  lw 3,  arc 3,2,1,0"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 7 4"
+				} )
+			} )
+		}, new FormLayoutConstraints( null ) {
+			"location": new java.awt.Point( 0, 0 )
+			"size": new java.awt.Dimension( 1435, 880 )
+		} )
+	}
+}

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java

@@ -130,7 +130,7 @@ public class FlatTestFrame
 		}
 
 		String looksWindowsClassName = "com.jgoodies.looks.windows.WindowsLookAndFeel";
-		if( isClassAvailable( looksWindowsClassName ) ) {
+		if( SystemInfo.IS_WINDOWS && isClassAvailable( looksWindowsClassName ) ) {
 			lafModel.addElement( new LookAndFeelInfo( "JGoodies Looks Windows (F7)", looksWindowsClassName ) );
 			registerSwitchToLookAndFeel( KeyEvent.VK_F7, looksWindowsClassName );
 		}
@@ -142,6 +142,8 @@ public class FlatTestFrame
 		if( scaleFactor != null )
 			scaleFactorComboBox.setSelectedItem( scaleFactor );
 
+		updateSizeVariantComboBox();
+
 		// register F1, F2, ... keys to switch to Light, Dark or other LaFs
 		registerSwitchToLookAndFeel( KeyEvent.VK_F1, FlatLightLaf.class.getName() );
 		registerSwitchToLookAndFeel( KeyEvent.VK_F2, FlatDarkLaf.class.getName() );
@@ -198,11 +200,19 @@ public class FlatTestFrame
 					// enable/disable scale factor combobox
 					updateScaleFactorComboBox();
 
+					// show/hide size variant combobox
+					updateSizeVariantComboBox();
+
 					// this is necessary because embedded JOptionPane's "steal" the default button
 					getRootPane().setDefaultButton( closeButton );
 				} );
 			}
 		} );
+
+		UIScale.addPropertyChangeListener( e -> {
+			// update title because user scale factor may change
+			updateTitle();
+		} );
 	}
 
 	private void updateTitle() {
@@ -229,9 +239,9 @@ public class FlatTestFrame
 
 	private boolean isClassAvailable( String className ) {
 		try {
-			Class.forName( className );
+			Class.forName( className, false, getClass().getClassLoader() );
 			return true;
-		} catch( ClassNotFoundException ex ) {
+		} catch( Throwable ex ) {
 			return false;
 		}
 	}
@@ -398,13 +408,30 @@ public class FlatTestFrame
 	}
 
 	private void updateScaleFactorComboBox() {
-		scaleFactorComboBox.setEnabled( !UIScale.isSystemScalingEnabled() && UIManager.getLookAndFeel() instanceof FlatLaf );
+		scaleFactorComboBox.setEnabled( UIManager.getLookAndFeel() instanceof FlatLaf );
+	}
+
+	private void sizeVariantChanged() {
+		String sel = (String) sizeVariantComboBox.getSelectedItem();
+		String sizeVariant = "default".equals( sel ) ? null : sel;
+
+		updateComponentsRecur( content, (c, type) -> {
+			if( c instanceof JComponent )
+				((JComponent)c).putClientProperty( "JComponent.sizeVariant", sizeVariant );
+		} );
+	}
+
+	private void updateSizeVariantComboBox() {
+		LookAndFeel lookAndFeel = UIManager.getLookAndFeel();
+		boolean visible = lookAndFeel instanceof NimbusLookAndFeel ||
+			"com.apple.laf.AquaLookAndFeel".equals( lookAndFeel.getClass().getName() );
+		sizeVariantComboBox.setVisible( visible );
 	}
 
 	private void updateComponentsRecur( Container container, BiConsumer<Component, String> action ) {
 		for( Component c : container.getComponents() ) {
-			if( c instanceof JPanel ) {
-				updateComponentsRecur( (JPanel) c, action );
+			if( c instanceof JPanel || c instanceof JDesktopPane ) {
+				updateComponentsRecur( (Container) c, action );
 				continue;
 			}
 
@@ -471,6 +498,7 @@ public class FlatTestFrame
 		explicitColorsCheckBox = new JCheckBox();
 		backgroundCheckBox = new JCheckBox();
 		opaqueTriStateCheckBox = new TriStateCheckBox();
+		sizeVariantComboBox = new JComboBox<>();
 		closeButton = new JButton();
 		themesPanel = new IJThemesPanel();
 
@@ -508,6 +536,7 @@ public class FlatTestFrame
 					"[fill]" +
 					"[fill]" +
 					"[fill]" +
+					"[fill]" +
 					"[grow,fill]" +
 					"[button,fill]",
 					// rows
@@ -573,9 +602,20 @@ public class FlatTestFrame
 				opaqueTriStateCheckBox.addActionListener(e -> opaqueChanged());
 				buttonBar.add(opaqueTriStateCheckBox, "cell 7 0");
 
+				//---- sizeVariantComboBox ----
+				sizeVariantComboBox.setModel(new DefaultComboBoxModel<>(new String[] {
+					"mini",
+					"small",
+					"default",
+					"large"
+				}));
+				sizeVariantComboBox.setSelectedIndex(2);
+				sizeVariantComboBox.addActionListener(e -> sizeVariantChanged());
+				buttonBar.add(sizeVariantComboBox, "cell 8 0");
+
 				//---- closeButton ----
 				closeButton.setText("Close");
-				buttonBar.add(closeButton, "cell 9 0");
+				buttonBar.add(closeButton, "cell 10 0");
 			}
 			dialogPane.add(buttonBar, BorderLayout.SOUTH);
 			dialogPane.add(themesPanel, BorderLayout.EAST);
@@ -596,6 +636,7 @@ public class FlatTestFrame
 	private JCheckBox explicitColorsCheckBox;
 	private JCheckBox backgroundCheckBox;
 	private TriStateCheckBox opaqueTriStateCheckBox;
+	private JComboBox<String> sizeVariantComboBox;
 	private JButton closeButton;
 	private IJThemesPanel themesPanel;
 	// JFormDesigner - End of variables declaration  //GEN-END:variables

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.jfd

@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.0.0.194" Java: "13.0.1" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.2" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
@@ -21,7 +21,7 @@ new FormModel {
 				} )
 				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 					"$layoutConstraints": "insets dialog"
-					"$columnConstraints": "[fill][fill][fill][fill][fill][fill][fill][fill][grow,fill][button,fill]"
+					"$columnConstraints": "[fill][fill][fill][fill][fill][fill][fill][fill][fill][grow,fill][button,fill]"
 					"$rowSpecs": "[fill]"
 				} ) {
 					name: "buttonBar"
@@ -105,11 +105,25 @@ new FormModel {
 					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 						"value": "cell 7 0"
 					} )
+					add( new FormComponent( "javax.swing.JComboBox" ) {
+						name: "sizeVariantComboBox"
+						"model": new javax.swing.DefaultComboBoxModel {
+							selectedItem: "mini"
+							addElement( "mini" )
+							addElement( "small" )
+							addElement( "default" )
+							addElement( "large" )
+						}
+						"selectedIndex": 2
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "sizeVariantChanged", false ) )
+					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+						"value": "cell 8 0"
+					} )
 					add( new FormComponent( "javax.swing.JButton" ) {
 						name: "closeButton"
 						"text": "Close"
 					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-						"value": "cell 9 0"
+						"value": "cell 10 0"
 					} )
 				}, new FormLayoutConstraints( class java.lang.String ) {
 					"value": "South"