release 1.0-rc2

- default button: white background and wide border
- focused button: light blue background and thin border

(the light blue default button did not look beautiful IMHO)

.github/workflows/ci.yml

@@ -0,0 +1,142 @@
+# https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: CI
+
+on:
+  push:
+    branches:
+      - '*'
+    tags:
+      - '[0-9]*'
+  pull_request:
+    branches: 
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        # test against
+        # - Java 1.8 (minimum requirement)
+        # - Java 9 (first version with JPMS)
+        # - Java LTS versions (11, 17, ...)
+        # - lastest Java version(s)
+        java:
+          - 1.8
+          - 9
+          - 11  # LTS
+          - 14
+          - 15
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup Java ${{ matrix.java }}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+
+      - name: Cache Gradle wrapper
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: Cache Gradle cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
+          restore-keys: ${{ runner.os }}-gradle
+
+      - name: Build with Gradle
+        run: ./gradlew build
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        if: matrix.java == '11'
+        with:
+          name: FlatLaf-build-artifacts
+          path: |
+            flatlaf-core/build/libs
+            flatlaf-demo/build/libs
+            flatlaf-extras/build/libs
+            flatlaf-intellij-themes/build/libs
+            flatlaf-jide-oss/build/libs
+            flatlaf-swingx/build/libs
+            !**/*-javadoc.jar
+            !**/*-sources.jar
+
+
+  snapshot:
+    runs-on: ubuntu-latest
+    needs: build
+    if: |
+      github.event_name == 'push' &&
+      github.ref == 'refs/heads/master' &&
+      github.repository == 'JFormDesigner/FlatLaf'
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup Java 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+
+      - name: Cache Gradle wrapper
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: Cache Gradle cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
+          restore-keys: ${{ runner.os }}-gradle
+
+      - name: Publish snapshot to oss.jfrog.org
+        run: ./gradlew artifactoryPublish
+        env:
+          BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
+          BINTRAY_KEY:  ${{ secrets.BINTRAY_KEY }}
+
+
+  release:
+    runs-on: ubuntu-latest
+    needs: build
+    if: |
+      github.event_name == 'push' &&
+      startsWith( github.ref, 'refs/tags/' ) &&
+      github.repository == 'JFormDesigner/FlatLaf'
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup Java 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+
+      - name: Cache Gradle wrapper
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: Cache Gradle cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
+          restore-keys: ${{ runner.os }}-gradle
+
+      - name: Release a new stable version to bintray
+        run: ./gradlew bintrayUpload -Drelease=true
+        env:
+          BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
+          BINTRAY_KEY:  ${{ secrets.BINTRAY_KEY }}

.travis.yml

@@ -1,40 +0,0 @@
-language: java
-sudo: false
-
-jdk:
-  - openjdk8
-  - openjdk9
-  - openjdk11
-  - openjdk14
-  - openjdk15
-
-before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-
-before_install:
-  - ./gradlew --version
-  - java -version
-
-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,231 @@
 FlatLaf Change Log
 ==================
 
+## 1.0-rc2
+
+#### New features and improvements
+
+- Button:
+  - In "Flat Light" theme, use a slightly thinner border for focused buttons
+    (because they already have light blue background).
+  - In "Flat Dark" theme, use slightly wider border for focused buttons.
+- CheckBox and RadioButton: In "Flat Dark" theme, use blueish background for
+  focused components.
+- Tree: Support disabling wide selection per component. (set client property
+  `JTree.wideSelection` to `false`). (PR #245)
+- Tree: Support disabling selection painting per component. Then the tree cell
+  renderer is responsible for selection painting. (set client property
+  `JTree.paintSelection` to `false`).
+- JIDE Common Layer: Support `JidePopupMenu`.
+
+#### Fixed bugs
+
+- Button: Fixed behavior of <kbd>Enter</kbd> key on focused button on Windows
+  and Linux, which now clicks the focused button (instead of the default
+  button).
+  - On Windows, this is a regression in 1.0-rc1.
+  - On macOS, the <kbd>Enter</kbd> key always clicks the default button, which
+    is the platform behavior.
+  - On all platforms, the default button can be always clicked with
+    <kbd>Ctrl+Enter</kbd> keys, even if another button is focused.
+- CheckBox and RadioButton: Fill component background as soon as background
+  color is different to default background color, even if component is not
+  opaque (which is the default). This paints selection if using the component as
+  cell renderer a Table, Tree or List.
+- TextComponents: Border of focused non-editable text components had wrong
+  color.
+- Custom window decorations: Fixed top window border in dark themes when running
+  in JetBrains Runtime.
+
+
+## 1.0-rc1
+
+#### New features and improvements
+
+- Button: Disabled `Button.defaultButtonFollowsFocus` on Windows (as on other
+  platforms). If you like to keep the old behavior in your application, use:
+  `if(SystemInfo.isWindows)
+  UIManager.put("Button.defaultButtonFollowsFocus",true);`.
+- ComboBox, Spinner and SplitPaneDivider: Added pressed feedback to arrow
+  buttons.
+- Slider: Support per component custom thumb and track colors via
+  `JSlider.setForeground(Color)` and `JSlider.setBackground(Color)`.
+- Slider: Improved thumb hover and pressed colors.
+- TextComponent: Clip placeholder text if it does not fit into visible area. (PR
+  #229)
+- macOS: Improved font rendering on macOS when using JetBrains Runtime. (PRs
+  #237, #239 and #241)
+- Extras: UI defaults inspector:
+  - Support embedding UI defaults inspector panel into any window. See
+    `FlatUIDefaultsInspector.createInspectorPanel()`.
+  - Copy selected keys and values into clipboard via context menu.
+  - Support wildcard matching in filter (`*` matches any number of characters,
+    `?` matches a single character, `^` beginning of line, `$` end of line).
+- IntelliJ Themes:
+  - Added hover and pressed feedback to Button, CheckBox, RadioButton and
+    ToggleButton. (issue #176)
+  - Added "Material Theme UI Lite / Moonlight" theme.
+  - Updated "Dracula", "Gradianto" and "Material Theme UI Lite" themes.
+
+#### Fixed bugs
+
+- Button and ToggleButton: Threat Unicode surrogate character pair as single
+  character and make button square. (issue #234)
+- Button and ToggleButton: ToolBar buttons now respect explicitly set background
+  color. If no background color is set, then the button background is not
+  painted anymore. (issue #191)
+- ToggleButton: Tab style buttons (client property `JButton.buttonType` is
+  `tab`) now respect explicitly set background color.
+- TabbedPane: Fixed `IndexOutOfBoundsException` when using tooltip text on close
+  buttons and closing last/rightmost tab. (issue #235)
+- TabbedPane: Fixed scrolling tabs with touchpads and high-resolution mouse
+  wheels.
+- Extras: Added missing export of package
+  `com.formdev.flatlaf.extras.components` to Java 9 module descriptor.
+- JIDE Common Layer:
+  - Invoke `LookAndFeelFactory.installJideExtension()` when using FlatLaf UI
+    delegates. (issue #230)
+  - RangeSlider: Fixed slider focused colors in IntelliJ themes.
+- IntelliJ Themes:
+  - Fixed menu item check colors.
+  - Fixed `MenuItem.underlineSelectionColor`.
+  - Fixed List, Tree and Table `selectionInactiveForeground` in light Arc
+    themes.
+  - Fixed List and Table background colors in Material UI Lite themes.
+  - Fixed menu accelerator colors in Monocai theme. (issue #243)
+
+
+## 0.46
+
+#### New features and improvements
+
+- Slider and JIDE RangeSlider: Clicking on track now immediately moves the thumb
+  to mouse location and starts dragging the thumb. Use `UIManager.put(
+  "Slider.scrollOnTrackClick", true )` to enable old behavior that scrolls the
+  thumb when clicking on track.
+- Slider: Snap to ticks is now done while dragging the thumb. Use
+  `UIManager.put( "Slider.snapToTicksOnReleased", true )` to enable old behavior
+  that snaps to ticks on mouse released.
+- Extras: Added standard component extension classes that provides easy access
+  to FlatLaf specific client properties (see package
+  `com.formdev.flatlaf.extras.components`).
+- Extras: Renamed tri-state check box class from
+  `com.formdev.flatlaf.extras.TriStateCheckBox` to
+  `com.formdev.flatlaf.extras.components.FlatTriStateCheckBox`. Also
+  changed/improved API and added javadoc.
+- Extras: Renamed SVG utility class from `com.formdev.flatlaf.extras.SVGUtils`
+  to `com.formdev.flatlaf.extras.FlatSVGUtils`.
+- IntelliJ Themes: Added flag whether a theme is dark to
+  `FlatAllIJThemes.INFOS`. (issue #221)
+- JIDE Common Layer: Support `TristateCheckBox`.
+
+
+#### Fixed bugs
+
+- Slider: Fixed painting of colored track if `JSlider.inverted` is `true`.
+- Table and TableHeader: Fixed missing right vertical grid line if using table
+  as row header in scroll pane. (issues #152 and #46)
+- TableHeader: Fixed position of column separators in right-to-left component
+  orientation.
+- ToolTip: Fixed drop shadow for wide tooltips on Windows and Java 9+. (issue
+  #224)
+- SwingX: Fixed striping background highlighting color (e.g. alternating table
+  rows) in dark themes.
+- Fixed: If text antialiasing is disabled (in OS system settings or via
+  `-Dawt.useSystemAAFontSettings=off`), then some components still did use
+  antialiasing to render text (not-editable ComboBox, ProgressBar, Slider,
+  TabbedPane and multiline ToolTip). (issue #227)
+
+
+## 0.45
+
+#### New features and improvements
+
+- Slider: New design, added hover and pressed feedback and improved customizing.
+  (PR #214)
+- JIDE Common Layer: Support `RangeSlider`. (PR #209)
+- IntelliJ Themes:
+  - Added "Gradianto Nature Green" theme.
+  - Updated "Arc Dark", "Cyan", "Dark purple", "Gradianto", "Gray", "Gruvbox"
+    and "One Dark" themes.
+- TabbedPane: Support hiding tab area if it contains only one tab. (set client
+  property `JTabbedPane.hideTabAreaWithOneTab` to `true`)
+- MenuBar: Support different underline menu selection style UI defaults for
+  `MenuBar` and `MenuItem`. (PR #217; issue #216)
+
+
+#### Fixed bugs
+
+- Table: Do not paint last vertical grid line if auto-resize mode is not off.
+  (issue #46)
+- Table: Fixed unstable grid line thickness when scaled on HiDPI screens. (issue
+  #152)
+- TabbedPane: No longer add (internal) tab close button component as child to
+  `JTabbedPane`. (issue #219)
+- Custom window decorations: Title bar was not hidden if window is in
+  full-screen mode. (issue #212)
+
+
+## 0.44
+
+#### New features and improvements
+
+- TabbedPane: In scroll tab layout, added "Show Hidden Tabs" button to trailing
+  side of tab area. If pressed, it shows a popup menu that contains (partly)
+  hidden tabs and selecting one activates that tab. (PR #190; issue #40)
+- TabbedPane: Support forward/backward scroll arrow buttons on both sides of tab
+  area. Backward button on left side, forward button on right side. Not
+  applicable scroll buttons are hidden. (PR #211; issue #40)
+- TabbedPane: Support specifying default tab layout policy for all tabbed panes
+  in the application via UI value `TabbedPane.tabLayoutPolicy`. E.g. invoke
+  `UIManager.put( "TabbedPane.tabLayoutPolicy", "scroll" );` to use scroll
+  layout.
+- TabbedPane: Support tab scrolling with mouse wheel (in scroll tab layout). (PR
+  #187; issue #40)
+- TabbedPane: Repeat scrolling as long as scroll arrow buttons are pressed. (PR
+  #187; issue #40)
+- TabbedPane: Support adding custom components to left and right sides of tab
+  area. (set client property `JTabbedPane.leadingComponent` or
+  `JTabbedPane.trailingComponent` to a `java.awt.Component`) (PR #192; issue
+  #40)
+- TabbedPane: Support closable tabs. (PR #193; issues #31 and #40)
+- TabbedPane: Support minimum or maximum tab widths. (set client property
+  `JTabbedPane.minimumTabWidth` or `JTabbedPane.maximumTabWidth` to an integer)
+  (PR #199)
+- TabbedPane: Support alignment of tab area. (set client property
+  `JTabbedPane.tabAreaAlignment` to `"leading"`, `"trailing"`, `"center"` or
+  `"fill"`) (PR #199)
+- TabbedPane: Support horizontal alignment of tab title and icon. (set client
+  property `JTabbedPane.tabAlignment` to `SwingConstants.LEADING`,
+  `SwingConstants.TRAILING` or `SwingConstants.CENTER`)
+- TabbedPane: Support equal and compact tab width modes. (set client property
+  `JTabbedPane.tabWidthMode` to `"preferred"`, `"equal"` or `"compact"`) (PR
+  #199)
+- TabbedPane: Support left, right, top and bottom tab icon placement. (set
+  client property `JTabbedPane.tabIconPlacement` to `SwingConstants.LEADING`,
+  `SwingConstants.TRAILING`, `SwingConstants.TOP` or `SwingConstants.BOTTOM`)
+  (PR #199)
+- Support painting separator line between window title and content (use UI value
+  `TitlePane.borderColor`). (issue #184)
+- Extras: `FlatSVGIcon` now allows specifying icon width and height in
+  constructors. (issue #196)
+- SplitPane: Hide not applicable expand/collapse buttons. Added tooltips to
+  expand/collapse buttons. (issue #198)
+- SplitPane: Added grip to divider. Can be disabled with `UIManager.put(
+  "SplitPaneDivider.style", "plain" )`. (issue #179)
+
+
+#### Fixed bugs
+
+- Custom window decorations: Not visible menu bar is now ignored in layout.
+- Popups using `JToolTip` components did not respect their location. (issue
+  #188; regression in 0.42 in fix for #164)
+- IntelliJ Themes: Added suffix "(Material)" to names of all Material UI Lite
+  themes to avoid duplicate theme names. (issue #201)
+- Extras: `FlatSVGIcon` icons were not painted in disabled labels and disabled
+  tabs. (issue #205)
+
+
 ## 0.43
 
 #### New features and improvements

README.md

@@ -73,40 +73,11 @@ Addons
 - [JIDE Common Layer](flatlaf-jide-oss)
 
 
-Projects using FlatLaf
-----------------------
+Documentation
+-------------
 
-- [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)
-- ![New](images/new.svg) [jAlbum](https://jalbum.net/) 21 (commercial)
-- [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.2
-- [lsfusion platform](https://github.com/lsfusion/platform)
-- [Jes - Die Java-E<>R](https://www.jes-eur.de)
-- [Mapton](https://mapton.org/) 2.0
-  ([source code](https://github.com/trixon/mapton)) based on NetBeans platform
-- [Pseudo Assembler IDE](https://github.com/tomasz-herman/PseudoAssemblerIDE)
-- [Sound Analysis](https://github.com/tomasz-herman/SoundAnalysis)
-- [RemoteLight](https://github.com/Drumber/RemoteLight) - Multifunctional LED
-  Control Software
-- and more...
+For more information and documentation visit
+[FlatLaf Home](https://www.formdev.com/flatlaf/)
 
 
 Buzz
@@ -116,8 +87,77 @@ Buzz
 - [FlatLaf announcement on Reddit](https://www.reddit.com/r/java/comments/dl0hu3/flatlaf_flat_look_and_feel/)
 
 
-Documentation
--------------
+Projects using FlatLaf
+----------------------
 
-For more information and documentation visit
-[FlatLaf Home](https://www.formdev.com/flatlaf/)
+- [Apache NetBeans](https://netbeans.apache.org/) 11.3 - IDE for Java, PHP, HTML
+  and much more
+- [jclasslib bytecode viewer](https://github.com/ingokegel/jclasslib) 5.5
+- [KeyStore Explorer](https://keystore-explorer.org/) 5.4.3
+- ![New](images/new.svg) [OWASP ZAP](https://www.zaproxy.org/) 2.10 - the worlds
+  most widely used web app scanner
+- ![New](images/new.svg) [JOSM](https://josm.openstreetmap.de/) - an extensible
+  editor for [OpenStreetMap](https://www.openstreetmap.org/) (requires FlatLaf
+  JOSM plugin)
+- [jAlbum](https://jalbum.net/) 21 (commercial) - creates photo album websites
+- [XMLmind XML Editor](https://www.xmlmind.com/xmleditor/) 9.3 (commercial)
+- [Total Validator](https://www.totalvalidator.com/) 15 (commercial) - checks
+  your website
+- [j-lawyer](https://github.com/jlawyerorg/j-lawyer-org) - Kanzleisoftware
+- [MegaMek](https://github.com/MegaMek/megamek) v0.47.4 and
+  [MekHQ](https://github.com/MegaMek/mekhq) v0.47.5 - a turn-based sci-fi board
+  game
+- [GUIslice Builder](https://github.com/ImpulseAdventure/GUIslice-Builder)
+  0.13.b024 - GUI builder for
+  [GUIslice](https://github.com/ImpulseAdventure/GUIslice), a lightweight GUI
+  framework for embedded displays
+- [Rest Suite](https://github.com/supanadit/restsuite) - Rest API testing
+- [ControllerBuddy](https://github.com/bwRavencl/ControllerBuddy) - advanced
+  gamepad mapping software
+- [SpringRemote](https://github.com/HaleyWang/SpringRemote) - remote Linux SSH
+  connections manager
+- ![New](images/new.svg) [jEnTunnel](https://github.com/ggrandes/jentunnel) -
+  manage SSH Tunnels made easy
+- [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.2 - GIS and scientific
+  computation environment for meteorological community
+- [lsfusion platform](https://github.com/lsfusion/platform) 4 - information
+  systems development platform
+- ![New](images/new.svg) [JPass](https://github.com/gaborbata/jpass) - password
+  manager with strong encryption
+- [Jes - Die Java-E<>R](https://www.jes-eur.de)
+- [Mapton](https://mapton.org/) 2.0
+  ([source code](https://github.com/trixon/mapton)) - some kind of map
+  application (based on NetBeans platform)
+- [Pseudo Assembler IDE](https://github.com/tomasz-herman/PseudoAssemblerIDE) -
+  IDE for Pseudo-Assembler
+- ![New](images/new.svg) [Linotte](https://github.com/cpc6128/LangageLinotte)
+  3.1 - French programming language created to learn programming
+- ![New](images/new.svg) [MEKA](https://github.com/Waikato/meka) 1.9.3 -
+  multi-label classifiers and evaluation procedures using the Weka machine
+  learning framework
+- ![New](images/new.svg) [Shutter Encoder](https://www.shutterencoder.com/) 14.2
+  ([source code](https://github.com/paulpacifico/shutter-encoder)) -
+  professional video converter and compression tool (screenshots show **old**
+  look)
+- [Sound Analysis](https://github.com/tomasz-herman/SoundAnalysis) - analyze
+  sound files in time or frequency domain
+- [RemoteLight](https://github.com/Drumber/RemoteLight) - multifunctional LED
+  control software
+- ![New](images/new.svg)
+  [ThunderFocus](https://github.com/marcocipriani01/ThunderFocus) -
+  Arduino-based telescope focuser
+- ![New](images/new.svg)
+  [Novel-Grabber](https://github.com/Flameish/Novel-Grabber) - download novels
+  from any webnovel and lightnovel site
+- ![New](images/new.svg) [lectureStudio](https://www.lecturestudio.org/)
+  4.3.1060 - digitize your lectures with ease
+- ![New](images/new.svg)
+  [Android Tool](https://github.com/fast-geek/Android-Tool) - makes popular adb
+  and fastboot commands easier to use
+- and more...

build.gradle.kts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-val releaseVersion = "0.43"
-val developmentVersion = "0.44-SNAPSHOT"
+val releaseVersion = "1.0-rc2"
+val developmentVersion = "1.0-rc3-SNAPSHOT"
 
 version = if( java.lang.Boolean.getBoolean( "release" ) ) releaseVersion else developmentVersion
 
@@ -48,7 +48,7 @@ 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
+extra["bintray.publish"] = false
 
 
 allprojects {
@@ -64,7 +64,7 @@ allprojects {
 			// 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-Copyright" to "Copyright (C) 2019-${java.time.LocalDate.now().year} FormDev Software GmbH. All rights reserved.",
 				"Implementation-Version" to project.version))
 
 			// add META-INF/LICENSE to all created JARs

buildSrc/src/main/kotlin/flatlaf-publish.gradle.kts

@@ -63,8 +63,14 @@ publishing {
 				}
 
 				scm {
+					connection.set( "scm:git:git://github.com/JFormDesigner/FlatLaf.git" )
 					url.set( "https://github.com/JFormDesigner/FlatLaf" )
 				}
+
+				issueManagement {
+					system.set( "GitHub" )
+					url.set( "https://github.com/JFormDesigner/FlatLaf/issues" )
+				}
 			}
 		}
 	}

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

@@ -19,19 +19,28 @@ package com.formdev.flatlaf;
 import java.awt.Color;
 import java.util.Objects;
 import javax.swing.JComponent;
+import javax.swing.SwingConstants;
 
 /**
+ * Defines/documents own client properties used in FlatLaf.
+ *
  * @author Karl Tauber
  */
 public interface FlatClientProperties
 {
+	//---- JButton ------------------------------------------------------------
+
 	/**
 	 * Specifies type of a button.
 	 * <p>
 	 * <strong>Components</strong> {@link javax.swing.JButton} and {@link javax.swing.JToggleButton}<br>
 	 * <strong>Value type</strong> {@link java.lang.String}<br>
-	 * <strong>Allowed Values</strong> {@link #BUTTON_TYPE_SQUARE}, {@link #BUTTON_TYPE_ROUND_RECT},
-	 * {@link #BUTTON_TYPE_TAB}, {@link #BUTTON_TYPE_HELP} and {@link BUTTON_TYPE_TOOLBAR_BUTTON}
+	 * <strong>Allowed Values</strong>
+	 *     {@link #BUTTON_TYPE_SQUARE},
+	 *     {@link #BUTTON_TYPE_ROUND_RECT},
+	 *     {@link #BUTTON_TYPE_TAB},
+	 *     {@link #BUTTON_TYPE_HELP} or
+	 *     {@link BUTTON_TYPE_TOOLBAR_BUTTON}
 	 */
 	String BUTTON_TYPE = "JButton.buttonType";
 
@@ -99,17 +108,19 @@ public interface FlatClientProperties
 	/**
 	 * Specifies whether the button preferred size will be made square (quadratically).
 	 * <p>
-	 * <strong>Components</strong> {@link javax.swing.JButton} and {@link javax.swing.JToggleButton}
+	 * <strong>Components</strong> {@link javax.swing.JButton} and {@link javax.swing.JToggleButton}<br>
 	 * <strong>Value type</strong> {@link java.lang.Boolean}
 	 */
 	String SQUARE_SIZE = "JButton.squareSize";
 
+	//---- JComponent ---------------------------------------------------------
+
 	/**
 	 * Specifies minimum width of a component.
 	 * <p>
 	 * <strong>Component</strong> {@link javax.swing.JButton}, {@link javax.swing.JToggleButton},
 	 * {@link javax.swing.JComboBox}, {@link javax.swing.JSpinner} and {@link javax.swing.text.JTextComponent}<br>
-	 * <strong>Value type</strong> {@link java.lang.Integer}<br>
+	 * <strong>Value type</strong> {@link java.lang.Integer}
 	 */
 	String MINIMUM_WIDTH = "JComponent.minimumWidth";
 
@@ -117,10 +128,19 @@ public interface FlatClientProperties
 	 * Specifies minimum height of a component.
 	 * <p>
 	 * <strong>Component</strong> {@link javax.swing.JButton} and {@link javax.swing.JToggleButton}<br>
-	 * <strong>Value type</strong> {@link java.lang.Integer}<br>
+	 * <strong>Value type</strong> {@link java.lang.Integer}
 	 */
 	String MINIMUM_HEIGHT = "JComponent.minimumHeight";
 
+	/**
+	 * Paint the component with round edges.
+	 * <p>
+	 * <strong>Components</strong> {@link javax.swing.JComboBox}, {@link javax.swing.JSpinner},
+	 * {@link javax.swing.JTextField}, {@link javax.swing.JFormattedTextField} and {@link javax.swing.JPasswordField}<br>
+	 * <strong>Value type</strong> {@link java.lang.Boolean}
+	 */
+	String COMPONENT_ROUND_RECT = "JComponent.roundRect";
+
 	/**
 	 * Specifies the outline color of the component border.
 	 * <p>
@@ -129,9 +149,12 @@ public interface FlatClientProperties
 	 * {@link javax.swing.JScrollPane}, {@link javax.swing.JSpinner},
 	 * {@link javax.swing.JTextField} and {@link javax.swing.JToggleButton}<br>
 	 * <strong>Value type</strong> {@link java.lang.String} or {@link java.awt.Color} or {@link java.awt.Color}[2]<br>
-	 * <strong>Allowed Values</strong> {@link #OUTLINE_ERROR}, {@link #OUTLINE_WARNING},
-	 * any color (type {@link java.awt.Color}) or an array of two colors (type {@link java.awt.Color}[2])
-	 * where the first color is for focused state and the second for unfocused state
+	 * <strong>Allowed Values</strong>
+	 *     {@link #OUTLINE_ERROR},
+	 *     {@link #OUTLINE_WARNING},
+	 *     any color (type {@link java.awt.Color}) or
+	 *     an array of two colors (type {@link java.awt.Color}[2]) where the first color
+	 *     is for focused state and the second for unfocused state
 	 */
 	String OUTLINE = "JComponent.outline";
 
@@ -150,13 +173,25 @@ public interface FlatClientProperties
 	String OUTLINE_WARNING = "warning";
 
 	/**
-	 * Paint the component with round edges.
+	 * Specifies a callback that is invoked to check whether a component is permanent focus owner.
+	 * Used to paint focus indicators.
 	 * <p>
-	 * <strong>Components</strong> {@link javax.swing.JComboBox}, {@link javax.swing.JSpinner},
-	 * {@link javax.swing.JTextField}, {@link javax.swing.JFormattedTextField} and {@link javax.swing.JPasswordField}
-	 * <strong>Value type</strong> {@link java.lang.Boolean}
+	 * May be useful in special cases for custom components.
+	 * <p>
+	 * Use a {@link java.util.function.Predicate} that receives the component as parameter:
+	 * <pre>{@code
+	 * myComponent.putClientProperty( "JComponent.focusOwner",
+	 *     (Predicate<JComponent>) c -> {
+	 *         return ...; // check here
+	 *     } );
+	 * }</pre>
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JComponent}<br>
+	 * <strong>Value type</strong> {@link java.util.function.Predicate&lt;javax.swing.JComponent&gt;
 	 */
-	String COMPONENT_ROUND_RECT = "JComponent.roundRect";
+	String COMPONENT_FOCUS_OWNER = "JComponent.focusOwner";
+
+	//---- Popup --------------------------------------------------------------
 
 	/**
 	 * Specifies whether a drop shadow is painted if the component is shown in a popup
@@ -167,6 +202,17 @@ public interface FlatClientProperties
 	 */
 	String POPUP_DROP_SHADOW_PAINTED = "Popup.dropShadowPainted";
 
+	/**
+	 * Specifies whether a heavy weight window should be used if the component is shown in a popup
+	 * or if the component is the owner of another component that is shown in a popup.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JComponent}<br>
+	 * <strong>Value type</strong> {@link java.lang.Boolean}
+	 */
+	String POPUP_FORCE_HEAVY_WEIGHT = "Popup.forceHeavyWeight";
+
+	//---- JProgressBar -------------------------------------------------------
+
 	/**
 	 * Specifies whether the progress bar has always the larger height even if no string is painted.
 	 * <p>
@@ -183,6 +229,8 @@ public interface FlatClientProperties
 	 */
 	String PROGRESS_BAR_SQUARE = "JProgressBar.square";
 
+	//---- JRootPane ----------------------------------------------------------
+
 	/**
 	 * Specifies whether the menu bar is embedded into the title pane if custom
 	 * window decorations are enabled. Default is {@code true}.
@@ -192,6 +240,8 @@ public interface FlatClientProperties
 	 */
 	String MENU_BAR_EMBEDDED = "JRootPane.menuBarEmbedded";
 
+	//---- JScrollBar / JScrollPane -------------------------------------------
+
 	/**
 	 * Specifies whether the decrease/increase arrow buttons of a scrollbar are shown.
 	 * <p>
@@ -203,11 +253,13 @@ public interface FlatClientProperties
 	/**
 	 * Specifies whether the scroll pane uses smooth scrolling.
 	 * <p>
-	 * <strong>Component</strong> {{@link javax.swing.JScrollPane}<br>
+	 * <strong>Component</strong> {@link javax.swing.JScrollPane}<br>
 	 * <strong>Value type</strong> {@link java.lang.Boolean}
 	 */
 	String SCROLL_PANE_SMOOTH_SCROLLING = "JScrollPane.smoothScrolling";
 
+	//---- JTabbedPane --------------------------------------------------------
+
 	/**
 	 * Specifies whether separators are shown between tabs.
 	 * <p>
@@ -233,21 +285,356 @@ public interface FlatClientProperties
 	String TABBED_PANE_HAS_FULL_BORDER = "JTabbedPane.hasFullBorder";
 
 	/**
-	 * Specifies the height of a tab.
+	 * Specifies whether the tab area should be hidden if it contains only one tab.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}<br>
+	 * <strong>Value type</strong> {@link java.lang.Boolean}
+	 */
+	String TABBED_PANE_HIDE_TAB_AREA_WITH_ONE_TAB = "JTabbedPane.hideTabAreaWithOneTab";
+
+	/**
+	 * Specifies the minimum width of a tab.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}
+	 * or tab content components (see {@link javax.swing.JTabbedPane#setComponentAt(int, java.awt.Component)})<br>
+	 * <strong>Value type</strong> {@link java.lang.Integer}
+	 */
+	String TABBED_PANE_MINIMUM_TAB_WIDTH = "JTabbedPane.minimumTabWidth";
+
+	/**
+	 * Specifies the maximum width of a tab.
+	 * <p>
+	 * Applied only if tab does not have a custom tab component
+	 * (see {@link javax.swing.JTabbedPane#setTabComponentAt(int, java.awt.Component)}).
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}
+	 * or tab content components (see {@link javax.swing.JTabbedPane#setComponentAt(int, java.awt.Component)})<br>
+	 * <strong>Value type</strong> {@link java.lang.Integer}
+	 */
+	String TABBED_PANE_MAXIMUM_TAB_WIDTH = "JTabbedPane.maximumTabWidth";
+
+	/**
+	 * Specifies the minimum height of a tab.
 	 * <p>
 	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}<br>
 	 * <strong>Value type</strong> {@link java.lang.Integer}
+	 *
+	 * @see #TABBED_PANE_TAB_INSETS
 	 */
 	String TABBED_PANE_TAB_HEIGHT = "JTabbedPane.tabHeight";
 
+	/**
+	 * Specifies the insets of a tab.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}
+	 * or tab content components (see {@link javax.swing.JTabbedPane#setComponentAt(int, java.awt.Component)})<br>
+	 * <strong>Value type</strong> {@link java.awt.Insets}
+	 *
+	 * @see #TABBED_PANE_TAB_HEIGHT
+	 */
+	String TABBED_PANE_TAB_INSETS = "JTabbedPane.tabInsets";
+
+	/**
+	 * Specifies the insets of the tab area.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}<br>
+	 * <strong>Value type</strong> {@link java.awt.Insets}
+	 */
+	String TABBED_PANE_TAB_AREA_INSETS = "JTabbedPane.tabAreaInsets";
+
+	/**
+	 * Specifies whether tabs are closable.
+	 * If set to {@code true} on a tabbed pane component, all tabs in that tabbed pane are closable.
+	 * To make individual tabs closable, set it to {@code true} on a tab content component.
+	 * <p>
+	 * Note that you have to specify a callback (see {@link #TABBED_PANE_TAB_CLOSABLE})
+	 * that is invoked when the user clicks a tab close button.
+	 * The callback is responsible for closing the tab.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}
+	 * or tab content components (see {@link javax.swing.JTabbedPane#setComponentAt(int, java.awt.Component)})<br>
+	 * <strong>Value type</strong> {@link java.lang.Boolean}
+	 *
+	 * @see #TABBED_PANE_TAB_CLOSE_CALLBACK
+	 */
+	String TABBED_PANE_TAB_CLOSABLE = "JTabbedPane.tabClosable";
+
+	/**
+	 * Specifies the tooltip text used for tab close buttons.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}
+	 * or tab content components (see {@link javax.swing.JTabbedPane#setComponentAt(int, java.awt.Component)})<br>
+	 * <strong>Value type</strong> {@link java.lang.String}
+	 *
+	 * @see #TABBED_PANE_TAB_CLOSABLE
+	 */
+	String TABBED_PANE_TAB_CLOSE_TOOLTIPTEXT = "JTabbedPane.tabCloseToolTipText";
+
+	/**
+	 * Specifies the callback that is invoked when a tab close button is clicked.
+	 * The callback is responsible for closing the tab.
+	 * <p>
+	 * Either use a {@link java.util.function.IntConsumer} that receives the tab index as parameter:
+	 * <pre>{@code
+	 * myTabbedPane.putClientProperty( "JTabbedPane.tabCloseCallback",
+	 *     (IntConsumer) tabIndex -> {
+	 *         // close tab here
+	 *     } );
+	 * }</pre>
+	 * Or use a {@link java.util.function.BiConsumer}&lt;javax.swing.JTabbedPane, Integer&gt;
+	 * that receives the tabbed pane and the tab index as parameters:
+	 * <pre>{@code
+	 * myTabbedPane.putClientProperty( "JTabbedPane.tabCloseCallback",
+	 *     (BiConsumer<JTabbedPane, Integer>) (tabbedPane, tabIndex) -> {
+	 *         // close tab here
+	 *     } );
+	 * }</pre>
+	 * If you need to check whether a modifier key (e.g. Alt or Shift) was pressed
+	 * while the user clicked the tab close button, use {@link java.awt.EventQueue#getCurrentEvent}
+	 * to get current event, check whether it is a {@link java.awt.event.MouseEvent}
+	 * and invoke its methods. E.g.
+	 * <pre>{@code
+	 * AWTEvent e = EventQueue.getCurrentEvent();
+	 * boolean shift = (e instanceof MouseEvent) ? ((MouseEvent)e).isShiftDown() : false;
+	 * }</pre>
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}
+	 * or tab content components (see {@link javax.swing.JTabbedPane#setComponentAt(int, java.awt.Component)})<br>
+	 * <strong>Value type</strong> {@link java.util.function.IntConsumer}
+	 * or {@link java.util.function.BiConsumer}&lt;javax.swing.JTabbedPane, Integer&gt;
+	 *
+	 * @see #TABBED_PANE_TAB_CLOSABLE
+	 */
+	String TABBED_PANE_TAB_CLOSE_CALLBACK = "JTabbedPane.tabCloseCallback";
+
+	/**
+	 * Specifies the display policy for the "more tabs" button,
+	 * which shows a popup menu with the (partly) hidden tabs.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}<br>
+	 * <strong>Value type</strong> {@link java.lang.String}<br>
+	 * <strong>Allowed Values</strong>
+	 *     {@link #TABBED_PANE_POLICY_NEVER} or
+	 *     {@link #TABBED_PANE_POLICY_AS_NEEDED}
+	 */
+	String TABBED_PANE_TABS_POPUP_POLICY = "JTabbedPane.tabsPopupPolicy";
+
+	/**
+	 * Specifies the display policy for the forward/backward scroll arrow buttons.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}<br>
+	 * <strong>Value type</strong> {@link java.lang.String}<br>
+	 * <strong>Allowed Values</strong>
+	 *     {@link #TABBED_PANE_POLICY_NEVER},
+	 *     {@link #TABBED_PANE_POLICY_AS_NEEDED} or
+	 *     {@link #TABBED_PANE_POLICY_AS_NEEDED_SINGLE}
+	 */
+	String TABBED_PANE_SCROLL_BUTTONS_POLICY = "JTabbedPane.scrollButtonsPolicy";
+
+	/**
+	 * Display never.
+	 *
+	 * @see #TABBED_PANE_TABS_POPUP_POLICY
+	 * @see #TABBED_PANE_SCROLL_BUTTONS_POLICY
+	 */
+	String TABBED_PANE_POLICY_NEVER = "never";
+
+	/**
+	 * Display only when needed.
+	 * <p>
+	 * If used for {@link #TABBED_PANE_SCROLL_BUTTONS_POLICY}, both scroll arrow buttons
+	 * are either shown or hidden. Buttons are disabled if scrolling in that
+	 * direction is not applicable.
+	 *
+	 * @see #TABBED_PANE_TABS_POPUP_POLICY
+	 * @see #TABBED_PANE_SCROLL_BUTTONS_POLICY
+	 */
+	String TABBED_PANE_POLICY_AS_NEEDED = "asNeeded";
+
+	/**
+	 * Display single button only when needed.
+	 * <p>
+	 * If scroll button placement is trailing, then this option is ignored
+	 * and both buttons are shown or hidden as needed.
+	 *
+	 * @see #TABBED_PANE_SCROLL_BUTTONS_POLICY
+	 */
+	String TABBED_PANE_POLICY_AS_NEEDED_SINGLE = "asNeededSingle";
+
+	/**
+	 * Specifies the placement of the forward/backward scroll arrow buttons.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}<br>
+	 * <strong>Value type</strong> {@link java.lang.String}<br>
+	 * <strong>Allowed Values</strong>
+	 *     {@link #TABBED_PANE_PLACEMENT_BOTH} or
+	 *     {@link #TABBED_PANE_PLACEMENT_TRAILING}
+	 */
+	String TABBED_PANE_SCROLL_BUTTONS_PLACEMENT = "JTabbedPane.scrollButtonsPlacement";
+
+	/**
+	 * The forward/backward scroll arrow buttons are placed on both sides of the tab area.
+	 * The backward scroll button at the left/top side.
+	 * The forward scroll button at the right/bottom side.
+	 *
+	 * @see #TABBED_PANE_SCROLL_BUTTONS_PLACEMENT
+	 */
+	String TABBED_PANE_PLACEMENT_BOTH = "both";
+
+	/**
+	 * The forward/backward scroll arrow buttons are placed on the trailing side of the tab area.
+	 *
+	 * @see #TABBED_PANE_SCROLL_BUTTONS_PLACEMENT
+	 */
+	String TABBED_PANE_PLACEMENT_TRAILING = "trailing";
+
+	/**
+	 * Specifies the alignment of the tab area.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}<br>
+	 * <strong>Value type</strong> {@link java.lang.Integer} or {@link java.lang.String}<br>
+	 * <strong>Allowed Values</strong>
+	 *     {@link SwingConstants#LEADING} (default)
+	 *     {@link SwingConstants#TRAILING},
+	 *     {@link SwingConstants#CENTER},
+	 *     {@link #TABBED_PANE_ALIGN_LEADING} (default),
+	 *     {@link #TABBED_PANE_ALIGN_TRAILING},
+	 *     {@link #TABBED_PANE_ALIGN_CENTER} or
+	 *     {@link #TABBED_PANE_ALIGN_FILL}
+	 */
+	String TABBED_PANE_TAB_AREA_ALIGNMENT = "JTabbedPane.tabAreaAlignment";
+
+	/**
+	 * Specifies the horizontal alignment of the tab title and icon.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}
+	 * or tab content components (see {@link javax.swing.JTabbedPane#setComponentAt(int, java.awt.Component)})<br>
+	 * <strong>Value type</strong> {@link java.lang.Integer} or {@link java.lang.String}<br>
+	 * <strong>Allowed Values</strong>
+	 *     {@link SwingConstants#LEADING},
+	 *     {@link SwingConstants#TRAILING},
+	 *     {@link SwingConstants#CENTER} (default),
+	 *     {@link #TABBED_PANE_ALIGN_LEADING},
+	 *     {@link #TABBED_PANE_ALIGN_TRAILING} or
+	 *     {@link #TABBED_PANE_ALIGN_CENTER} (default)
+	 */
+	String TABBED_PANE_TAB_ALIGNMENT = "JTabbedPane.tabAlignment";
+
+	/**
+	 * Align to the leading edge.
+	 *
+	 * @see #TABBED_PANE_TAB_AREA_ALIGNMENT
+	 * @see #TABBED_PANE_TAB_ALIGNMENT
+	 */
+	String TABBED_PANE_ALIGN_LEADING = "leading";
+
+	/**
+	 * Align to the trailing edge.
+	 *
+	 * @see #TABBED_PANE_TAB_AREA_ALIGNMENT
+	 * @see #TABBED_PANE_TAB_ALIGNMENT
+	 */
+	String TABBED_PANE_ALIGN_TRAILING = "trailing";
+
+	/**
+	 * Align to center.
+	 *
+	 * @see #TABBED_PANE_TAB_AREA_ALIGNMENT
+	 * @see #TABBED_PANE_TAB_ALIGNMENT
+	 */
+	String TABBED_PANE_ALIGN_CENTER = "center";
+
+	/**
+	 * Stretch to fill all available space.
+	 *
+	 * @see #TABBED_PANE_TAB_AREA_ALIGNMENT
+	 */
+	String TABBED_PANE_ALIGN_FILL = "fill";
+
+	/**
+	 * Specifies how the tabs should be sized.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}<br>
+	 * <strong>Value type</strong> {@link java.lang.String}<br>
+	 * <strong>Allowed Values</strong>
+	 *     {@link #TABBED_PANE_TAB_WIDTH_MODE_PREFERRED} (default),
+	 *     {@link #TABBED_PANE_TAB_WIDTH_MODE_EQUAL} or
+	 *     {@link #TABBED_PANE_TAB_WIDTH_MODE_COMPACT}
+	 */
+	String TABBED_PANE_TAB_WIDTH_MODE = "JTabbedPane.tabWidthMode";
+
+	/**
+	 * Tab width is adjusted to tab icon and title.
+	 *
+	 * @see #TABBED_PANE_TAB_WIDTH_MODE
+	 */
+	String TABBED_PANE_TAB_WIDTH_MODE_PREFERRED = "preferred";
+
+	/**
+	 * All tabs in a tabbed pane has same width.
+	 *
+	 * @see #TABBED_PANE_TAB_WIDTH_MODE
+	 */
+	String TABBED_PANE_TAB_WIDTH_MODE_EQUAL = "equal";
+
+	/**
+	 * Unselected tabs are smaller because they show only the tab icon, but no tab title.
+	 * Selected tabs show both.
+	 *
+	 * @see #TABBED_PANE_TAB_WIDTH_MODE
+	 */
+	String TABBED_PANE_TAB_WIDTH_MODE_COMPACT = "compact";
+
+	/**
+	 * Specifies the tab icon placement (relative to tab title).
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}<br>
+	 * <strong>Value type</strong> {@link java.lang.Integer}<br>
+	 * <strong>Allowed Values</strong>
+	 *     {@link SwingConstants#LEADING} (default),
+	 *     {@link SwingConstants#TRAILING},
+	 *     {@link SwingConstants#TOP} or
+	 *     {@link SwingConstants#BOTTOM}
+	 */
+	String TABBED_PANE_TAB_ICON_PLACEMENT = "JTabbedPane.tabIconPlacement";
+
+	/**
+	 * Specifies a component that will be placed at the leading edge of the tabs area.
+	 * <p>
+	 * For top and bottom tab placement, the layed out component size will be
+	 * the preferred component width and the tab area height.<br>
+	 * For left and right tab placement, the layed out component size will be
+	 * the tab area width and the preferred component height.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}<br>
+	 * <strong>Value type</strong> {@link java.awt.Component}
+	 */
+	String TABBED_PANE_LEADING_COMPONENT = "JTabbedPane.leadingComponent";
+
+	/**
+	 * Specifies a component that will be placed at the trailing edge of the tabs area.
+	 * <p>
+	 * For top and bottom tab placement, the layed out component size will be
+	 * the available horizontal space (minimum is preferred component width) and the tab area height.<br>
+	 * For left and right tab placement, the layed out component size will be
+	 * the tab area width and the available vertical space (minimum is preferred component height).
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}<br>
+	 * <strong>Value type</strong> {@link java.awt.Component}
+	 */
+	String TABBED_PANE_TRAILING_COMPONENT = "JTabbedPane.trailingComponent";
+
+	//---- JTextField ---------------------------------------------------------
+
 	/**
 	 * Specifies whether all text is selected when the text component gains focus.
 	 * <p>
 	 * <strong>Component</strong> {@link javax.swing.JTextField} (and subclasses)<br>
 	 * <strong>Value type</strong> {@link java.lang.String}<br>
-	 * <strong>Allowed Values</strong> {@link #SELECT_ALL_ON_FOCUS_POLICY_NEVER},
-	 * {@link #SELECT_ALL_ON_FOCUS_POLICY_ONCE} (default) or
-	 * {@link #SELECT_ALL_ON_FOCUS_POLICY_ALWAYS}
+	 * <strong>Allowed Values</strong>
+	 *     {@link #SELECT_ALL_ON_FOCUS_POLICY_NEVER},
+	 *     {@link #SELECT_ALL_ON_FOCUS_POLICY_ONCE} (default) or
+	 *     {@link #SELECT_ALL_ON_FOCUS_POLICY_ALWAYS}
 	 */
 	String SELECT_ALL_ON_FOCUS_POLICY = "JTextField.selectAllOnFocusPolicy";
 
@@ -282,6 +669,8 @@ public interface FlatClientProperties
 	 */
 	String PLACEHOLDER_TEXT = "JTextField.placeholderText";
 
+	//---- JToggleButton ------------------------------------------------------
+
 	/**
 	 * Height of underline if toggle button type is {@link #BUTTON_TYPE_TAB}.
 	 * <p>
@@ -306,6 +695,27 @@ public interface FlatClientProperties
 	 */
 	String TAB_BUTTON_SELECTED_BACKGROUND = "JToggleButton.tab.selectedBackground";
 
+	//---- JTree --------------------------------------------------------------
+
+	/**
+	 * Override if a tree shows a wide selection. Default is {@code true}.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTree}<br>
+	 * <strong>Value type</strong> {@link java.lang.Boolean}
+	 */
+	String TREE_WIDE_SELECTION = "JTree.wideSelection";
+
+	/**
+	 * Specifies whether tree item selection is painted. Default is {@code true}.
+	 * If set to {@code false}, then the tree cell renderer is responsible for painting selection.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JTree}<br>
+	 * <strong>Value type</strong> {@link java.lang.Boolean}
+	 */
+	String TREE_PAINT_SELECTION = "JTree.paintSelection";
+
+	//---- helper methods -----------------------------------------------------
+
 	/**
 	 * Checks whether a client property of a component has the given value.
 	 */
@@ -348,14 +758,4 @@ public interface FlatClientProperties
 		Object value = c.getClientProperty( key );
 		return (value instanceof Color) ? (Color) value : defaultValue;
 	}
-
-	static int clientPropertyChoice( JComponent c, String key, String... choices ) {
-		Object value = c.getClientProperty( key );
-		for( int i = 0; i < choices.length; i++ ) {
-			if( choices[i].equals( value ) )
-				return i;
-
-		}
-		return -1;
-	}
 }

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

@@ -18,21 +18,28 @@ package com.formdev.flatlaf;
 
 /**
  * A Flat LaF that has a dark color scheme and looks like Darcula LaF.
- *
- * The UI defaults are loaded from FlatDarculaLaf.properties, FlatDarkLaf.properties and FlatLaf.properties
+ * <p>
+ * The UI defaults are loaded from {@code FlatDarculaLaf.properties},
+ * {@code FlatDarkLaf.properties} and {@code FlatLaf.properties}.
  *
  * @author Karl Tauber
  */
 public class FlatDarculaLaf
 	extends FlatDarkLaf
 {
-	public static boolean install( ) {
+	public static final String NAME = "FlatLaf Darcula";
+
+	public static boolean install() {
 		return install( new FlatDarculaLaf() );
 	}
 
+	public static void installLafInfo() {
+		installLafInfo( NAME, FlatDarculaLaf.class );
+	}
+
 	@Override
 	public String getName() {
-		return "FlatLaf Darcula";
+		return NAME;
 	}
 
 	@Override

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

@@ -16,23 +16,41 @@
 
 package com.formdev.flatlaf;
 
+import javax.swing.UIManager;
+
 /**
  * A Flat LaF that has a dark color scheme.
- *
- * The UI defaults are loaded from FlatDarkLaf.properties and FlatLaf.properties
+ * <p>
+ * The UI defaults are loaded from {@code FlatDarkLaf.properties} and {@code FlatLaf.properties}.
  *
  * @author Karl Tauber
  */
 public class FlatDarkLaf
 	extends FlatLaf
 {
-	public static boolean install( ) {
+	public static final String NAME = "FlatLaf Dark";
+
+	/**
+	 * Sets the application look and feel to this LaF
+	 * using {@link UIManager#setLookAndFeel(javax.swing.LookAndFeel)}.
+	 */
+	public static boolean install() {
 		return install( new FlatDarkLaf() );
 	}
 
+	/**
+	 * Adds this look and feel to the set of available look and feels.
+	 * <p>
+	 * Useful if your application uses {@link UIManager#getInstalledLookAndFeels()}
+	 * to query available LaFs and display them to the user in a combobox.
+	 */
+	public static void installLafInfo() {
+		installLafInfo( NAME, FlatDarkLaf.class );
+	}
+
 	@Override
 	public String getName() {
-		return "FlatLaf Dark";
+		return NAME;
 	}
 
 	@Override

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

@@ -42,10 +42,12 @@ class FlatInputMaps
 	}
 
 	private static void initBasicInputMaps( UIDefaults defaults ) {
-		defaults.put( "Button.focusInputMap", new UIDefaults.LazyInputMap( new Object[] {
-			"SPACE", "pressed",
-			"released SPACE", "released"
-		} ) );
+		if( SystemInfo.isMacOS ) {
+			defaults.put( "Button.focusInputMap", new UIDefaults.LazyInputMap( new Object[] {
+				"SPACE", "pressed",
+				"released SPACE", "released"
+			} ) );
+		}
 
 		modifyInputMap( defaults, "ComboBox.ancestorInputMap",
 			"SPACE", "spacePopup",

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

@@ -18,21 +18,28 @@ package com.formdev.flatlaf;
 
 /**
  * A Flat LaF that has a light color scheme and looks like IntelliJ LaF.
- *
- * The UI defaults are loaded from FlatIntelliJLaf.properties, FlatLightLaf.properties and FlatLaf.properties
+ * <p>
+ * The UI defaults are loaded from {@code FlatIntelliJLaf.properties},
+ * {@code FlatLightLaf.properties} and {@code FlatLaf.properties}.
  *
  * @author Karl Tauber
  */
 public class FlatIntelliJLaf
 	extends FlatLightLaf
 {
-	public static boolean install( ) {
+	public static final String NAME = "FlatLaf IntelliJ";
+
+	public static boolean install() {
 		return install( new FlatIntelliJLaf() );
 	}
 
+	public static void installLafInfo() {
+		installLafInfo( NAME, FlatIntelliJLaf.class );
+	}
+
 	@Override
 	public String getName() {
-		return "FlatLaf IntelliJ";
+		return NAME;
 	}
 
 	@Override

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

@@ -50,9 +50,9 @@ import javax.swing.LookAndFeel;
 import javax.swing.PopupFactory;
 import javax.swing.SwingUtilities;
 import javax.swing.UIDefaults;
+import javax.swing.UIDefaults.ActiveValue;
 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;
@@ -94,6 +94,10 @@ public abstract class FlatLaf
 	private Boolean oldFrameWindowDecorated;
 	private Boolean oldDialogWindowDecorated;
 
+	/**
+	 * Sets the application look and feel to the given LaF
+	 * using {@link UIManager#setLookAndFeel(javax.swing.LookAndFeel)}.
+	 */
 	public static boolean install( LookAndFeel newLookAndFeel ) {
 		try {
 			UIManager.setLookAndFeel( newLookAndFeel );
@@ -104,6 +108,16 @@ public abstract class FlatLaf
 		}
 	}
 
+	/**
+	 * Adds the given look and feel to the set of available look and feels.
+	 * <p>
+	 * Useful if your application uses {@link UIManager#getInstalledLookAndFeels()}
+	 * to query available LaFs and display them to the user in a combobox.
+	 */
+	public static void installLafInfo( String lafName, Class<? extends LookAndFeel> lafClass ) {
+		UIManager.installLookAndFeel( new UIManager.LookAndFeelInfo( lafName, lafClass.getName() ) );
+	}
+
 	/**
 	 * Returns the look and feel identifier.
 	 * <p>
@@ -170,6 +184,9 @@ public abstract class FlatLaf
 
 	@Override
 	public Icon getDisabledIcon( JComponent component, Icon icon ) {
+		if( icon instanceof DisabledIconProvider )
+			return ((DisabledIconProvider)icon).getDisabledIcon();
+
 		if( icon instanceof ImageIcon ) {
 			Object grayFilter = UIManager.get( "Component.grayFilter" );
 			ImageFilter filter = (grayFilter instanceof ImageFilter)
@@ -450,8 +467,13 @@ public abstract class FlatLaf
 		} else if( SystemInfo.isMacOS ) {
 			String fontName;
 			if( SystemInfo.isMacOS_10_15_Catalina_orLater ) {
-				// use Helvetica Neue font
-				fontName = "Helvetica Neue";
+				if (SystemInfo.isJetBrainsJVM_11_orLater) {
+					// See https://youtrack.jetbrains.com/issue/JBR-1915
+					fontName = ".AppleSystemUIFont";
+				} else {
+					// use Helvetica Neue font
+					fontName = "Helvetica Neue";
+				}
 			} else if( SystemInfo.isMacOS_10_11_ElCapitan_orLater ) {
 				// use San Francisco Text font
 				fontName = ".SF NS Text";
@@ -524,7 +546,12 @@ public abstract class FlatLaf
 	}
 
 	private void putAATextInfo( UIDefaults defaults ) {
-		if( SystemInfo.isJava_9_orLater ) {
+		if ( SystemInfo.isMacOS && SystemInfo.isJetBrainsJVM ) {
+			// The awt.font.desktophints property suggests sub-pixel anti-aliasing
+			// which renders text with too much weight on macOS in the JetBrains JRE.
+			// Use greyscale anti-aliasing instead.
+			defaults.put( RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON );
+		} else if( SystemInfo.isJava_9_orLater ) {
 			Object desktopHints = Toolkit.getDefaultToolkit().getDesktopProperty( DESKTOPFONTHINTS );
 			if( desktopHints instanceof Map ) {
 				@SuppressWarnings( "unchecked" )
@@ -762,4 +789,24 @@ public abstract class FlatLaf
 			super( image );
 		}
 	}
+
+	//---- interface DisabledIconProvider -------------------------------------
+
+	/**
+	 * A provider for disabled icons.
+	 * <p>
+	 * This is intended to be implemented by {@link javax.swing.Icon} implementations
+	 * that provide the ability to paint disabled state.
+	 * <p>
+	 * Used in {@link FlatLaf#getDisabledIcon(JComponent, Icon)} to create a disabled icon from an enabled icon.
+	 */
+	public interface DisabledIconProvider
+	{
+		/**
+		 * Returns an icon with a disabled appearance.
+		 *
+		 * @return a disabled icon
+		 */
+		Icon getDisabledIcon();
+	}
 }

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

@@ -16,23 +16,41 @@
 
 package com.formdev.flatlaf;
 
+import javax.swing.UIManager;
+
 /**
  * A Flat LaF that has a light color scheme.
- *
- * The UI defaults are loaded from FlatLightLaf.properties and FlatLaf.properties
+ * <p>
+ * The UI defaults are loaded from {@code FlatLightLaf.properties} and {@code FlatLaf.properties}.
  *
  * @author Karl Tauber
  */
 public class FlatLightLaf
 	extends FlatLaf
 {
-	public static boolean install( ) {
+	public static final String NAME = "FlatLaf Light";
+
+	/**
+	 * Sets the application look and feel to this LaF
+	 * using {@link UIManager#setLookAndFeel(javax.swing.LookAndFeel)}.
+	 */
+	public static boolean install() {
 		return install( new FlatLightLaf() );
 	}
 
+	/**
+	 * Adds this look and feel to the set of available look and feels.
+	 * <p>
+	 * Useful if your application uses {@link UIManager#getInstalledLookAndFeels()}
+	 * to query available LaFs and display them to the user in a combobox.
+	 */
+	public static void installLafInfo() {
+		installLafInfo( NAME, FlatLightLaf.class );
+	}
+
 	@Override
 	public String getName() {
-		return "FlatLaf Light";
+		return NAME;
 	}
 
 	@Override

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

@@ -88,6 +88,10 @@ public class FlatPropertiesLaf
 		return dark;
 	}
 
+	public Properties getProperties() {
+		return properties;
+	}
+
 	@Override
 	protected ArrayList<Class<?>> getLafClassesForDefaultsLoading() {
 		ArrayList<Class<?>> lafClasses = new ArrayList<>();

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

@@ -64,6 +64,8 @@ public interface FlatSystemProperties
 	 * If this system property is set, FlatLaf invokes {@link JFrame#setDefaultLookAndFeelDecorated(boolean)}
 	 * and {@link JDialog#setDefaultLookAndFeelDecorated(boolean)} on LaF initialization.
 	 * <p>
+	 * (requires Window 10)
+	 * <p>
 	 * <strong>Allowed Values</strong> {@code false} and {@code true}<br>
 	 * <strong>Default</strong> none
 	 */
@@ -79,6 +81,8 @@ public interface FlatSystemProperties
 	 * Setting this to {@code true} forces using JetBrains Runtime custom window decorations
 	 * even if they are not enabled by the application.
 	 * <p>
+	 * (requires Window 10)
+	 * <p>
 	 * <strong>Allowed Values</strong> {@code false} and {@code true}<br>
 	 * <strong>Default</strong> {@code true}
 	 */
@@ -87,11 +91,21 @@ public interface FlatSystemProperties
 	/**
 	 * Specifies whether menubar is embedded into custom window decorations.
 	 * <p>
+	 * (requires Window 10)
+	 * <p>
 	 * <strong>Allowed Values</strong> {@code false} and {@code true}<br>
 	 * <strong>Default</strong> {@code true}
 	 */
 	String MENUBAR_EMBEDDED = "flatlaf.menuBarEmbedded";
 
+	/**
+	 * Specifies whether animations are enabled.
+	 * <p>
+	 * <strong>Allowed Values</strong> {@code false} and {@code true}<br>
+	 * <strong>Default</strong> {@code true}
+	 */
+	String ANIMATION = "flatlaf.animation";
+
 	/**
 	 * Specifies whether vertical text position is corrected when UI is scaled on HiDPI screens.
 	 * <p>

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

@@ -16,6 +16,7 @@
 
 package com.formdev.flatlaf;
 
+import java.awt.Color;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -56,6 +57,8 @@ public class IntelliJTheme
 	public final boolean dark;
 	public final String author;
 
+	private final boolean isMaterialUILite;
+
 	private final Map<String, String> colors;
 	private final Map<String, Object> ui;
 	private final Map<String, Object> icons;
@@ -119,6 +122,8 @@ public class IntelliJTheme
 	    dark = Boolean.parseBoolean( (String) json.get( "dark" ) );
 	    author = (String) json.get( "author" );
 
+		isMaterialUILite = author.equals( "Mallowigi" );
+
 	    colors = (Map<String, String>) json.get( "colors" );
 	    ui = (Map<String, Object>) json.get( "ui" );
 	    icons = (Map<String, Object>) json.get( "icons" );
@@ -156,6 +161,11 @@ public class IntelliJTheme
 		defaults.put( "Button.disabledBackground", panelBackground );
 		defaults.put( "ToggleButton.disabledBackground", panelBackground );
 
+		// fix Button borders
+		copyIfNotSet( defaults, "Button.focusedBorderColor", "Component.focusedBorderColor", uiKeys );
+		defaults.put( "Button.hoverBorderColor", defaults.get( "Button.focusedBorderColor" ) );
+		defaults.put( "HelpButton.hoverBorderColor", defaults.get( "Button.focusedBorderColor" ) );
+
 		// IDEA uses a SVG icon for the help button, but paints the background with Button.startBackground and Button.endBackground
 		Object helpButtonBackground = defaults.get( "Button.startBackground" );
 		Object helpButtonBorderColor = defaults.get( "Button.startBorderColor" );
@@ -205,6 +215,12 @@ public class IntelliJTheme
 		if( !uiKeys.contains( "ToggleButton.foreground" ) && uiKeys.contains( "Button.foreground" ) )
 			defaults.put( "ToggleButton.foreground", defaults.get( "Button.foreground" ) );
 
+		// fix List and Table background colors in Material UI Lite themes
+		if( isMaterialUILite ) {
+			defaults.put( "List.background", defaults.get( "Tree.background" ) );
+			defaults.put( "Table.background", defaults.get( "Tree.background" ) );
+		}
+
 		// limit tree row height
 		int rowHeight = defaults.getInt( "Tree.rowHeight" );
 		if( rowHeight > 22 )
@@ -225,10 +241,17 @@ public class IntelliJTheme
 		// remove theme specific UI defaults and remember only those for current theme
 		Map<Object, Object> themeSpecificDefaults = new HashMap<>();
 		String currentThemePrefix = '[' + name.replace( ' ', '_' ) + ']';
+		String currentAuthorPrefix = "[author-" + author.replace( ' ', '_' ) + ']';
+		String allThemesPrefix = "[*]";
+		String[] prefixes = { currentThemePrefix, currentAuthorPrefix, allThemesPrefix };
 		for( String key : themeSpecificKeys ) {
 			Object value = defaults.remove( key );
-			if( key.startsWith( currentThemePrefix ) )
-				themeSpecificDefaults.put( key.substring( currentThemePrefix.length() ), value );
+			for( String prefix : prefixes ) {
+				if( key.startsWith( prefix ) ) {
+					themeSpecificDefaults.put( key.substring( prefix.length() ), value );
+					break;
+				}
+			}
 		}
 
 		return themeSpecificDefaults;
@@ -269,7 +292,6 @@ public class IntelliJTheme
 			uiKeys.add( key );
 
 			// fix ComboBox size and Spinner border in all Material UI Lite themes
-			boolean isMaterialUILite = author.equals( "Mallowigi" );
 			if( isMaterialUILite && (key.equals( "ComboBox.padding" ) || key.equals( "Spinner.border" )) )
 				return; // ignore
 
@@ -381,7 +403,7 @@ public class IntelliJTheme
 	}
 
 	/**
-	 * Because IDEA uses SVGs for check boxes and radio buttons the colors for
+	 * Because IDEA uses SVGs for check boxes and radio buttons, the colors for
 	 * this two components are specified in "icons > ColorPalette".
 	 * FlatLaf uses vector icons and expects colors for the two components in UI defaults.
 	 */
@@ -453,29 +475,47 @@ public class IntelliJTheme
 			}
 		}
 
-		// remove hover and pressed colors
+		// update hover, pressed and focused colors
 		if( checkboxModified ) {
+			// for non-filled checkbox/radiobutton used in dark themes
 			defaults.remove( "CheckBox.icon.focusWidth" );
-			defaults.remove( "CheckBox.icon.hoverBorderColor" );
-			defaults.remove( "CheckBox.icon.focusedBackground" );
-			defaults.remove( "CheckBox.icon.hoverBackground" );
-			defaults.remove( "CheckBox.icon.pressedBackground" );
-			defaults.remove( "CheckBox.icon.selectedFocusedBackground" );
-			defaults.remove( "CheckBox.icon.selectedHoverBackground" );
-			defaults.remove( "CheckBox.icon.selectedPressedBackground" );
+			defaults.put( "CheckBox.icon.hoverBorderColor", defaults.get( "CheckBox.icon.focusedBorderColor" ) );
 
+			// for filled checkbox/radiobutton used in light themes
 			defaults.remove( "CheckBox.icon[filled].focusWidth" );
-			defaults.remove( "CheckBox.icon[filled].hoverBorderColor" );
-			defaults.remove( "CheckBox.icon[filled].focusedBackground" );
-			defaults.remove( "CheckBox.icon[filled].hoverBackground" );
-			defaults.remove( "CheckBox.icon[filled].pressedBackground" );
-			defaults.remove( "CheckBox.icon[filled].selectedFocusedBackground" );
-			defaults.remove( "CheckBox.icon[filled].selectedHoverBackground" );
-			defaults.remove( "CheckBox.icon[filled].selectedPressedBackground" );
+			defaults.put( "CheckBox.icon[filled].hoverBorderColor", defaults.get( "CheckBox.icon[filled].focusedBorderColor" ) );
+			defaults.put( "CheckBox.icon[filled].selectedFocusedBackground", defaults.get( "CheckBox.icon[filled].selectedBackground" ) );
+
+			if( dark ) {
+				// IDEA Darcula checkBoxFocused.svg, checkBoxSelectedFocused.svg,
+				// radioFocused.svg and radioSelectedFocused.svg
+				// use opacity=".65" for the border
+				// --> add alpha to focused border colors
+				String[] focusedBorderColorKeys = new String[] {
+					"CheckBox.icon.focusedBorderColor",
+					"CheckBox.icon.selectedFocusedBorderColor",
+					"CheckBox.icon[filled].focusedBorderColor",
+					"CheckBox.icon[filled].selectedFocusedBorderColor",
+				};
+				for( String key : focusedBorderColorKeys ) {
+					Color color = defaults.getColor( key );
+					if( color != null ) {
+						defaults.put( key, new ColorUIResource( new Color(
+							(color.getRGB() & 0xffffff) | 0xa6000000, true ) ) );
+					}
+				}
+			}
 		}
 	}
 
+	private void copyIfNotSet( UIDefaults defaults, String destKey, String srcKey, Set<String> uiKeys ) {
+		if( !uiKeys.contains( destKey ) )
+			defaults.put( destKey, defaults.get( srcKey ) );
+	}
+
+	/** Rename UI default keys (key --> value). */
 	private static Map<String, String> uiKeyMapping = new HashMap<>();
+	/** Copy UI default keys (value --> key). */
 	private static Map<String, String> uiKeyCopying = new HashMap<>();
 	private static Map<String, String> uiKeyInverseMapping = new HashMap<>();
 	private static Map<String, String> checkboxKeyMapping = new HashMap<>();
@@ -505,6 +545,7 @@ public class IntelliJTheme
 		uiKeyCopying.put( "CheckBoxMenuItem.margin",    "MenuItem.margin" );
 		uiKeyCopying.put( "RadioButtonMenuItem.margin", "MenuItem.margin" );
 		uiKeyMapping.put( "PopupMenu.border",           "PopupMenu.borderInsets" );
+		uiKeyCopying.put( "MenuItem.underlineSelectionColor", "TabbedPane.underlineColor" );
 
 		// IDEA uses List.selectionBackground also for menu selection
 		uiKeyCopying.put( "Menu.selectionBackground",                "List.selectionBackground" );
@@ -529,6 +570,9 @@ public class IntelliJTheme
 
 		// Slider
 		uiKeyMapping.put( "Slider.trackWidth", "" ); // ignore (used in Material Theme UI Lite)
+		uiKeyCopying.put( "Slider.trackValueColor", "ProgressBar.foreground" );
+		uiKeyCopying.put( "Slider.thumbColor", "ProgressBar.foreground" );
+		uiKeyCopying.put( "Slider.trackColor", "ProgressBar.background" );
 
 		// TitlePane
 		uiKeyCopying.put( "TitlePane.inactiveBackground",     "TitlePane.background" );
@@ -583,7 +627,7 @@ public class IntelliJTheme
 
 		@Override
 		public String getDescription() {
-			return theme.name;
+			return getName();
 		}
 
 		@Override

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

@@ -70,7 +70,7 @@ class UIDefaultsLoader
 	private static final String VARIABLE_PREFIX = "@";
 	private static final String PROPERTY_PREFIX = "$";
 	private static final String OPTIONAL_PREFIX = "?";
-	private static final String GLOBAL_PREFIX = "*.";
+	private static final String WILDCARD_PREFIX = "*.";
 
 	static void loadDefaultsFromProperties( Class<?> lookAndFeelClass, List<FlatDefaultsAddon> addons,
 		Properties additionalDefaults, boolean dark, UIDefaults defaults )
@@ -119,7 +119,7 @@ class UIDefaultsLoader
 					addonClassLoaders.add( addonClassLoader );
 			}
 
-			// load custom properties files (usually provides by applications)
+			// load custom properties files (usually provided by applications)
 			List<Object> customDefaultsSources = FlatLaf.getCustomDefaultsSources();
 			int size = (customDefaultsSources != null) ? customDefaultsSources.size() : 0;
 			for( int i = 0; i < size; i++ ) {
@@ -198,27 +198,30 @@ class UIDefaultsLoader
 				}
 			}
 
-			// get (and remove) globals, which override all other defaults that end with same suffix
-			HashMap<String, String> globals = new HashMap<>();
+			// get (and remove) wildcard replacements, which override all other defaults that end with same suffix
+			HashMap<String, String> wildcards = new HashMap<>();
 			Iterator<Entry<Object, Object>> it = properties.entrySet().iterator();
 			while( it.hasNext() ) {
 				Entry<Object, Object> e = it.next();
 				String key = (String) e.getKey();
-				if( key.startsWith( GLOBAL_PREFIX ) ) {
-					globals.put( key.substring( GLOBAL_PREFIX.length() ), (String) e.getValue() );
+				if( key.startsWith( WILDCARD_PREFIX ) ) {
+					wildcards.put( key.substring( WILDCARD_PREFIX.length() ), (String) e.getValue() );
 					it.remove();
 				}
 			}
 
-			// override UI defaults with globals
-			for( Object okey : defaults.keySet() ) {
-				if( okey instanceof String && ((String)okey).contains( "." ) ) {
-					String key = (String) okey;
-					String globalKey = key.substring( key.lastIndexOf( '.' ) + 1 );
-					String globalValue = globals.get( globalKey );
-					if( globalValue != null && !properties.containsKey( key ) )
-						properties.put( key, globalValue );
-				}
+			// override UI defaults with wildcard replacements
+			for( Object key : defaults.keySet() ) {
+				int dot;
+				if( !(key instanceof String) ||
+					properties.containsKey( key ) ||
+					(dot = ((String)key).lastIndexOf( '.' )) < 0 )
+				  continue;
+
+				String wildcardKey = ((String)key).substring( dot + 1 );
+				String wildcardValue = wildcards.get( wildcardKey );
+				if( wildcardValue != null )
+					properties.put( key, wildcardValue );
 			}
 
 			Function<String, String> propertiesGetter = key -> {
@@ -338,7 +341,12 @@ class UIDefaultsLoader
 
 		// determine value type from key
 		if( valueType == ValueType.UNKNOWN ) {
-			if( key.endsWith( "ground" ) || key.endsWith( "Color" ) )
+			if( key.endsWith( "UI" ) )
+				valueType = ValueType.STRING;
+			else if( key.endsWith( "Color" ) ||
+				(key.endsWith( "ground" ) &&
+				 (key.endsWith( ".background" ) || key.endsWith( "Background" ) ||
+				  key.endsWith( ".foreground" ) || key.endsWith( "Foreground" ))) )
 				valueType = ValueType.COLOR;
 			else if( key.endsWith( ".border" ) || key.endsWith( "Border" ) )
 				valueType = ValueType.BORDER;
@@ -353,8 +361,6 @@ class UIDefaultsLoader
 				valueType = ValueType.INTEGER;
 			else if( key.endsWith( "Char" ) )
 				valueType = ValueType.CHARACTER;
-			else if( key.endsWith( "UI" ) )
-				valueType = ValueType.STRING;
 			else if( key.endsWith( "grayFilter" ) )
 				valueType = ValueType.GRAYFILTER;
 		}
@@ -583,13 +589,17 @@ class UIDefaultsLoader
 			case "darken":		return parseColorHSLIncreaseDecrease( 2, false, params, resolver, reportError );
 			case "saturate":	return parseColorHSLIncreaseDecrease( 1, true, params, resolver, reportError );
 			case "desaturate":	return parseColorHSLIncreaseDecrease( 1, false, params, resolver, reportError );
+			case "fadein":		return parseColorHSLIncreaseDecrease( 3, true, params, resolver, reportError );
+			case "fadeout":		return parseColorHSLIncreaseDecrease( 3, false, params, resolver, reportError );
+			case "fade":		return parseColorFade( params, resolver, reportError );
+			case "spin":		return parseColorSpin( params, resolver, reportError );
 		}
 
 		throw new IllegalArgumentException( "unknown color function '" + value + "'" );
 	}
 
 	/**
-	 * Syntax: rgb(red,green,blue) or rgba(red,green,blue,alpha) or rgba(color,alpha)
+	 * Syntax: rgb(red,green,blue) or rgba(red,green,blue,alpha)
 	 *   - red:   an integer 0-255 or a percentage 0-100%
 	 *   - green: an integer 0-255 or a percentage 0-100%
 	 *   - blue:  an integer 0-255 or a percentage 0-100%
@@ -600,6 +610,8 @@ class UIDefaultsLoader
 	{
 		if( hasAlpha && params.size() == 2 ) {
 			// syntax rgba(color,alpha), which allows adding alpha to any color
+			// NOTE: this syntax is deprecated
+			//       use fade(color,alpha) instead
 			String colorStr = params.get( 0 );
 			int alpha = parseInteger( params.get( 1 ), 0, 255, true );
 
@@ -636,7 +648,8 @@ class UIDefaultsLoader
 
 	/**
 	 * Syntax: lighten(color,amount[,options]) or darken(color,amount[,options]) or
-	 *         saturate(color,amount[,options]) or desaturate(color,amount[,options])
+	 *         saturate(color,amount[,options]) or desaturate(color,amount[,options]) or
+	 *         fadein(color,amount[,options]) or fadeout(color,amount[,options])
 	 *   - color: a color (e.g. #f00) or a color function
 	 *   - amount: percentage 0-100%
 	 *   - options: [relative] [autoInverse] [noAutoInverse] [lazy] [derived]
@@ -676,6 +689,59 @@ class UIDefaultsLoader
 			};
 		}
 
+		// parse base color, apply function and create derived color
+		return parseFunctionBaseColor( colorStr, function, derived, resolver, reportError );
+	}
+
+	/**
+	 * Syntax: fade(color,amount[,options])
+	 *   - color: a color (e.g. #f00) or a color function
+	 *   - amount: percentage 0-100%
+	 *   - options: [derived]
+	 */
+	private static Object parseColorFade( List<String> params, Function<String, String> resolver, boolean reportError ) {
+		String colorStr = params.get( 0 );
+		int amount = parsePercentage( params.get( 1 ) );
+		boolean derived = false;
+
+		if( params.size() > 2 ) {
+			String options = params.get( 2 );
+			derived = options.contains( "derived" );
+		}
+
+		// create function
+		ColorFunction function = new ColorFunctions.Fade( amount );
+
+		// parse base color, apply function and create derived color
+		return parseFunctionBaseColor( colorStr, function, derived, resolver, reportError );
+	}
+
+	/**
+	 * Syntax: spin(color,angle[,options])
+	 *   - color: a color (e.g. #f00) or a color function
+	 *   - angle: number of degrees to rotate
+	 *   - options: [derived]
+	 */
+	private static Object parseColorSpin( List<String> params, Function<String, String> resolver, boolean reportError ) {
+		String colorStr = params.get( 0 );
+		int amount = parseInteger( params.get( 1 ), true );
+		boolean derived = false;
+
+		if( params.size() > 2 ) {
+			String options = params.get( 2 );
+			derived = options.contains( "derived" );
+		}
+
+		// create function
+		ColorFunction function = new ColorFunctions.HSLIncreaseDecrease( 0, true, amount, false, false );
+
+		// parse base color, apply function and create derived color
+		return parseFunctionBaseColor( colorStr, function, derived, resolver, reportError );
+	}
+
+	private static Object parseFunctionBaseColor( String colorStr, ColorFunction function,
+		boolean derived, Function<String, String> resolver, boolean reportError )
+	{
 		// parse base color
 		String resolvedColorStr = resolver.apply( colorStr );
 		ColorUIResource baseColor = (ColorUIResource) parseColorOrFunction( resolvedColorStr, resolver, reportError );

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

@@ -0,0 +1,55 @@
+/*
+ * 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.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import com.formdev.flatlaf.util.AnimatedIcon;
+
+/**
+ * Base class for animated icons that scales width and height, creates and initializes
+ * a scaled graphics context for icon painting.
+ * <p>
+ * Subclasses do not need to scale icon painting.
+ * <p>
+ * This class does not store any state information (needed for animation) in its instance.
+ * Instead a client property is set on the painted component.
+ * This makes it possible to use a share icon instance for multiple components.
+ *
+ * @author Karl Tauber
+ */
+public abstract class FlatAnimatedIcon
+	extends FlatAbstractIcon
+	implements AnimatedIcon
+{
+	public FlatAnimatedIcon( int width, int height, Color color ) {
+		super( width, height, color );
+	}
+
+	@Override
+	public void paintIcon( Component c, Graphics g, int x, int y ) {
+		super.paintIcon( c, g, x, y );
+		AnimatedIcon.AnimationSupport.saveIconLocation( this, c, x, y );
+	}
+
+	@Override
+	protected void paintIcon( Component c, Graphics2D g ) {
+		AnimatedIcon.AnimationSupport.paintIcon( this, c, g, 0, 0 );
+	}
+}

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

@@ -27,7 +27,7 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
 /**
  * "ascendingSort" icon for {@link javax.swing.table.JTableHeader}.
  *
- * @uiDefault Component.arrowType				String	triangle (default) or chevron
+ * @uiDefault Component.arrowType				String	chevron (default) or triangle
  * @uiDefault Table.sortIconColor				Color
  *
  * @author Karl Tauber
@@ -35,7 +35,7 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
 public class FlatAscendingSortIcon
 	extends FlatAbstractIcon
 {
-	protected final boolean chevron = "chevron".equals( UIManager.getString( "Component.arrowType" ) );
+	protected final boolean chevron = FlatUIUtils.isChevron( UIManager.getString( "Component.arrowType" ) );
 	protected final Color sortIconColor = UIManager.getColor( "Table.sortIconColor" );
 
 	public FlatAscendingSortIcon() {

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

@@ -49,15 +49,16 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
  * @uiDefault CheckBox.icon.disabledBorderColor			Color
  * @uiDefault CheckBox.icon.disabledBackground			Color
  * @uiDefault CheckBox.icon.disabledCheckmarkColor		Color
- * @uiDefault CheckBox.icon.focusedBorderColor			Color
+ * @uiDefault CheckBox.icon.focusedBorderColor			Color	optional
  * @uiDefault CheckBox.icon.focusedBackground			Color	optional
- * @uiDefault CheckBox.icon.selectedFocusedBorderColor	Color	optional
- * @uiDefault CheckBox.icon.selectedFocusedBackground	Color	optional
+ * @uiDefault CheckBox.icon.selectedFocusedBorderColor	Color	optional; CheckBox.icon.focusedBorderColor is used if not specified
+ * @uiDefault CheckBox.icon.selectedFocusedBackground	Color	optional; CheckBox.icon.focusedBackground is used if not specified
+ * @uiDefault CheckBox.icon.selectedFocusedCheckmarkColor	Color	optional; CheckBox.icon.checkmarkColor is used if not specified
  * @uiDefault CheckBox.icon.hoverBorderColor			Color	optional
  * @uiDefault CheckBox.icon.hoverBackground				Color	optional
- * @uiDefault CheckBox.icon.selectedHoverBackground		Color	optional
+ * @uiDefault CheckBox.icon.selectedHoverBackground		Color	optional; CheckBox.icon.hoverBackground is used if not specified
  * @uiDefault CheckBox.icon.pressedBackground			Color	optional
- * @uiDefault CheckBox.icon.selectedPressedBackground	Color	optional
+ * @uiDefault CheckBox.icon.selectedPressedBackground	Color	optional; CheckBox.icon.pressedBackground is used if not specified
  * @uiDefault CheckBox.arc								int
  *
  * @author Karl Tauber
@@ -129,78 +130,108 @@ public class FlatCheckBoxIcon
 	}
 
 	@Override
-	protected void paintIcon( Component c, Graphics2D g2 ) {
-		boolean indeterminate = c instanceof JComponent && clientPropertyEquals( (JComponent) c, SELECTED_STATE, SELECTED_STATE_INDETERMINATE );
-		boolean selected = indeterminate || (c instanceof AbstractButton && ((AbstractButton)c).isSelected());
+	protected void paintIcon( Component c, Graphics2D g ) {
+		boolean indeterminate = isIndeterminate( c );
+		boolean selected = indeterminate || isSelected( c );
 		boolean isFocused = FlatUIUtils.isPermanentFocusOwner( c );
 
 		// paint focused border
 		if( isFocused && focusWidth > 0 && FlatButtonUI.isFocusPainted( c ) ) {
-			g2.setColor( focusColor );
-			paintFocusBorder( g2 );
+			g.setColor( getFocusColor( c ) );
+			paintFocusBorder( c, g );
 		}
 
 		// paint border
-		g2.setColor( FlatButtonUI.buttonStateColor( c,
-			selected ? selectedBorderColor : borderColor,
-			disabledBorderColor,
-			selected && selectedFocusedBorderColor != null ? selectedFocusedBorderColor : focusedBorderColor,
-			hoverBorderColor,
-			null ) );
-		paintBorder( g2 );
+		g.setColor( getBorderColor( c, selected ) );
+		paintBorder( c, g );
 
 		// paint background
-		g2.setColor( FlatUIUtils.deriveColor( FlatButtonUI.buttonStateColor( c,
-			selected ? selectedBackground : background,
-			disabledBackground,
-			(selected && selectedFocusedBackground != null) ? selectedFocusedBackground : focusedBackground,
-			(selected && selectedHoverBackground != null) ? selectedHoverBackground : hoverBackground,
-			(selected && selectedPressedBackground != null) ? selectedPressedBackground : pressedBackground ),
-			background ) );
-		paintBackground( g2 );
+		Color bg = FlatUIUtils.deriveColor( getBackground( c, selected ),
+			selected ? selectedBackground : background );
+		if( bg.getAlpha() < 255 ) {
+			// fill background with default color before filling with non-opaque background
+			g.setColor( selected ? selectedBackground : background );
+			paintBackground( c, g );
+		}
+		g.setColor( bg );
+		paintBackground( c, g );
 
 		// paint checkmark
 		if( selected || indeterminate ) {
-			g2.setColor( c.isEnabled()
-				? ((selected && isFocused && selectedFocusedCheckmarkColor != null)
-					? selectedFocusedCheckmarkColor
-					: checkmarkColor)
-				: disabledCheckmarkColor );
+			g.setColor( getCheckmarkColor( c, selected, isFocused ) );
 			if( indeterminate )
-				paintIndeterminate( g2 );
+				paintIndeterminate( c, g );
 			else
-				paintCheckmark( g2 );
+				paintCheckmark( c, g );
 		}
 	}
 
-	protected void paintFocusBorder( Graphics2D g2 ) {
+	protected void paintFocusBorder( Component c, Graphics2D g ) {
 		// the outline focus border is painted outside of the icon
 		int wh = ICON_SIZE - 1 + (focusWidth * 2);
 		int arcwh = arc + (focusWidth * 2);
-		g2.fillRoundRect( -focusWidth + 1, -focusWidth, wh, wh, arcwh, arcwh );
+		g.fillRoundRect( -focusWidth + 1, -focusWidth, wh, wh, arcwh, arcwh );
 	}
 
-	protected void paintBorder( Graphics2D g2 ) {
+	protected void paintBorder( Component c, Graphics2D g ) {
 		int arcwh = arc;
-		g2.fillRoundRect( 1, 0, 14, 14, arcwh, arcwh );
+		g.fillRoundRect( 1, 0, 14, 14, arcwh, arcwh );
 	}
 
-	protected void paintBackground( Graphics2D g2 ) {
+	protected void paintBackground( Component c, Graphics2D g ) {
 		int arcwh = arc - 1;
-		g2.fillRoundRect( 2, 1, 12, 12, arcwh, arcwh );
+		g.fillRoundRect( 2, 1, 12, 12, arcwh, arcwh );
 	}
 
-	protected void paintCheckmark( Graphics2D g2 ) {
+	protected void paintCheckmark( Component c, Graphics2D g ) {
 		Path2D.Float path = new Path2D.Float();
 		path.moveTo( 4.5f, 7.5f );
 		path.lineTo( 6.6f, 10f );
 		path.lineTo( 11.25f, 3.5f );
 
-		g2.setStroke( new BasicStroke( 1.9f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND ) );
-		g2.draw( path );
+		g.setStroke( new BasicStroke( 1.9f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND ) );
+		g.draw( path );
 	}
 
-	protected void paintIndeterminate( Graphics2D g2 ) {
-		g2.fill( new RoundRectangle2D.Float( 3.75f, 5.75f, 8.5f, 2.5f, 2f, 2f ) );
+	protected void paintIndeterminate( Component c, Graphics2D g ) {
+		g.fill( new RoundRectangle2D.Float( 3.75f, 5.75f, 8.5f, 2.5f, 2f, 2f ) );
+	}
+
+	protected boolean isIndeterminate( Component c ) {
+		return c instanceof JComponent && clientPropertyEquals( (JComponent) c, SELECTED_STATE, SELECTED_STATE_INDETERMINATE );
+	}
+
+	protected boolean isSelected( Component c ) {
+		return c instanceof AbstractButton && ((AbstractButton)c).isSelected();
+	}
+
+	protected Color getFocusColor( Component c ) {
+		return focusColor;
+	}
+
+	protected Color getBorderColor( Component c, boolean selected ) {
+		return FlatButtonUI.buttonStateColor( c,
+			selected ? selectedBorderColor : borderColor,
+			disabledBorderColor,
+			selected && selectedFocusedBorderColor != null ? selectedFocusedBorderColor : focusedBorderColor,
+			hoverBorderColor,
+			null );
+	}
+
+	protected Color getBackground( Component c, boolean selected ) {
+		return FlatButtonUI.buttonStateColor( c,
+			selected ? selectedBackground : background,
+			disabledBackground,
+			(selected && selectedFocusedBackground != null) ? selectedFocusedBackground : focusedBackground,
+			(selected && selectedHoverBackground != null) ? selectedHoverBackground : hoverBackground,
+			(selected && selectedPressedBackground != null) ? selectedPressedBackground : pressedBackground );
+	}
+
+	protected Color getCheckmarkColor( Component c, boolean selected, boolean isFocused ) {
+		return c.isEnabled()
+			? ((selected && isFocused && selectedFocusedCheckmarkColor != null)
+				? selectedFocusedCheckmarkColor
+				: checkmarkColor)
+			: disabledCheckmarkColor;
 	}
 }

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

@@ -27,7 +27,7 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
 /**
  * "descendingSort" icon for {@link javax.swing.table.JTableHeader}.
  *
- * @uiDefault Component.arrowType				String	triangle (default) or chevron
+ * @uiDefault Component.arrowType				String	chevron (default) or triangle
  * @uiDefault Table.sortIconColor				Color
  *
  * @author Karl Tauber
@@ -35,7 +35,7 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
 public class FlatDescendingSortIcon
 	extends FlatAbstractIcon
 {
-	protected final boolean chevron = "chevron".equals( UIManager.getString( "Component.arrowType" ) );
+	protected final boolean chevron = FlatUIUtils.isChevron( UIManager.getString( "Component.arrowType" ) );
 	protected final Color sortIconColor = UIManager.getColor( "Table.sortIconColor" );
 
 	public FlatDescendingSortIcon() {

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

@@ -31,6 +31,8 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
  *
  * @uiDefault Component.focusWidth						int
  * @uiDefault Component.focusColor						Color
+ * @uiDefault HelpButton.innerFocusWidth				int or float	optional; defaults to Component.innerFocusWidth
+ * @uiDefault HelpButton.borderWidth					int		optional; default is 1
  * @uiDefault HelpButton.borderColor					Color
  * @uiDefault HelpButton.disabledBorderColor			Color
  * @uiDefault HelpButton.focusedBorderColor				Color
@@ -50,6 +52,8 @@ public class FlatHelpButtonIcon
 {
 	protected final int focusWidth = UIManager.getInt( "Component.focusWidth" );
 	protected final Color focusColor = UIManager.getColor( "Component.focusColor" );
+	protected final float innerFocusWidth = FlatUIUtils.getUIFloat( "HelpButton.innerFocusWidth", FlatUIUtils.getUIFloat( "Component.innerFocusWidth", 0 ) );
+	protected final int borderWidth = FlatUIUtils.getUIInt( "HelpButton.borderWidth", 1 );
 
 	protected final Color borderColor = UIManager.getColor( "HelpButton.borderColor" );
 	protected final Color disabledBorderColor = UIManager.getColor( "HelpButton.disabledBorderColor" );
@@ -84,12 +88,18 @@ public class FlatHelpButtonIcon
 		boolean enabled = c.isEnabled();
 		boolean focused = FlatUIUtils.isPermanentFocusOwner( c );
 
-		// paint focused border
+		float xy = 0.5f;
+		float wh = iconSize - 1;
+
+		// paint outer focus border
 		if( focused && FlatButtonUI.isFocusPainted( c ) ) {
 			g2.setColor( focusColor );
-			g2.fill( new Ellipse2D.Float( 0.5f, 0.5f, iconSize - 1, iconSize - 1 ) );
+			g2.fill( new Ellipse2D.Float( xy, xy, wh, wh ) );
 		}
 
+		xy += focusWidth;
+		wh -= (focusWidth * 2);
+
 		// paint border
 		g2.setColor( FlatButtonUI.buttonStateColor( c,
 			borderColor,
@@ -97,7 +107,19 @@ public class FlatHelpButtonIcon
 			focusedBorderColor,
 			hoverBorderColor,
 			null ) );
-		g2.fill( new Ellipse2D.Float( focusWidth + 0.5f, focusWidth + 0.5f, 21, 21 ) );
+		g2.fill( new Ellipse2D.Float( xy, xy, wh, wh ) );
+
+		xy += borderWidth;
+		wh -= (borderWidth * 2);
+
+		// paint inner focus border
+		if( innerFocusWidth > 0 && focused && FlatButtonUI.isFocusPainted( c ) ) {
+			g2.setColor( focusColor );
+			g2.fill( new Ellipse2D.Float( xy, xy, wh, wh ) );
+
+			xy += innerFocusWidth;
+			wh -= (innerFocusWidth * 2);
+		}
 
 		// paint background
 		g2.setColor( FlatUIUtils.deriveColor( FlatButtonUI.buttonStateColor( c,
@@ -106,7 +128,7 @@ public class FlatHelpButtonIcon
 			focusedBackground,
 			hoverBackground,
 			pressedBackground ), background ) );
-		g2.fill( new Ellipse2D.Float( focusWidth + 1.5f, focusWidth + 1.5f, 19, 19 ) );
+		g2.fill( new Ellipse2D.Float( xy, xy, wh, wh ) );
 
 		// paint question mark
 		Path2D q = new Path2D.Float();

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

@@ -28,7 +28,7 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
 /**
  * "arrow" icon for {@link javax.swing.JMenu}.
  *
- * @uiDefault Component.arrowType				String	triangle (default) or chevron
+ * @uiDefault Component.arrowType				String	chevron (default) or triangle
  * @uiDefault Menu.icon.arrowColor				Color
  * @uiDefault Menu.icon.disabledArrowColor		Color
  * @uiDefault Menu.selectionForeground			Color
@@ -39,7 +39,7 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
 public class FlatMenuArrowIcon
 	extends FlatAbstractIcon
 {
-	protected final boolean chevron = "chevron".equals( UIManager.getString( "Component.arrowType" ) );
+	protected final boolean chevron = FlatUIUtils.isChevron( UIManager.getString( "Component.arrowType" ) );
 	protected final Color arrowColor = UIManager.getColor( "Menu.icon.arrowColor" );
 	protected final Color disabledArrowColor = UIManager.getColor( "Menu.icon.disabledArrowColor" );
 	protected final Color selectionForeground = UIManager.getColor( "Menu.selectionForeground" );

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

@@ -16,6 +16,7 @@
 
 package com.formdev.flatlaf.icons;
 
+import java.awt.Component;
 import java.awt.Graphics2D;
 import java.awt.geom.Ellipse2D;
 
@@ -36,25 +37,25 @@ public class FlatRadioButtonIcon
 	protected final int centerDiameter = getUIInt( "RadioButton.icon.centerDiameter", 8, style );
 
 	@Override
-	protected void paintFocusBorder( Graphics2D g2 ) {
+	protected void paintFocusBorder( Component c, Graphics2D g ) {
 		// the outline focus border is painted outside of the icon
 		int wh = ICON_SIZE + (focusWidth * 2);
-		g2.fillOval( -focusWidth, -focusWidth, wh, wh );
+		g.fillOval( -focusWidth, -focusWidth, wh, wh );
 	}
 
 	@Override
-	protected void paintBorder( Graphics2D g2 ) {
-		g2.fillOval( 0, 0, 15, 15 );
+	protected void paintBorder( Component c, Graphics2D g ) {
+		g.fillOval( 0, 0, 15, 15 );
 	}
 
 	@Override
-	protected void paintBackground( Graphics2D g2 ) {
-		g2.fillOval( 1, 1, 13, 13 );
+	protected void paintBackground( Component c, Graphics2D g ) {
+		g.fillOval( 1, 1, 13, 13 );
 	}
 
 	@Override
-	protected void paintCheckmark( Graphics2D g2 ) {
+	protected void paintCheckmark( Component c, Graphics2D g ) {
 		float xy = (ICON_SIZE - centerDiameter) / 2f;
-		g2.fill( new Ellipse2D.Float( xy, xy, centerDiameter, centerDiameter ) );
+		g.fill( new Ellipse2D.Float( xy, xy, centerDiameter, centerDiameter ) );
 	}
 }

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

@@ -0,0 +1,91 @@
+/*
+ * 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.BasicStroke;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.geom.Line2D;
+import java.awt.geom.Path2D;
+import javax.swing.UIManager;
+import com.formdev.flatlaf.ui.FlatButtonUI;
+import com.formdev.flatlaf.ui.FlatUIUtils;
+
+/**
+ * "close" icon for closable tabs in {@link javax.swing.JTabbedPane}.
+ *
+ * @uiDefault TabbedPane.closeSize						Dimension
+ * @uiDefault TabbedPane.closeArc						int
+ * @uiDefault TabbedPane.closeCrossPlainSize			float
+ * @uiDefault TabbedPane.closeCrossFilledSize			float
+ * @uiDefault TabbedPane.closeCrossLineWidth			float
+ * @uiDefault TabbedPane.closeBackground				Color
+ * @uiDefault TabbedPane.closeForeground				Color
+ * @uiDefault TabbedPane.closeHoverBackground			Color
+ * @uiDefault TabbedPane.closeHoverForeground			Color
+ * @uiDefault TabbedPane.closePressedBackground			Color
+ * @uiDefault TabbedPane.closePressedForeground			Color
+ *
+ * @author Karl Tauber
+ */
+public class FlatTabbedPaneCloseIcon
+	extends FlatAbstractIcon
+{
+	protected final Dimension size = UIManager.getDimension( "TabbedPane.closeSize" );
+	protected final int arc = UIManager.getInt( "TabbedPane.closeArc" );
+	protected final float crossPlainSize = FlatUIUtils.getUIFloat( "TabbedPane.closeCrossPlainSize", 7.5f );
+	protected final float crossFilledSize = FlatUIUtils.getUIFloat( "TabbedPane.closeCrossFilledSize", crossPlainSize );
+	protected final float closeCrossLineWidth = FlatUIUtils.getUIFloat( "TabbedPane.closeCrossLineWidth", 1f );
+	protected final Color background = UIManager.getColor( "TabbedPane.closeBackground" );
+	protected final Color foreground = UIManager.getColor( "TabbedPane.closeForeground" );
+	protected final Color hoverBackground = UIManager.getColor( "TabbedPane.closeHoverBackground" );
+	protected final Color hoverForeground = UIManager.getColor( "TabbedPane.closeHoverForeground" );
+	protected final Color pressedBackground = UIManager.getColor( "TabbedPane.closePressedBackground" );
+	protected final Color pressedForeground = UIManager.getColor( "TabbedPane.closePressedForeground" );
+
+	public FlatTabbedPaneCloseIcon() {
+		super( 16, 16, null );
+	}
+
+	@Override
+	protected void paintIcon( Component c, Graphics2D g ) {
+		// paint background
+		Color bg = FlatButtonUI.buttonStateColor( c, background, null, null, hoverBackground, pressedBackground );
+		if( bg != null ) {
+			g.setColor( FlatUIUtils.deriveColor( bg, c.getBackground() ) );
+			g.fillRoundRect( (width - size.width) / 2, (height - size.height) / 2,
+				size.width, size.height, arc, arc );
+		}
+
+		// set cross color
+		Color fg = FlatButtonUI.buttonStateColor( c, foreground, null, null, hoverForeground, pressedForeground );
+		g.setColor( FlatUIUtils.deriveColor( fg, c.getForeground() ) );
+
+		float mx = width / 2;
+		float my = height / 2;
+		float r = ((bg != null) ? crossFilledSize : crossPlainSize) / 2;
+
+		// paint cross
+		Path2D path = new Path2D.Float( Path2D.WIND_EVEN_ODD );
+		path.append( new Line2D.Float( mx - r, my - r, mx + r, my + r ), false );
+		path.append( new Line2D.Float( mx - r, my + r, mx + r, my - r ), false );
+		g.setStroke( new BasicStroke( closeCrossLineWidth ) );
+		g.draw( path );
+	}
+}

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

@@ -25,7 +25,7 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
 /**
  * "collapsed" icon for {@link javax.swing.JTree}.
  *
- * @uiDefault Component.arrowType				String	triangle (default) or chevron
+ * @uiDefault Component.arrowType				String	chevron (default) or triangle
  * @uiDefault Tree.icon.collapsedColor			Color
  *
  * @author Karl Tauber
@@ -41,7 +41,7 @@ public class FlatTreeCollapsedIcon
 
 	FlatTreeCollapsedIcon( Color color ) {
 		super( 11, 11, color );
-		chevron = "chevron".equals( UIManager.getString( "Component.arrowType" ) );
+		chevron = FlatUIUtils.isChevron( UIManager.getString( "Component.arrowType" ) );
 	}
 
 	@Override

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

@@ -42,12 +42,13 @@ public class FlatArrowButton
 {
 	public static final int DEFAULT_ARROW_WIDTH = 8;
 
-	private final boolean chevron;
-	private final Color foreground;
-	private final Color disabledForeground;
-	private final Color hoverForeground;
-	private final Color hoverBackground;
-	private final Color pressedBackground;
+	protected final boolean chevron;
+	protected final Color foreground;
+	protected final Color disabledForeground;
+	protected final Color hoverForeground;
+	protected final Color hoverBackground;
+	protected final Color pressedForeground;
+	protected final Color pressedBackground;
 
 	private int arrowWidth = DEFAULT_ARROW_WIDTH;
 	private int xOffset = 0;
@@ -57,27 +58,24 @@ public class FlatArrowButton
 	private boolean pressed;
 
 	public FlatArrowButton( int direction, String type, Color foreground, Color disabledForeground,
-		Color hoverForeground, Color hoverBackground )
-	{
-		this( direction, type, foreground, disabledForeground, hoverForeground, hoverBackground, null );
-	}
-
-	public FlatArrowButton( int direction, String type, Color foreground, Color disabledForeground,
-		Color hoverForeground, Color hoverBackground, Color pressedBackground )
+		Color hoverForeground, Color hoverBackground, Color pressedForeground, Color pressedBackground )
 	{
 		super( direction, Color.WHITE, Color.WHITE, Color.WHITE, Color.WHITE );
 
-		this.chevron = "chevron".equals( type );
+		this.chevron = FlatUIUtils.isChevron( type );
 		this.foreground = foreground;
 		this.disabledForeground = disabledForeground;
 		this.hoverForeground = hoverForeground;
 		this.hoverBackground = hoverBackground;
+		this.pressedForeground = pressedForeground;
 		this.pressedBackground = pressedBackground;
 
 		setOpaque( false );
 		setBorder( null );
 
-		if( hoverForeground != null || hoverBackground != null || pressedBackground != null ) {
+		if( hoverForeground != null || hoverBackground != null ||
+			pressedForeground != null || pressedBackground != null )
+		{
 			addMouseListener( new MouseAdapter() {
 				@Override
 				public void mouseEntered( MouseEvent e ) {
@@ -142,6 +140,10 @@ public class FlatArrowButton
 		return background;
 	}
 
+	protected Color deriveForeground( Color foreground ) {
+		return FlatUIUtils.deriveColor( foreground, this.foreground );
+	}
+
 	@Override
 	public Dimension getPreferredSize() {
 		return scale( super.getPreferredSize() );
@@ -154,27 +156,40 @@ public class FlatArrowButton
 
 	@Override
 	public void paint( Graphics g ) {
-		Graphics2D g2 = (Graphics2D)g;
-		FlatUIUtils.setRenderingHints( g2 );
-
-		int width = getWidth();
-		int height = getHeight();
-		boolean enabled = isEnabled();
+		Object[] oldRenderingHints = FlatUIUtils.setRenderingHints( g );
 
 		// paint hover or pressed background
-		if( enabled ) {
+		if( isEnabled() ) {
 			Color background = (pressedBackground != null && isPressed())
-				? deriveBackground( pressedBackground )
-				: ((hoverBackground != null && isHover())
-					? deriveBackground( hoverBackground )
+				? pressedBackground
+				: (hoverBackground != null && isHover()
+					? hoverBackground
 					: null);
 
 			if( background != null ) {
-				g.setColor( background );
-				g.fillRect( 0, 0, width, height );
+				g.setColor( deriveBackground( background ) );
+				paintBackground( (Graphics2D) g );
 			}
 		}
 
+		// paint arrow
+		g.setColor( deriveForeground( isEnabled()
+			? (pressedForeground != null && isPressed()
+				? pressedForeground
+				: (hoverForeground != null && isHover()
+					? hoverForeground
+					: foreground))
+			: disabledForeground ) );
+		paintArrow( (Graphics2D) g );
+
+		FlatUIUtils.resetRenderingHints( g, oldRenderingHints );
+	}
+
+	protected void paintBackground( Graphics2D g ) {
+		g.fillRect( 0, 0, getWidth(), getHeight() );
+	}
+
+	protected void paintArrow( Graphics2D g ) {
 		int direction = getDirection();
 		boolean vert = (direction == NORTH || direction == SOUTH);
 
@@ -193,8 +208,8 @@ public class FlatArrowButton
 			rh++;
 		}
 
-		int x = Math.round( (width - rw) / 2f + scale( (float) xOffset ) );
-		int y = Math.round( (height - rh) / 2f + scale( (float) yOffset ) );
+		int x = Math.round( (getWidth() - rw) / 2f + scale( (float) xOffset ) );
+		int y = Math.round( (getHeight() - rh) / 2f + scale( (float) yOffset ) );
 
 		// move arrow for round borders
 		Container parent = getParent();
@@ -202,20 +217,17 @@ public class FlatArrowButton
 			x -= scale( parent.getComponentOrientation().isLeftToRight() ? 1 : -1 );
 
 		// paint arrow
-		g.setColor( enabled
-			? (isHover() && hoverForeground != null ? hoverForeground : foreground)
-			: disabledForeground );
 		g.translate( x, y );
 /*debug
-		debugPaint( g2, vert, rw, rh );
+		debugPaint( g, vert, rw, rh );
 debug*/
 		Shape arrowShape = createArrowShape( direction, chevron, w, h );
 		if( chevron ) {
-			g2.setStroke( new BasicStroke( scale( 1f ) ) );
-			g2.draw( arrowShape );
+			g.setStroke( new BasicStroke( scale( 1f ) ) );
+			g.draw( arrowShape );
 		} else {
 			// triangle
-			g2.fill( arrowShape );
+			g.fill( arrowShape );
 		}
 		g.translate( -x, -y );
 	}

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

@@ -35,7 +35,6 @@ import javax.swing.JViewport;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.plaf.basic.BasicBorders;
-import javax.swing.text.JTextComponent;
 import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.util.DerivedColor;
 
@@ -95,12 +94,14 @@ public class FlatBorder
 			// paint outer border
 			if( outlineColor != null || isFocused( c ) ) {
 				float innerWidth = !isCellEditor( c ) && !(c instanceof JScrollPane)
-					? (outlineColor != null ? innerOutlineWidth : innerFocusWidth)
+					? (outlineColor != null ? innerOutlineWidth : getInnerFocusWidth( c ))
 					: 0;
 
-				g2.setColor( (outlineColor != null) ? outlineColor : getFocusColor( c ) );
-				FlatUIUtils.paintComponentOuterBorder( g2, x, y, width, height,
-					focusWidth, borderWidth + scale( innerWidth ), arc );
+				if( focusWidth > 0 || innerWidth > 0 ) {
+					g2.setColor( (outlineColor != null) ? outlineColor : getFocusColor( c ) );
+					FlatUIUtils.paintComponentOuterBorder( g2, x, y, width, height,
+						focusWidth, borderWidth + scale( innerWidth ), arc );
+				}
 			}
 
 			// paint border
@@ -159,7 +160,7 @@ public class FlatBorder
 				return false;
 		}
 
-		return c.isEnabled() && (!(c instanceof JTextComponent) || ((JTextComponent)c).isEditable());
+		return c.isEnabled();
 	}
 
 	protected boolean isFocused( Component c ) {
@@ -236,6 +237,13 @@ public class FlatBorder
 		return focusWidth;
 	}
 
+	/**
+	 * Returns the (unscaled) thickness of the inner focus border.
+	 */
+	protected float getInnerFocusWidth( Component c ) {
+		return innerFocusWidth;
+	}
+
 	/**
 	 * Returns the (unscaled) line thickness used to compute the border insets.
 	 * This may be different to {@link #getBorderWidth}.

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

@@ -44,6 +44,7 @@ import com.formdev.flatlaf.util.UIScale;
  * @uiDefault Button.default.focusColor			Color
  * @uiDefault Button.borderWidth				int
  * @uiDefault Button.default.borderWidth		int
+ * @uiDefault Button.innerFocusWidth			int or float	optional; defaults to Component.innerFocusWidth
  * @uiDefault Button.toolbar.margin				Insets
  * @uiDefault Button.toolbar.spacingInsets		Insets
  * @uiDefault Button.arc						int
@@ -65,6 +66,7 @@ public class FlatButtonBorder
 	protected final Color defaultFocusColor = UIManager.getColor( "Button.default.focusColor" );
 	protected final int borderWidth = UIManager.getInt( "Button.borderWidth" );
 	protected final int defaultBorderWidth = UIManager.getInt( "Button.default.borderWidth" );
+	protected final float buttonInnerFocusWidth = FlatUIUtils.getUIFloat( "Button.innerFocusWidth", innerFocusWidth );
 	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" );
@@ -134,6 +136,11 @@ public class FlatButtonBorder
 		return FlatToggleButtonUI.isTabButton( c ) ? 0 : super.getFocusWidth( c );
 	}
 
+	@Override
+	protected float getInnerFocusWidth( Component c ) {
+		return buttonInnerFocusWidth;
+	}
+
 	@Override
 	protected int getBorderWidth( Component c ) {
 		return FlatButtonUI.isDefaultButton( c ) ? defaultBorderWidth : borderWidth;

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

@@ -251,18 +251,29 @@ public class FlatButtonUI
 		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));
+			(icon == null && text != null &&
+			 ("...".equals( text ) ||
+			  text.length() == 1 ||
+			  (text.length() == 2 && Character.isSurrogatePair( text.charAt( 0 ), text.charAt( 1 ) ))));
 	}
 
-	// same indices as in parameters to clientPropertyChoice()
 	static final int TYPE_OTHER = -1;
 	static final int TYPE_SQUARE = 0;
 	static final int TYPE_ROUND_RECT = 1;
 
 	static int getButtonType( Component c ) {
-		return (c instanceof AbstractButton)
-			? clientPropertyChoice( (AbstractButton) c, BUTTON_TYPE, BUTTON_TYPE_SQUARE, BUTTON_TYPE_ROUND_RECT )
-			: TYPE_OTHER;
+		if( !(c instanceof AbstractButton) )
+			return TYPE_OTHER;
+
+		Object value = ((AbstractButton)c).getClientProperty( BUTTON_TYPE );
+		if( !(value instanceof String) )
+			return TYPE_OTHER;
+
+		switch( (String) value ) {
+			case BUTTON_TYPE_SQUARE:		return TYPE_SQUARE;
+			case BUTTON_TYPE_ROUND_RECT:	return TYPE_ROUND_RECT;
+			default:						return TYPE_OTHER;
+		}
 	}
 
 	static boolean isHelpButton( Component c ) {
@@ -399,8 +410,13 @@ public class FlatButtonUI
 			if( model.isRollover() )
 				return toolbarHoverBackground;
 
-			// use background of toolbar
-			return c.getParent().getBackground();
+			// use component background if explicitly set
+			Color bg = c.getBackground();
+			if( isCustomBackground( bg ) )
+				return bg;
+
+			// do not paint background
+			return null;
 		}
 
 		boolean def = isDefaultButton( c );

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

@@ -36,13 +36,15 @@ public class FlatCaret
 	implements UIResource
 {
 	private final String selectAllOnFocusPolicy;
+	private final boolean selectAllOnMouseClick;
 
 	private boolean wasFocused;
 	private boolean wasTemporaryLost;
 	private boolean isMousePressed;
 
-	public FlatCaret( String selectAllOnFocusPolicy ) {
+	public FlatCaret( String selectAllOnFocusPolicy, boolean selectAllOnMouseClick ) {
 		this.selectAllOnFocusPolicy = selectAllOnFocusPolicy;
+		this.selectAllOnMouseClick = selectAllOnMouseClick;
 	}
 
 	@Override
@@ -61,7 +63,7 @@ public class FlatCaret
 
 	@Override
 	public void focusGained( FocusEvent e ) {
-		if( !wasTemporaryLost && !isMousePressed )
+		if( !wasTemporaryLost && (!isMousePressed || selectAllOnMouseClick) )
 			selectAllOnFocusGained();
 		wasTemporaryLost = false;
 		wasFocused = true;

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

@@ -34,6 +34,8 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.geom.Rectangle2D;
 import java.beans.PropertyChangeEvent;
@@ -85,7 +87,7 @@ import com.formdev.flatlaf.util.UIScale;
  * @uiDefault ComboBox.editorColumns			int
  * @uiDefault ComboBox.maximumRowCount			int
  * @uiDefault ComboBox.buttonStyle				String	auto (default), button or none
- * @uiDefault Component.arrowType				String	triangle (default) or chevron
+ * @uiDefault Component.arrowType				String	chevron (default) or triangle
  * @uiDefault Component.isIntelliJTheme			boolean
  * @uiDefault Component.borderColor				Color
  * @uiDefault Component.disabledBorderColor		Color
@@ -97,6 +99,7 @@ import com.formdev.flatlaf.util.UIScale;
  * @uiDefault ComboBox.buttonArrowColor			Color
  * @uiDefault ComboBox.buttonDisabledArrowColor	Color
  * @uiDefault ComboBox.buttonHoverArrowColor	Color
+ * @uiDefault ComboBox.buttonPressedArrowColor	Color
  *
  * @author Karl Tauber
  */
@@ -120,9 +123,11 @@ public class FlatComboBoxUI
 	protected Color buttonArrowColor;
 	protected Color buttonDisabledArrowColor;
 	protected Color buttonHoverArrowColor;
+	protected Color buttonPressedArrowColor;
 
 	private MouseListener hoverListener;
 	protected boolean hover;
+	protected boolean pressed;
 
 	private WeakReference<Component> lastRendererComponent;
 
@@ -134,13 +139,36 @@ public class FlatComboBoxUI
 	protected void installListeners() {
 		super.installListeners();
 
-		hoverListener = new FlatUIUtils.HoverListener( null, h -> {
-			if( !comboBox.isEditable() ) {
-				hover = h;
-				if( arrowButton != null )
+		hoverListener = new MouseAdapter() {
+			@Override
+			public void mouseEntered( MouseEvent e ) {
+				hover = true;
+				repaintArrowButton();
+			}
+
+			@Override
+			public void mouseExited( MouseEvent e ) {
+				hover = false;
+				repaintArrowButton();
+			}
+
+			@Override
+			public void mousePressed( MouseEvent e ) {
+				pressed = true;
+				repaintArrowButton();
+			}
+
+			@Override
+			public void mouseReleased( MouseEvent e ) {
+				pressed = false;
+				repaintArrowButton();
+			}
+
+			private void repaintArrowButton() {
+				if( arrowButton != null && !comboBox.isEditable() )
 					arrowButton.repaint();
 			}
-		} );
+		};
 		comboBox.addMouseListener( hoverListener );
 	}
 
@@ -175,6 +203,7 @@ public class FlatComboBoxUI
 		buttonArrowColor = UIManager.getColor( "ComboBox.buttonArrowColor" );
 		buttonDisabledArrowColor = UIManager.getColor( "ComboBox.buttonDisabledArrowColor" );
 		buttonHoverArrowColor = UIManager.getColor( "ComboBox.buttonHoverArrowColor" );
+		buttonPressedArrowColor = UIManager.getColor( "ComboBox.buttonPressedArrowColor" );
 
 		// set maximumRowCount
 		int maximumRowCount = UIManager.getInt( "ComboBox.maximumRowCount" );
@@ -203,6 +232,7 @@ public class FlatComboBoxUI
 		buttonArrowColor = null;
 		buttonDisabledArrowColor = null;
 		buttonHoverArrowColor = null;
+		buttonPressedArrowColor = null;
 
 		MigLayoutVisualPadding.uninstall( comboBox );
 	}
@@ -352,7 +382,7 @@ public class FlatComboBoxUI
 			FlatUIUtils.paintParentBackground( g, c );
 
 		Graphics2D g2 = (Graphics2D) g;
-		FlatUIUtils.setRenderingHints( g2 );
+		Object[] oldRenderingHints = FlatUIUtils.setRenderingHints( g2 );
 
 		int width = c.getWidth();
 		int height = c.getHeight();
@@ -386,6 +416,9 @@ public class FlatComboBoxUI
 			g2.fill( new Rectangle2D.Float( lx, focusWidth, lw, height - 1 - (focusWidth * 2)) );
 		}
 
+		// avoid that the "current value" renderer is invoked with enabled antialiasing
+		FlatUIUtils.resetRenderingHints( g2, oldRenderingHints );
+
 		paint( g, c );
 	}
 
@@ -513,19 +546,26 @@ public class FlatComboBoxUI
 		extends FlatArrowButton
 	{
 		protected FlatComboBoxButton() {
-			this( SwingConstants.SOUTH, arrowType, buttonArrowColor, buttonDisabledArrowColor, buttonHoverArrowColor, null, null );
+			this( SwingConstants.SOUTH, arrowType, buttonArrowColor, buttonDisabledArrowColor,
+				buttonHoverArrowColor, null, buttonPressedArrowColor, null );
 		}
 
 		protected FlatComboBoxButton( int direction, String type, Color foreground, Color disabledForeground,
-			Color hoverForeground, Color hoverBackground, Color pressedBackground )
+			Color hoverForeground, Color hoverBackground, Color pressedForeground, Color pressedBackground )
 		{
-			super( direction, type, foreground, disabledForeground, hoverForeground, hoverBackground, pressedBackground );
+			super( direction, type, foreground, disabledForeground,
+				hoverForeground, hoverBackground, pressedForeground, pressedBackground );
 		}
 
 		@Override
 		protected boolean isHover() {
 			return super.isHover() || (!comboBox.isEditable() ? hover : false);
 		}
+
+		@Override
+		protected boolean isPressed() {
+			return super.isPressed() || (!comboBox.isEditable() ? pressed : false);
+		}
 	}
 
 	//---- class FlatComboPopup -----------------------------------------------

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

@@ -45,6 +45,7 @@ import javax.swing.plaf.ComponentUI;
  * @uiDefault Component.isIntelliJTheme					boolean
  * @uiDefault FormattedTextField.placeholderForeground	Color
  * @uiDefault TextComponent.selectAllOnFocusPolicy		String	never, once (default) or always
+ * @uiDefault TextComponent.selectAllOnMouseClick		boolean
  *
  * @author Karl Tauber
  */

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

@@ -20,9 +20,7 @@ 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 java.awt.geom.Rectangle2D;
 import javax.swing.JMenuBar;
 import javax.swing.UIManager;
 
@@ -40,16 +38,8 @@ public class FlatMenuBarBorder
 
 	@Override
 	public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
-		Graphics2D g2 = (Graphics2D) g.create();
-		try {
-			float lineHeight = scale( (float) 1 );
-
-			FlatUIUtils.setRenderingHints( g2 );
-			g2.setColor( borderColor );
-			g2.fill( new Rectangle2D.Float( x, y + height - lineHeight, width, lineHeight ) );
-		} finally {
-			g2.dispose();
-		}
+		float lineHeight = scale( (float) 1 );
+		FlatUIUtils.paintFilledRectangle( g, borderColor, x, y + height - lineHeight, width, lineHeight );
 	}
 
 	@Override

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

@@ -39,6 +39,7 @@ import javax.swing.UIManager;
 import javax.swing.plaf.basic.BasicHTML;
 import javax.swing.text.View;
 import com.formdev.flatlaf.FlatLaf;
+import com.formdev.flatlaf.util.DerivedColor;
 import com.formdev.flatlaf.util.Graphics2DProxy;
 import com.formdev.flatlaf.util.HiDPIUtils;
 import com.formdev.flatlaf.util.SystemInfo;
@@ -55,7 +56,8 @@ import com.formdev.flatlaf.util.SystemInfo;
  * @uiDefault MenuItem.underlineSelectionBackground					Color
  * @uiDefault MenuItem.underlineSelectionCheckBackground			Color
  * @uiDefault MenuItem.underlineSelectionColor						Color
- * @uiDefault MenuItem.underlineSelectionHeight						Color
+ * @uiDefault MenuItem.underlineSelectionHeight						int
+ * @uiDefault MenuItem.selectionBackground							Color
  *
  * @author Karl Tauber
  */
@@ -81,6 +83,8 @@ public class FlatMenuItemRenderer
 	protected final Color underlineSelectionColor = UIManager.getColor( "MenuItem.underlineSelectionColor" );
 	protected final int underlineSelectionHeight = UIManager.getInt( "MenuItem.underlineSelectionHeight" );
 
+	protected final Color selectionBackground = UIManager.getColor( "MenuItem.selectionBackground" );
+
 	protected FlatMenuItemRenderer( JMenuItem menuItem, Icon checkIcon, Icon arrowIcon,
 		Font acceleratorFont, String acceleratorDelimiter )
 	{
@@ -246,8 +250,11 @@ public class FlatMenuItemRenderer
 		g.setColor( Color.orange ); g.drawRect( arrowRect.x, arrowRect.y, arrowRect.width - 1, arrowRect.height - 1 );
 debug*/
 
-		paintBackground( g, selectionBackground );
-		paintIcon( g, iconRect, getIconForPainting() );
+		boolean underlineSelection = isUnderlineSelection();
+		paintBackground( g, underlineSelection ? underlineSelectionBackground : selectionBackground );
+		if( underlineSelection && isArmedOrSelected( menuItem ) )
+			paintUnderlineSelection( g, underlineSelectionColor, underlineSelectionHeight );
+		paintIcon( g, iconRect, getIconForPainting(), underlineSelection ? underlineSelectionCheckBackground : checkBackground );
 		paintText( g, textRect, menuItem.getText(), selectionForeground, disabledForeground );
 		paintAccelerator( g, accelRect, getAcceleratorText(), acceleratorForeground, acceleratorSelectionForeground, disabledForeground );
 		if( !isTopLevelMenu( menuItem ) )
@@ -257,36 +264,36 @@ debug*/
 	protected void paintBackground( Graphics g, Color selectionBackground ) {
 		boolean armedOrSelected = isArmedOrSelected( menuItem );
 		if( menuItem.isOpaque() || armedOrSelected ) {
-			int width = menuItem.getWidth();
-			int height = menuItem.getHeight();
-
 			// paint background
 			g.setColor( armedOrSelected
-				? (isUnderlineSelection()
-					? deriveBackground( underlineSelectionBackground )
-					: selectionBackground)
+				? deriveBackground( selectionBackground )
 				: menuItem.getBackground() );
-			g.fillRect( 0, 0, width, height );
+			g.fillRect( 0, 0, menuItem.getWidth(), menuItem.getHeight() );
+		}
+	}
 
-			// paint underline
-			if( armedOrSelected && isUnderlineSelection() ) {
-				int underlineHeight = scale( underlineSelectionHeight );
-				g.setColor( underlineSelectionColor );
-				if( isTopLevelMenu( menuItem ) ) {
-					// paint underline at bottom
-					g.fillRect( 0, height - underlineHeight, width, underlineHeight );
-				} else if( menuItem.getComponentOrientation().isLeftToRight() ) {
-					// paint underline at left side
-					g.fillRect( 0, 0, underlineHeight, height );
-				} else {
-					// paint underline at right side
-					g.fillRect( width - underlineHeight, 0, underlineHeight, height );
-				}
-			}
+	protected void paintUnderlineSelection( Graphics g, Color underlineSelectionColor, int underlineSelectionHeight ) {
+		int width = menuItem.getWidth();
+		int height = menuItem.getHeight();
+
+		int underlineHeight = scale( underlineSelectionHeight );
+		g.setColor( underlineSelectionColor );
+		if( isTopLevelMenu( menuItem ) ) {
+			// paint underline at bottom
+			g.fillRect( 0, height - underlineHeight, width, underlineHeight );
+		} else if( menuItem.getComponentOrientation().isLeftToRight() ) {
+			// paint underline at left side
+			g.fillRect( 0, 0, underlineHeight, height );
+		} else {
+			// paint underline at right side
+			g.fillRect( width - underlineHeight, 0, underlineHeight, height );
 		}
 	}
 
 	protected Color deriveBackground( Color background ) {
+		if( !(background instanceof DerivedColor) )
+			return background;
+
 		Color baseColor = menuItem.isOpaque()
 			? menuItem.getBackground()
 			: FlatUIUtils.getParentBackground( menuItem );
@@ -294,12 +301,12 @@ debug*/
 		return FlatUIUtils.deriveColor( background, baseColor );
 	}
 
-	protected void paintIcon( Graphics g, Rectangle iconRect, Icon icon ) {
+	protected void paintIcon( Graphics g, Rectangle iconRect, Icon icon, Color checkBackground ) {
 		// if checkbox/radiobutton menu item is selected and also has a custom icon,
 		// then use filled icon background to indicate selection (instead of using checkIcon)
 		if( menuItem.isSelected() && checkIcon != null && icon != checkIcon ) {
 			Rectangle r = FlatUIUtils.addInsets( iconRect, scale( checkMargins ) );
-			g.setColor( deriveBackground( isUnderlineSelection() ? underlineSelectionCheckBackground : checkBackground ) );
+			g.setColor( FlatUIUtils.deriveColor( checkBackground, selectionBackground ) );
 			g.fillRect( r.x, r.y, r.width, r.height );
 		}
 

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

@@ -62,6 +62,12 @@ import javax.swing.plaf.basic.BasicMenuUI;
  * @uiDefault MenuItem.iconTextGap									int
  * @uiDefault MenuBar.hoverBackground								Color
  *
+ * <!-- FlatMenuRenderer -->
+ *
+ * @uiDefault MenuBar.underlineSelectionBackground					Color
+ * @uiDefault MenuBar.underlineSelectionColor						Color
+ * @uiDefault MenuBar.underlineSelectionHeight						int
+ *
  * @author Karl Tauber
  */
 public class FlatMenuUI
@@ -147,6 +153,10 @@ public class FlatMenuUI
 	protected class FlatMenuRenderer
 		extends FlatMenuItemRenderer
 	{
+		protected final Color menuBarUnderlineSelectionBackground = FlatUIUtils.getUIColor( "MenuBar.underlineSelectionBackground", underlineSelectionBackground );
+		protected final Color menuBarUnderlineSelectionColor = FlatUIUtils.getUIColor( "MenuBar.underlineSelectionColor", underlineSelectionColor );
+		protected final int menuBarUnderlineSelectionHeight = FlatUIUtils.getUIInt( "MenuBar.underlineSelectionHeight", underlineSelectionHeight );
+
 		protected FlatMenuRenderer( JMenuItem menuItem, Icon checkIcon, Icon arrowIcon,
 			Font acceleratorFont, String acceleratorDelimiter )
 		{
@@ -155,6 +165,9 @@ public class FlatMenuUI
 
 		@Override
 		protected void paintBackground( Graphics g, Color selectionBackground ) {
+			if( isUnderlineSelection() && ((JMenu)menuItem).isTopLevelMenu() )
+				selectionBackground = menuBarUnderlineSelectionBackground;
+
 			ButtonModel model = menuItem.getModel();
 			if( model.isRollover() && !model.isArmed() && !model.isSelected() &&
 				model.isEnabled() && ((JMenu)menuItem).isTopLevelMenu() )
@@ -164,5 +177,15 @@ public class FlatMenuUI
 			} else
 				super.paintBackground( g, selectionBackground );
 		}
+
+		@Override
+		protected void paintUnderlineSelection( Graphics g, Color underlineSelectionColor, int underlineSelectionHeight ) {
+			if( ((JMenu)menuItem).isTopLevelMenu() ) {
+				underlineSelectionColor = menuBarUnderlineSelectionColor;
+				underlineSelectionHeight = menuBarUnderlineSelectionHeight;
+			}
+
+			super.paintUnderlineSelection( g, underlineSelectionColor, underlineSelectionHeight );
+		}
 	}
 }

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

@@ -63,6 +63,7 @@ import com.formdev.flatlaf.util.HiDPIUtils;
  * @uiDefault PasswordField.showCapsLock			boolean
  * @uiDefault PasswordField.capsLockIcon			Icon
  * @uiDefault TextComponent.selectAllOnFocusPolicy	String	never, once (default) or always
+ * @uiDefault TextComponent.selectAllOnMouseClick	boolean
  *
  * @author Karl Tauber
  */
@@ -144,7 +145,8 @@ public class FlatPasswordFieldUI
 
 	@Override
 	protected Caret createCaret() {
-		return new FlatCaret( UIManager.getString( "TextComponent.selectAllOnFocusPolicy" ) );
+		return new FlatCaret( UIManager.getString( "TextComponent.selectAllOnFocusPolicy" ),
+			UIManager.getBoolean( "TextComponent.selectAllOnMouseClick" ) );
 	}
 
 	@Override

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

@@ -68,19 +68,17 @@ public class FlatPopupFactory
 			y = pt.y;
 		}
 
-		if( !isDropShadowPainted( owner, contents ) )
-			return new NonFlashingPopup( getPopupForScreenOfOwner( owner, contents, x, y, false ), contents );
+		boolean forceHeavyWeight = isOptionEnabled( owner, contents, FlatClientProperties.POPUP_FORCE_HEAVY_WEIGHT, "Popup.forceHeavyWeight" );
+
+		if( !isOptionEnabled( owner, contents, FlatClientProperties.POPUP_DROP_SHADOW_PAINTED, "Popup.dropShadowPainted" ) )
+			return new NonFlashingPopup( getPopupForScreenOfOwner( owner, contents, x, y, forceHeavyWeight ), contents );
 
 		// macOS and Linux adds drop shadow to heavy weight popups
-		if( SystemInfo.isMacOS || SystemInfo.isLinux ) {
-			Popup popup = getPopupForScreenOfOwner( owner, contents, x, y, true );
-			if( popup == null )
-				popup = getPopupForScreenOfOwner( owner, contents, x, y, false );
-			return new NonFlashingPopup( popup, contents );
-		}
+		if( SystemInfo.isMacOS || SystemInfo.isLinux )
+			return new NonFlashingPopup( getPopupForScreenOfOwner( owner, contents, x, y, true ), contents );
 
 		// create drop shadow popup
-		return new DropShadowPopup( getPopupForScreenOfOwner( owner, contents, x, y, false ), owner, contents );
+		return new DropShadowPopup( getPopupForScreenOfOwner( owner, contents, x, y, forceHeavyWeight ), owner, contents );
 	}
 
 	/**
@@ -155,24 +153,20 @@ public class FlatPopupFactory
 			popup.show();
 	}
 
-	private boolean isDropShadowPainted( Component owner, Component contents ) {
-		Boolean b = isDropShadowPainted( owner );
-		if( b != null )
-			return b;
+	private boolean isOptionEnabled( Component owner, Component contents, String clientKey, String uiKey ) {
+		if( owner instanceof JComponent ) {
+			Boolean b = FlatClientProperties.clientPropertyBooleanStrict( (JComponent) owner, clientKey, null );
+			if( b != null )
+				return b;
+		}
 
-		b = isDropShadowPainted( contents );
-		if( b != null )
-			return b;
+		if( contents instanceof JComponent ) {
+			Boolean b = FlatClientProperties.clientPropertyBooleanStrict( (JComponent) contents, clientKey, null );
+			if( b != null )
+				return b;
+		}
 
-		return UIManager.getBoolean( "Popup.dropShadowPainted" );
-	}
-
-	private Boolean isDropShadowPainted( Component c ) {
-		if( !(c instanceof JComponent) )
-			return null;
-
-		Object value = ((JComponent)c).getClientProperty( FlatClientProperties.POPUP_DROP_SHADOW_PAINTED );
-		return (value instanceof Boolean ) ? (Boolean) value : null;
+		return UIManager.getBoolean( uiKey );
 	}
 
 	/**
@@ -218,7 +212,7 @@ public class FlatPopupFactory
 	 * and corrects the y-location so that the tooltip is placed above the mouse location.
 	 */
 	private Point fixToolTipLocation( Component owner, Component contents, int x, int y ) {
-		if( !(contents instanceof JToolTip) )
+		if( !(contents instanceof JToolTip) || !wasInvokedFromToolTipManager() )
 			return null;
 
 		Point mouseLocation = MouseInfo.getPointerInfo().getLocation();
@@ -233,6 +227,16 @@ public class FlatPopupFactory
 		return new Point( x, mouseLocation.y - tipSize.height - UIScale.scale( 20 ) );
 	}
 
+	private boolean wasInvokedFromToolTipManager() {
+		StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+		for( StackTraceElement stackTraceElement : stackTrace ) {
+			if( "javax.swing.ToolTipManager".equals( stackTraceElement.getClassName() ) &&
+				"showTipWindow".equals( stackTraceElement.getMethodName() ) )
+			  return true;
+		}
+		return false;
+	}
+
 	//---- class NonFlashingPopup ---------------------------------------------
 
 	private class NonFlashingPopup
@@ -267,16 +271,17 @@ public class FlatPopupFactory
 
 				// increase tooltip size if necessary because it may be too small on HiDPI screens
 				//    https://bugs.openjdk.java.net/browse/JDK-8213535
-				if( contents instanceof JToolTip ) {
+				if( contents instanceof JToolTip && popupWindow == null ) {
 					Container parent = contents.getParent();
 					if( parent instanceof JPanel ) {
 						Dimension prefSize = parent.getPreferredSize();
 						if( !prefSize.equals( parent.getSize() ) ) {
-							Container panel = SwingUtilities.getAncestorOfClass( Panel.class, parent );
-							if( panel != null )
-								panel.setSize( prefSize ); // for medium weight popup
-							else
-								parent.setSize( prefSize ); // for light weight popup
+							Container mediumWeightPanel = SwingUtilities.getAncestorOfClass( Panel.class, parent );
+							Container c = (mediumWeightPanel != null)
+								? mediumWeightPanel // medium weight popup
+								: parent;           // light weight popup
+							c.setSize( prefSize );
+							c.validate();
 						}
 					}
 				}

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

@@ -155,7 +155,7 @@ public class FlatProgressBarUI
 			? 0
 			: Math.min( UIScale.scale( this.arc ), horizontal ? height : width );
 
-		FlatUIUtils.setRenderingHints( (Graphics2D) g );
+		Object[] oldRenderingHints = FlatUIUtils.setRenderingHints( g );
 
 		// paint track
 		RoundRectangle2D.Float trackShape = new RoundRectangle2D.Float( x, y, width, height, arc, arc );
@@ -163,6 +163,7 @@ public class FlatProgressBarUI
 		((Graphics2D)g).fill( trackShape );
 
 		// paint progress
+		int amountFull = 0;
 		if( progressBar.isIndeterminate() ) {
 			boxRect = getBox( boxRect );
 			if( boxRect != null ) {
@@ -170,11 +171,8 @@ public class FlatProgressBarUI
 				((Graphics2D)g).fill( new RoundRectangle2D.Float( boxRect.x, boxRect.y,
 					boxRect.width, boxRect.height, arc, arc ) );
 			}
-
-			if( progressBar.isStringPainted() )
-				paintString( g, x, y, width, height, 0, insets );
 		} else {
-			int amountFull = getAmountFull( insets, width, height );
+			amountFull = getAmountFull( insets, width, height );
 
 			RoundRectangle2D.Float progressShape = horizontal
 				? new RoundRectangle2D.Float( c.getComponentOrientation().isLeftToRight() ? x : x + (width - amountFull),
@@ -189,10 +187,12 @@ public class FlatProgressBarUI
 				((Graphics2D)g).fill( area );
 			} else
 				((Graphics2D)g).fill( progressShape );
-
-			if( progressBar.isStringPainted() )
-				paintString( g, x, y, width, height, amountFull, insets );
 		}
+
+		FlatUIUtils.resetRenderingHints( g, oldRenderingHints );
+
+		if( progressBar.isStringPainted() )
+			paintString( g, x, y, width, height, amountFull, insets );
 	}
 
 	@Override

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

@@ -27,7 +27,6 @@ import javax.swing.JComponent;
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicRadioButtonUI;
 import com.formdev.flatlaf.icons.FlatCheckBoxIcon;
 import com.formdev.flatlaf.util.UIScale;
@@ -58,6 +57,8 @@ public class FlatRadioButtonUI
 	protected int iconTextGap;
 	protected Color disabledText;
 
+	private Color defaultBackground;
+
 	private boolean defaults_initialized = false;
 
 	public static ComponentUI createUI( JComponent c ) {
@@ -74,6 +75,8 @@ public class FlatRadioButtonUI
 			iconTextGap = FlatUIUtils.getUIInt( prefix + "iconTextGap", 4 );
 			disabledText = UIManager.getColor( prefix + "disabledText" );
 
+			defaultBackground = UIManager.getColor( prefix + "background" );
+
 			defaults_initialized = true;
 		}
 
@@ -120,7 +123,7 @@ public class FlatRadioButtonUI
 		// - if background was explicitly set to a non-UIResource color
 		if( !c.isOpaque() &&
 			((AbstractButton)c).isContentAreaFilled() &&
-			!(c.getBackground() instanceof UIResource) )
+			(c.getBackground() != defaultBackground) )
 		{
 			g.setColor( c.getBackground() );
 			g.fillRect( 0, 0, c.getWidth(), c.getHeight() );

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

@@ -37,6 +37,7 @@ import javax.swing.JMenuBar;
 import javax.swing.JRootPane;
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
+import javax.swing.border.Border;
 import javax.swing.plaf.BorderUIResource;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.UIResource;
@@ -45,6 +46,7 @@ import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.util.HiDPIUtils;
 import com.formdev.flatlaf.util.SystemInfo;
+import com.formdev.flatlaf.util.UIScale;
 
 /**
  * Provides the Flat LaF UI delegate for {@link javax.swing.JRootPane}.
@@ -54,6 +56,7 @@ import com.formdev.flatlaf.util.SystemInfo;
  * @uiDefault RootPane.border								Border
  * @uiDefault RootPane.activeBorderColor					Color
  * @uiDefault RootPane.inactiveBorderColor					Color
+ * @uiDefault TitlePane.borderColor							Color	optional
  *
  * <!-- FlatWindowResizer -->
  *
@@ -71,6 +74,8 @@ public class FlatRootPaneUI
 	static final boolean canUseJBRCustomDecorations
 		= SystemInfo.isJetBrainsJVM_11_orLater && SystemInfo.isWindows_10_orLater;
 
+	protected final Color borderColor = UIManager.getColor( "TitlePane.borderColor" );
+
 	protected JRootPane rootPane;
 	protected FlatTitlePane titlePane;
 	protected FlatWindowResizer windowResizer;
@@ -89,11 +94,21 @@ public class FlatRootPaneUI
 
 		if( rootPane.getWindowDecorationStyle() != JRootPane.NONE )
 			installClientDecorations();
+		else
+			installBorder();
 
 		if( canUseJBRCustomDecorations )
 			JBRCustomDecorations.install( rootPane );
 	}
 
+	protected void installBorder() {
+		if( borderColor != null ) {
+			Border b = rootPane.getBorder();
+			if( b == null || b instanceof UIResource )
+				rootPane.setBorder( new FlatWindowTitleBorder( borderColor ) );
+		}
+	}
+
 	@Override
 	public void uninstallUI( JComponent c ) {
 		super.uninstallUI( c );
@@ -119,11 +134,8 @@ public class FlatRootPaneUI
 		}
 
 		// enable dark window appearance on macOS when running in JetBrains Runtime
-		if( SystemInfo.isJetBrainsJVM && SystemInfo.isMacOS_10_14_Mojave_orLater ) {
-			LookAndFeel laf = UIManager.getLookAndFeel();
-			boolean isDark = laf instanceof FlatLaf && ((FlatLaf)laf).isDark();
-			c.putClientProperty( "jetbrains.awt.windowDarkAppearance", isDark );
-		}
+		if( SystemInfo.isJetBrainsJVM && SystemInfo.isMacOS_10_14_Mojave_orLater )
+			c.putClientProperty( "jetbrains.awt.windowDarkAppearance", FlatLaf.isLafDark() );
 	}
 
 	protected void installClientDecorations() {
@@ -203,6 +215,8 @@ public class FlatRootPaneUI
 				uninstallClientDecorations();
 				if( rootPane.getWindowDecorationStyle() != JRootPane.NONE )
 					installClientDecorations();
+				else
+					installBorder();
 				break;
 
 			case FlatClientProperties.MENU_BAR_EMBEDDED:
@@ -252,8 +266,9 @@ public class FlatRootPaneUI
 			int width = Math.max( titlePaneSize.width, contentSize.width );
 			int height = titlePaneSize.height + contentSize.height;
 			if( titlePane == null || !titlePane.isMenuBarEmbedded() ) {
-				Dimension menuBarSize = (rootPane.getJMenuBar() != null)
-					? getSizeFunc.apply( rootPane.getJMenuBar() )
+				JMenuBar menuBar = rootPane.getJMenuBar();
+				Dimension menuBarSize = (menuBar != null && menuBar.isVisible())
+					? getSizeFunc.apply( menuBar )
 					: new Dimension();
 
 				width = Math.max( width, menuBarSize.width );
@@ -270,6 +285,7 @@ public class FlatRootPaneUI
 		@Override
 		public void layoutContainer( Container parent ) {
 			JRootPane rootPane = (JRootPane) parent;
+			boolean isFullScreen = FlatUIUtils.isFullScreen( rootPane );
 
 			Insets insets = rootPane.getInsets();
 			int x = insets.left;
@@ -283,15 +299,15 @@ public class FlatRootPaneUI
 				rootPane.getGlassPane().setBounds( x, y, width, height );
 
 			int nextY = 0;
-			if( titlePane != null ) {
+			if( !isFullScreen && titlePane != null ) {
 				Dimension prefSize = titlePane.getPreferredSize();
 				titlePane.setBounds( 0, 0, width, prefSize.height );
 				nextY += prefSize.height;
 			}
 
 			JMenuBar menuBar = rootPane.getJMenuBar();
-			if( menuBar != null ) {
-				if( titlePane != null && titlePane.isMenuBarEmbedded() ) {
+			if( menuBar != null && menuBar.isVisible() ) {
+				if( !isFullScreen && titlePane != null && titlePane.isMenuBarEmbedded() ) {
 					titlePane.validate();
 					menuBar.setBounds( titlePane.getMenuBarBounds() );
 				} else {
@@ -341,7 +357,7 @@ public class FlatRootPaneUI
 
 		@Override
 		public Insets getBorderInsets( Component c, Insets insets ) {
-			if( isWindowMaximized( c ) ) {
+			if( isWindowMaximized( c ) || FlatUIUtils.isFullScreen( c ) ) {
 				// hide border if window is maximized
 				insets.top = insets.left = insets.bottom = insets.right = 0;
 				return insets;
@@ -351,7 +367,7 @@ public class FlatRootPaneUI
 
 		@Override
 		public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
-			if( isWindowMaximized( c ) )
+			if( isWindowMaximized( c ) || FlatUIUtils.isFullScreen( c ) )
 				return;
 
 			Container parent = c.getParent();
@@ -372,4 +388,40 @@ public class FlatRootPaneUI
 				: false;
 		}
 	}
+
+	//---- class FlatWindowTitleBorder ----------------------------------------
+
+	private static class FlatWindowTitleBorder
+		extends BorderUIResource.EmptyBorderUIResource
+	{
+		private final Color borderColor;
+
+		FlatWindowTitleBorder( Color borderColor ) {
+			super( 0, 0, 0, 0 );
+			this.borderColor = borderColor;
+		}
+
+		@Override
+		public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
+			if( showBorder( c ) ) {
+				float lineHeight = UIScale.scale( (float) 1 );
+				FlatUIUtils.paintFilledRectangle( g, borderColor, x, y, width, lineHeight );
+			}
+		}
+
+		@Override
+		public Insets getBorderInsets( Component c, Insets insets ) {
+			insets.set( showBorder( c ) ? 1 : 0, 0, 0, 0 );
+			return insets;
+		}
+
+		private boolean showBorder( Component c ) {
+			Container parent = c.getParent();
+			return
+				(parent instanceof JFrame &&
+				 (((JFrame)parent).getJMenuBar() == null ||
+				  !((JFrame)parent).getJMenuBar().isVisible())) ||
+				parent instanceof JDialog;
+		}
+	}
 }

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

@@ -19,7 +19,6 @@ package com.formdev.flatlaf.ui;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
-import java.awt.Graphics2D;
 import java.awt.Insets;
 import java.awt.Rectangle;
 import java.awt.event.MouseAdapter;
@@ -65,7 +64,7 @@ import com.formdev.flatlaf.util.UIScale;
  * @uiDefault ScrollBar.pressedTrackColor			Color	optional
  * @uiDefault ScrollBar.pressedThumbColor			Color	optional
  * @uiDefault ScrollBar.pressedThumbWithTrack		boolean
- * @uiDefault Component.arrowType					String	triangle (default) or chevron
+ * @uiDefault Component.arrowType					String	chevron (default) or triangle
  * @uiDefault ScrollBar.showButtons					boolean
  * @uiDefault ScrollBar.buttonArrowColor			Color
  * @uiDefault ScrollBar.buttonDisabledArrowColor	Color
@@ -142,6 +141,12 @@ public class FlatScrollBarUI
 		buttonDisabledArrowColor = UIManager.getColor( "ScrollBar.buttonDisabledArrowColor" );
 		hoverButtonBackground = UIManager.getColor( "ScrollBar.hoverButtonBackground" );
 		pressedButtonBackground = UIManager.getColor( "ScrollBar.pressedButtonBackground" );
+
+		// fallback (e.g. when used in NetBeans GUI builder)
+		if( trackInsets == null )
+			trackInsets = new Insets( 0, 0, 0, 0 );
+		if( thumbInsets == null )
+			thumbInsets = new Insets( 0, 0, 0, 0 );
 	}
 
 	@Override
@@ -215,8 +220,9 @@ public class FlatScrollBarUI
 
 	@Override
 	public void paint( Graphics g, JComponent c ) {
-		FlatUIUtils.setRenderingHints( (Graphics2D) g );
+		Object[] oldRenderingHints = FlatUIUtils.setRenderingHints( g );
 		super.paint( g, c );
+		FlatUIUtils.resetRenderingHints( g, oldRenderingHints );
 	}
 
 	@Override
@@ -351,13 +357,14 @@ public class FlatScrollBarUI
 	{
 		protected FlatScrollBarButton( int direction ) {
 			this( direction, arrowType, buttonArrowColor, buttonDisabledArrowColor,
-				null, hoverButtonBackground, pressedButtonBackground );
+				null, hoverButtonBackground, null, pressedButtonBackground );
 		}
 
 		protected FlatScrollBarButton( int direction, String type, Color foreground, Color disabledForeground,
-			Color hoverForeground, Color hoverBackground, Color pressedBackground )
+			Color hoverForeground, Color hoverBackground, Color pressedForeground, Color pressedBackground )
 		{
-			super( direction, type, foreground, disabledForeground, hoverForeground, hoverBackground, pressedBackground );
+			super( direction, type, foreground, disabledForeground,
+				hoverForeground, hoverBackground, pressedForeground, pressedBackground );
 
 			setArrowWidth( FlatArrowButton.DEFAULT_ARROW_WIDTH - 2 );
 			setFocusable( false );

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

@@ -14,12 +14,6 @@
  * limitations under the License.
  */
 
-/*
- * Smooth scrolling code partly based on code from IntelliJ IDEA Community Edition,
- * which is licensed under the Apache 2.0 license. Copyright 2000-2016 JetBrains s.r.o.
- * See: https://github.com/JetBrains/intellij-community/blob/31e1b5a8e43219b9571951bab6457cfb3012e3ef/platform/platform-api/src/com/intellij/ui/components/SmoothScrollPane.java#L141-L185
- *
- */
 package com.formdev.flatlaf.ui;
 
 import java.awt.Component;
@@ -138,8 +132,6 @@ public class FlatScrollPaneUI
 		return UIManager.getBoolean( "ScrollPane.smoothScrolling" );
 	}
 
-	private static final double EPSILON = 1e-5d;
-
 	private void mouseWheelMovedSmooth( MouseWheelEvent e ) {
 		// return if there is no viewport
 		JViewport viewport = scrollpane.getViewport();
@@ -160,24 +152,22 @@ public class FlatScrollPaneUI
 		// get precise wheel rotation
 		double rotation = e.getPreciseWheelRotation();
 
-		// get unit and block increment
+		// get unit increment
 		int unitIncrement;
-		int blockIncrement;
 		int orientation = scrollbar.getOrientation();
 		Component view = viewport.getView();
 		if( view instanceof Scrollable ) {
 			Scrollable scrollable = (Scrollable) view;
 
-			// Use (0, 0) view position to obtain constant unit increment of first item
-			// (which might otherwise be variable on smaller-than-unit scrolling).
+			// Use (0, 0) view position to obtain a constant unit increment of first item.
+			// Unit increment may be different for each item.
 			Rectangle visibleRect = new Rectangle( viewport.getViewSize() );
 			unitIncrement = scrollable.getScrollableUnitIncrement( visibleRect, orientation, 1 );
-			blockIncrement = scrollable.getScrollableBlockIncrement( visibleRect, orientation, 1 );
 
 			if( unitIncrement > 0 ) {
 				// For the case that the first item (e.g. in a list) is larger
-				// than the other items, get the unit increment of the second item
-				// and use the smaller one.
+				// than the other items (e.g. themes list in FlatLaf Demo),
+				// get the unit increment of the second item and use the smaller one.
 				if( orientation == SwingConstants.VERTICAL ) {
 					visibleRect.y += unitIncrement;
 					visibleRect.height -= unitIncrement;
@@ -192,52 +182,58 @@ public class FlatScrollPaneUI
 		} else {
 			int direction = rotation < 0 ? -1 : 1;
 			unitIncrement = scrollbar.getUnitIncrement( direction );
-			blockIncrement = scrollbar.getBlockIncrement( direction );
 		}
 
-		// limit scroll amount (number of units to scroll) for small viewports
-		// (e.g. vertical scrolling in file chooser)
-		int scrollAmount = e.getScrollAmount();
+		// get viewport width/height (the visible width/height)
 		int viewportWH = (orientation == SwingConstants.VERTICAL)
 			? viewport.getHeight()
 			: viewport.getWidth();
-		if( unitIncrement * scrollAmount > viewportWH )
-			scrollAmount = Math.max( viewportWH / unitIncrement, 1 );
+
+		// limit scroll increment to viewport width/height
+		// - if scroll amount is set to a large value in OS settings
+		// - for large unit increments in small viewports (e.g. horizontal scrolling in file chooser)
+		int scrollIncrement = Math.min( unitIncrement * e.getScrollAmount(), viewportWH );
 
 		// compute relative delta
-		double delta = rotation * scrollAmount * unitIncrement;
-		boolean adjustDelta = Math.abs( rotation ) < (1.0 + EPSILON);
-		double adjustedDelta = adjustDelta
-			? Math.max( -blockIncrement, Math.min( delta, blockIncrement ) )
-			: delta;
+		double delta = rotation * scrollIncrement;
+		int idelta = (int) Math.round( delta );
+
+		// scroll at least one pixel to avoid "hanging"
+		// - for "super-low-speed" scrolling (move fingers very slowly on trackpad)
+		// - if unit increment is very small (e.g. 1 if scroll view does not implement
+		//   javax.swing.Scrollable interface)
+		if( idelta == 0 ) {
+			if( rotation > 0 )
+				idelta = 1;
+			else if( rotation < 0 )
+				idelta = -1;
+		}
 
 		// compute new value
 		int value = scrollbar.getValue();
-		double minDelta = scrollbar.getMinimum() - value;
-		double maxDelta = scrollbar.getMaximum() - scrollbar.getModel().getExtent() - value;
-		double boundedDelta = Math.max( minDelta, Math.min( adjustedDelta, maxDelta ) );
-		int newValue = value + (int) Math.round( boundedDelta );
+		int minValue = scrollbar.getMinimum();
+		int maxValue = scrollbar.getMaximum() - scrollbar.getModel().getExtent();
+		int newValue = Math.max( minValue, Math.min( value + idelta, maxValue ) );
 
 		// set new value
 		if( newValue != value )
 			scrollbar.setValue( newValue );
 
 /*debug
-		System.out.println( String.format( "%4d  %9f / %4d %4d / %12f %5s %12f / %4d %4d %4d / %12f %12f %12f / %4d",
+		System.out.println( String.format( "%s  %4d  %9f  /  %3d * %d = %3d  [%3d]  /  %8.2f %5d  /  %4d --> %4d  [%d, %d]",
+			(orientation == SwingConstants.VERTICAL) ? "V" : "H",
 			e.getWheelRotation(),
 			e.getPreciseWheelRotation(),
 			unitIncrement,
-			blockIncrement,
+			e.getScrollAmount(),
+			scrollIncrement,
+			viewportWH,
 			delta,
-			adjustDelta,
-			adjustedDelta,
+			idelta,
 			value,
-			scrollbar.getMinimum(),
-			scrollbar.getMaximum(),
-			minDelta,
-			maxDelta,
-			boundedDelta,
-			newValue ) );
+			newValue,
+			minValue,
+			maxValue ) );
 */
 	}
 

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

@@ -18,17 +18,23 @@ package com.formdev.flatlaf.ui;
 
 import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.event.MouseListener;
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.event.MouseEvent;
+import java.awt.geom.Ellipse2D;
 import java.awt.geom.Path2D;
 import java.awt.geom.RoundRectangle2D;
 import javax.swing.JComponent;
 import javax.swing.JSlider;
 import javax.swing.LookAndFeel;
+import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicSliderUI;
+import com.formdev.flatlaf.util.HiDPIUtils;
 import com.formdev.flatlaf.util.UIScale;
 
 /**
@@ -49,29 +55,49 @@ import com.formdev.flatlaf.util.UIScale;
  * <!-- FlatSliderUI -->
  *
  * @uiDefault Slider.trackWidth				int
- * @uiDefault Slider.thumbWidth				int
+ * @uiDefault Slider.thumbSize				Dimension
+ * @uiDefault Slider.focusWidth				int
+ * @uiDefault Slider.trackValueColor		Color	optional; defaults to Slider.thumbColor
  * @uiDefault Slider.trackColor				Color
  * @uiDefault Slider.thumbColor				Color
+ * @uiDefault Slider.thumbBorderColor		Color	optional; if null, no border is painted
  * @uiDefault Slider.focusedColor			Color	optional; defaults to Component.focusColor
- * @uiDefault Slider.hoverColor				Color	optional; defaults to Slider.focusedColor
- * @uiDefault Slider.disabledForeground		Color	used for track and thumb is disabled
+ * @uiDefault Slider.focusedThumbBorderColor Color	optional; defaults to Component.focusedBorderColor
+ * @uiDefault Slider.hoverThumbColor		Color	optional
+ * @uiDefault Slider.pressedThumbColor		Color	optional
+ * @uiDefault Slider.disabledTrackColor		Color
+ * @uiDefault Slider.disabledThumbColor		Color
+ * @uiDefault Slider.disabledThumbBorderColor Color	optional; defaults to Component.disabledBorderColor
  *
  * @author Karl Tauber
  */
 public class FlatSliderUI
 	extends BasicSliderUI
 {
-	private int trackWidth;
-	private int thumbWidth;
+	protected int trackWidth;
+	protected Dimension thumbSize;
+	protected int focusWidth;
 
-	private Color trackColor;
-	private Color thumbColor;
-	private Color focusColor;
-	private Color hoverColor;
-	private Color disabledForeground;
+	protected Color trackValueColor;
+	protected Color trackColor;
+	protected Color thumbColor;
+	protected Color thumbBorderColor;
+	protected Color focusBaseColor;
+	protected Color focusedColor;
+	protected Color focusedThumbBorderColor;
+	protected Color hoverThumbColor;
+	protected Color pressedThumbColor;
+	protected Color disabledTrackColor;
+	protected Color disabledThumbColor;
+	protected Color disabledThumbBorderColor;
 
-	private MouseListener hoverListener;
-	private boolean hover;
+	private Color defaultBackground;
+	private Color defaultForeground;
+
+	protected boolean thumbHover;
+	protected boolean thumbPressed;
+
+	private Object[] oldRenderingHints;
 
 	public static ComponentUI createUI( JComponent c ) {
 		return new FlatSliderUI();
@@ -81,24 +107,6 @@ public class FlatSliderUI
 		super( null );
 	}
 
-	@Override
-	protected void installListeners( JSlider slider ) {
-		super.installListeners( slider );
-
-		hoverListener = new FlatUIUtils.HoverListener( slider, h -> {
-			hover = h;
-		} );
-		slider.addMouseListener( hoverListener );
-	}
-
-	@Override
-	protected void uninstallListeners( JSlider slider ) {
-		super.uninstallListeners( slider );
-
-		slider.removeMouseListener( hoverListener );
-		hoverListener = null;
-	}
-
 	@Override
 	protected void installDefaults( JSlider slider ) {
 		super.installDefaults( slider );
@@ -106,24 +114,71 @@ public class FlatSliderUI
 		LookAndFeel.installProperty( slider, "opaque", false );
 
 		trackWidth = UIManager.getInt( "Slider.trackWidth" );
-		thumbWidth = UIManager.getInt( "Slider.thumbWidth" );
+		thumbSize = UIManager.getDimension( "Slider.thumbSize" );
+		if( thumbSize == null ) {
+			// fallback for compatibility with old versions
+			int thumbWidth = UIManager.getInt( "Slider.thumbWidth" );
+			thumbSize = new Dimension( thumbWidth, thumbWidth );
+		}
+		focusWidth = FlatUIUtils.getUIInt( "Slider.focusWidth", 4 );
 
+		trackValueColor = FlatUIUtils.getUIColor( "Slider.trackValueColor", "Slider.thumbColor" );
 		trackColor = UIManager.getColor( "Slider.trackColor" );
 		thumbColor = UIManager.getColor( "Slider.thumbColor" );
-		focusColor = FlatUIUtils.getUIColor( "Slider.focusedColor", "Component.focusColor" );
-		hoverColor = FlatUIUtils.getUIColor( "Slider.hoverColor", focusColor );
-		disabledForeground = UIManager.getColor( "Slider.disabledForeground" );
+		thumbBorderColor = UIManager.getColor( "Slider.thumbBorderColor" );
+		focusBaseColor = UIManager.getColor( "Component.focusColor" );
+		focusedColor = FlatUIUtils.getUIColor( "Slider.focusedColor", focusBaseColor );
+		focusedThumbBorderColor = FlatUIUtils.getUIColor( "Slider.focusedThumbBorderColor", "Component.focusedBorderColor" );
+		hoverThumbColor = UIManager.getColor( "Slider.hoverThumbColor" );
+		pressedThumbColor = UIManager.getColor( "Slider.pressedThumbColor" );
+		disabledTrackColor = UIManager.getColor( "Slider.disabledTrackColor" );
+		disabledThumbColor = UIManager.getColor( "Slider.disabledThumbColor" );
+		disabledThumbBorderColor = FlatUIUtils.getUIColor( "Slider.disabledThumbBorderColor", "Component.disabledBorderColor" );
+
+		defaultBackground = UIManager.getColor( "Slider.background" );
+		defaultForeground = UIManager.getColor( "Slider.foreground" );
 	}
 
 	@Override
 	protected void uninstallDefaults( JSlider slider ) {
 		super.uninstallDefaults( slider );
 
+		trackValueColor = null;
 		trackColor = null;
 		thumbColor = null;
-		focusColor = null;
-		hoverColor = null;
-		disabledForeground = null;
+		thumbBorderColor = null;
+		focusBaseColor = null;
+		focusedColor = null;
+		focusedThumbBorderColor = null;
+		hoverThumbColor = null;
+		pressedThumbColor = null;
+		disabledTrackColor = null;
+		disabledThumbColor = null;
+		disabledThumbBorderColor = null;
+
+		defaultBackground = null;
+		defaultForeground = null;
+	}
+
+	@Override
+	protected TrackListener createTrackListener( JSlider slider ) {
+		return new FlatTrackListener();
+	}
+
+	@Override
+	public int getBaseline( JComponent c, int width, int height ) {
+		if( c == null )
+			throw new NullPointerException();
+		if( width < 0 || height < 0 )
+			throw new IllegalArgumentException();
+
+		// no baseline for vertical orientation
+		if( slider.getOrientation() == JSlider.VERTICAL )
+			return -1;
+
+		// compute a baseline so that the track is vertically centered
+		FontMetrics fm = slider.getFontMetrics( slider.getFont() );
+		return trackRect.y + Math.round( (trackRect.height - fm.getHeight()) / 2f ) + fm.getAscent() - 1;
 	}
 
 	@Override
@@ -153,14 +208,50 @@ public class FlatSliderUI
 
 	@Override
 	protected Dimension getThumbSize() {
-		return new Dimension( UIScale.scale( thumbWidth ), UIScale.scale( thumbWidth ) );
+		return calcThumbSize( slider, thumbSize, focusWidth );
+	}
+
+	public static Dimension calcThumbSize( JSlider slider, Dimension thumbSize, int focusWidth ) {
+		int fw = UIScale.scale( focusWidth );
+		int w = UIScale.scale( thumbSize.width ) + fw + fw;
+		int h = UIScale.scale( thumbSize.height ) + fw + fw;
+		return (slider.getOrientation() == JSlider.HORIZONTAL)
+			? new Dimension( w, h )
+			: new Dimension( h, w );
 	}
 
 	@Override
 	public void paint( Graphics g, JComponent c ) {
-		FlatUIUtils.setRenderingHints( (Graphics2D) g );
+		oldRenderingHints = FlatUIUtils.setRenderingHints( g );
+
+/*debug
+		g.setColor( Color.gray );
+		g.drawRect( 0, 0, c.getWidth() - 1, c.getHeight() - 1 );
+		g.setColor( Color.orange );
+		g.drawRect( focusRect.x, focusRect.y, focusRect.width - 1, focusRect.height - 1 );
+		g.setColor( Color.magenta );
+		g.drawRect( contentRect.x, contentRect.y, contentRect.width - 1, contentRect.height - 1 );
+		g.setColor( Color.blue );
+		g.drawRect( trackRect.x, trackRect.y, trackRect.width - 1, trackRect.height - 1 );
+		g.setColor( Color.red );
+		g.drawRect( thumbRect.x, thumbRect.y, thumbRect.width - 1, thumbRect.height - 1 );
+		g.setColor( Color.green );
+		g.drawRect( tickRect.x, tickRect.y, tickRect.width - 1, tickRect.height - 1 );
+		g.setColor( Color.red );
+		g.drawRect( labelRect.x, labelRect.y, labelRect.width - 1, labelRect.height - 1 );
+debug*/
 
 		super.paint( g, c );
+
+		FlatUIUtils.resetRenderingHints( g, oldRenderingHints );
+		oldRenderingHints = null;
+	}
+
+	@Override
+	public void paintLabels( Graphics g ) {
+		FlatUIUtils.runWithoutRenderingHints( g, oldRenderingHints, () -> {
+			super.paintLabels( g );
+		} );
 	}
 
 	@Override
@@ -201,50 +292,326 @@ public class FlatSliderUI
 		}
 
 		if( coloredTrack != null ) {
-			g.setColor( FlatUIUtils.deriveColor( FlatUIUtils.isPermanentFocusOwner( slider ) ? focusColor : (hover ? hoverColor : thumbColor), thumbColor ) );
+			if( slider.getInverted() ) {
+				RoundRectangle2D temp = track;
+				track = coloredTrack;
+				coloredTrack = temp;
+			}
+
+			g.setColor( getTrackValueColor() );
 			((Graphics2D)g).fill( coloredTrack );
 		}
 
-		g.setColor( enabled ? trackColor : disabledForeground );
+		g.setColor( enabled ? getTrackColor() : disabledTrackColor );
 		((Graphics2D)g).fill( track );
 	}
 
 	@Override
 	public void paintThumb( Graphics g ) {
-		g.setColor( FlatUIUtils.deriveColor( slider.isEnabled()
-			? (FlatUIUtils.isPermanentFocusOwner( slider ) ? focusColor : (hover ? hoverColor : thumbColor))
-			: disabledForeground,
-			thumbColor ) );
+		Color thumbColor = getThumbColor();
+		Color color = stateColor( slider, thumbHover, thumbPressed,
+			thumbColor, disabledThumbColor, null, hoverThumbColor, pressedThumbColor );
+		color = FlatUIUtils.deriveColor( color, thumbColor );
 
-		if( isRoundThumb() )
-			g.fillOval( thumbRect.x, thumbRect.y, thumbRect.width, thumbRect.height );
-		else {
-			double w = thumbRect.width;
-			double h = thumbRect.height;
-			double wh = w / 2;
+		Color foreground = slider.getForeground();
+		Color borderColor = (thumbBorderColor != null && foreground == defaultForeground)
+			? stateColor( slider, false, false, thumbBorderColor, disabledThumbBorderColor, focusedThumbBorderColor, null, null )
+			: null;
 
-			Path2D thumb = FlatUIUtils.createPath( 0,0, w,0, w,(h - wh), wh,h,  0,(h - wh) );
+		Color focusedColor = FlatUIUtils.deriveColor( this.focusedColor,
+			(foreground != defaultForeground) ? foreground : focusBaseColor );
 
+		paintThumb( g, slider, thumbRect, isRoundThumb(), color, borderColor, focusedColor, focusWidth );
+	}
+
+	public static void paintThumb( Graphics g, JSlider slider, Rectangle thumbRect, boolean roundThumb,
+		Color thumbColor, Color thumbBorderColor, Color focusedColor, int focusWidth )
+	{
+		double systemScaleFactor = UIScale.getSystemScaleFactor( (Graphics2D) 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( (Graphics2D) g, thumbRect.x, thumbRect.y, thumbRect.width, thumbRect.height,
+				(g2d, x2, y2, width2, height2, scaleFactor) -> {
+					paintThumbImpl( g, slider, x2, y2, width2, height2,
+						roundThumb, thumbColor, thumbBorderColor, focusedColor,
+						(float) (focusWidth * scaleFactor) );
+				} );
+			return;
+		}
+
+		paintThumbImpl( g, slider, thumbRect.x, thumbRect.y, thumbRect.width, thumbRect.height,
+			roundThumb, thumbColor, thumbBorderColor, focusedColor, focusWidth );
+
+	}
+
+	private static void paintThumbImpl( Graphics g, JSlider slider, int x, int y, int width, int height,
+		boolean roundThumb, Color thumbColor, Color thumbBorderColor, Color focusedColor, float focusWidth )
+	{
+		int fw = Math.round( UIScale.scale( focusWidth ) );
+		int tx = x + fw;
+		int ty = y + fw;
+		int tw = width - fw - fw;
+		int th = height - fw - fw;
+		boolean focused = FlatUIUtils.isPermanentFocusOwner( slider );
+
+		if( roundThumb ) {
+			// paint thumb focus border
+			if( focused ) {
+				g.setColor( focusedColor );
+				((Graphics2D)g).fill( createRoundThumbShape( x, y, width, height ) );
+			}
+
+			if( thumbBorderColor != null ) {
+				// paint thumb border
+				g.setColor( thumbBorderColor );
+				((Graphics2D)g).fill( createRoundThumbShape( tx, ty, tw, th ) );
+
+				// paint thumb background
+				float lw = UIScale.scale( 1f );
+				g.setColor( thumbColor );
+				((Graphics2D)g).fill( createRoundThumbShape( tx + lw, ty + lw,
+					tw - lw - lw, th - lw - lw ) );
+			} else {
+				// paint thumb background
+				g.setColor( thumbColor );
+				((Graphics2D)g).fill( createRoundThumbShape( tx, ty, tw, th ) );
+			}
+		} else {
 			Graphics2D g2 = (Graphics2D) g.create();
 			try {
-				g2.translate( thumbRect.x, thumbRect.y );
+				g2.translate( x, y );
 				if( slider.getOrientation() == JSlider.VERTICAL ) {
 					if( slider.getComponentOrientation().isLeftToRight() ) {
-						g2.translate( 0, thumbRect.height );
+						g2.translate( 0, height );
 						g2.rotate( Math.toRadians( 270 ) );
 					} else {
-						g2.translate( thumbRect.width, 0 );
+						g2.translate( width, 0 );
 						g2.rotate( Math.toRadians( 90 ) );
 					}
+
+					// rotate thumb width/height
+					int temp = tw;
+					tw = th;
+					th = temp;
+				}
+
+				// paint thumb focus border
+				if( focused ) {
+					g2.setColor( focusedColor );
+					g2.fill( createDirectionalThumbShape( 0, 0,
+						tw + fw + fw, th + fw + fw + (fw * 0.4142f), fw ) );
+				}
+
+				if( thumbBorderColor != null ) {
+					// paint thumb border
+					g2.setColor( thumbBorderColor );
+					g2.fill( createDirectionalThumbShape( fw, fw, tw, th, 0 ) );
+
+					// paint thumb background
+					float lw = UIScale.scale( 1f );
+					g2.setColor( thumbColor );
+					g2.fill( createDirectionalThumbShape( fw + lw, fw + lw,
+						tw - lw - lw, th - lw - lw - (lw * 0.4142f), 0 ) );
+				} else {
+					// paint thumb background
+					g2.setColor( thumbColor );
+					g2.fill( createDirectionalThumbShape( fw, fw, tw, th, 0 ) );
 				}
-				g2.fill( thumb );
 			} finally {
 				g2.dispose();
 			}
 		}
 	}
 
-	private boolean isRoundThumb() {
+	public static Shape createRoundThumbShape( float x, float y, float w, float h ) {
+		if( w == h )
+			return new Ellipse2D.Float( x, y, w, h );
+		else {
+			float arc = Math.min( w, h );
+			return new RoundRectangle2D.Float( x, y, w, h, arc, arc );
+		}
+	}
+
+	public static Shape createDirectionalThumbShape( float x, float y, float w, float h, float arc ) {
+		float wh = w / 2;
+
+		Path2D path = new Path2D.Float();
+		path.moveTo( x + wh, y + h );
+		path.lineTo( x, y + (h - wh) );
+		path.lineTo( x, y + arc );
+		path.quadTo( x, y, x + arc, y );
+		path.lineTo( x + (w - arc), y );
+		path.quadTo( x + w, y, x + w, y + arc );
+		path.lineTo( x + w, y + (h - wh) );
+		path.closePath();
+
+		return path;
+	}
+
+	protected Color getTrackValueColor() {
+		Color foreground = slider.getForeground();
+		return (foreground != defaultForeground) ? foreground : trackValueColor;
+	}
+
+	protected Color getTrackColor() {
+		Color backround = slider.getBackground();
+		return (backround != defaultBackground) ? backround : trackColor;
+	}
+
+	protected Color getThumbColor() {
+		Color foreground = slider.getForeground();
+		return (foreground != defaultForeground) ? foreground : thumbColor;
+	}
+
+	public static Color stateColor( JSlider slider, boolean hover, boolean pressed,
+		Color enabledColor, Color disabledColor, Color focusedColor, Color hoverColor, Color pressedColor )
+	{
+		if( disabledColor != null && !slider.isEnabled() )
+			return disabledColor;
+		if( pressedColor != null && pressed )
+			return pressedColor;
+		if( hoverColor != null && hover )
+			return hoverColor;
+		if( focusedColor != null && FlatUIUtils.isPermanentFocusOwner( slider ) )
+			return focusedColor;
+		return enabledColor;
+	}
+
+	protected boolean isRoundThumb() {
 		return !slider.getPaintTicks() && !slider.getPaintLabels();
 	}
+
+	@Override
+	public void setThumbLocation( int x, int y ) {
+		if( !isRoundThumb() ) {
+			// the needle of the directional thumb is painted outside of thumbRect
+			// --> must increase repaint rectangle
+
+			// set new thumb location and compute union of old and new thumb bounds
+			Rectangle r = new Rectangle( thumbRect );
+			thumbRect.setLocation( x, y );
+			SwingUtilities.computeUnion( thumbRect.x, thumbRect.y, thumbRect.width, thumbRect.height, r );
+
+			// increase union rectangle for repaint
+			int extra = (int) Math.ceil( UIScale.scale( focusWidth ) * 0.4142f );
+			if( slider.getOrientation() == JSlider.HORIZONTAL )
+				r.height += extra;
+			else {
+				r.width += extra;
+				if( !slider.getComponentOrientation().isLeftToRight() )
+					r.x -= extra;
+			}
+
+			slider.repaint( r );
+		} else
+			super.setThumbLocation( x, y );
+	}
+
+	//---- class FlatTrackListener --------------------------------------------
+
+	protected class FlatTrackListener
+		extends TrackListener
+	{
+		@Override
+		public void mouseEntered( MouseEvent e ) {
+			setThumbHover( isOverThumb( e ) );
+			super.mouseEntered( e );
+		}
+
+		@Override
+		public void mouseExited( MouseEvent e ) {
+			setThumbHover( false );
+			super.mouseExited( e );
+		}
+
+		@Override
+		public void mouseMoved( MouseEvent e ) {
+			setThumbHover( isOverThumb( e ) );
+			super.mouseMoved( e );
+		}
+
+		@Override
+		public void mousePressed( MouseEvent e ) {
+			setThumbPressed( isOverThumb( e ) );
+
+			if( !slider.isEnabled() )
+				return;
+
+			// use "old" behavior when clicking on track
+			if( UIManager.getBoolean( "Slider.scrollOnTrackClick" ) ) {
+				super.mousePressed( e );
+				return;
+			}
+
+			// "new" behavior set thumb to mouse location when clicking on track
+
+			int x = e.getX();
+			int y = e.getY();
+
+			// clicked on thumb --> let super class do the work
+			calculateGeometry();
+			if( thumbRect.contains( x, y ) ) {
+				super.mousePressed( e );
+				return;
+			}
+
+			if( UIManager.getBoolean( "Slider.onlyLeftMouseButtonDrag" ) &&
+				!SwingUtilities.isLeftMouseButton( e ) )
+			  return;
+
+			// move the mouse event coordinates to the center of the thumb
+			int tx = thumbRect.x + (thumbRect.width / 2) - x;
+			int ty = thumbRect.y + (thumbRect.height / 2) - y;
+			e.translatePoint( tx, ty );
+
+			// invoke super mousePressed() to start dragging thumb
+			super.mousePressed( e );
+
+			// move the mouse event coordinates back to current mouse location
+			e.translatePoint( -tx, -ty );
+
+			// invoke mouseDragged() to update thumb location
+			mouseDragged( e );
+
+			setThumbPressed( true );
+		}
+
+		@Override
+		public void mouseReleased( MouseEvent e ) {
+			setThumbPressed( false );
+			super.mouseReleased( e );
+		}
+
+		@Override
+		public void mouseDragged( MouseEvent e ) {
+			super.mouseDragged( e );
+
+			if( isDragging() &&
+				slider.getSnapToTicks() &&
+				slider.isEnabled() &&
+				!UIManager.getBoolean( "Slider.snapToTicksOnReleased" ) )
+			{
+				calculateThumbLocation();
+				slider.repaint();
+			}
+		}
+
+		protected void setThumbHover( boolean hover ) {
+			if( hover != thumbHover ) {
+				thumbHover = hover;
+				slider.repaint( thumbRect );
+			}
+		}
+
+		protected void setThumbPressed( boolean pressed ) {
+			if( pressed != thumbPressed ) {
+				thumbPressed = pressed;
+				slider.repaint( thumbRect );
+			}
+		}
+
+		protected boolean isOverThumb( MouseEvent e ) {
+			return e != null && slider.isEnabled() && thumbRect.contains( e.getX(), e.getY() );
+		}
+	}
 }

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

@@ -59,7 +59,7 @@ import com.formdev.flatlaf.FlatClientProperties;
  *
  * @uiDefault Component.minimumWidth			int
  * @uiDefault Spinner.buttonStyle				String	button (default) or none
- * @uiDefault Component.arrowType				String	triangle (default) or chevron
+ * @uiDefault Component.arrowType				String	chevron (default) or triangle
  * @uiDefault Component.isIntelliJTheme			boolean
  * @uiDefault Component.borderColor				Color
  * @uiDefault Component.disabledBorderColor		Color
@@ -69,6 +69,7 @@ import com.formdev.flatlaf.FlatClientProperties;
  * @uiDefault Spinner.buttonArrowColor			Color
  * @uiDefault Spinner.buttonDisabledArrowColor	Color
  * @uiDefault Spinner.buttonHoverArrowColor		Color
+ * @uiDefault Spinner.buttonPressedArrowColor	Color
  * @uiDefault Spinner.padding					Insets
  *
  * @author Karl Tauber
@@ -90,6 +91,7 @@ public class FlatSpinnerUI
 	protected Color buttonArrowColor;
 	protected Color buttonDisabledArrowColor;
 	protected Color buttonHoverArrowColor;
+	protected Color buttonPressedArrowColor;
 	protected Insets padding;
 
 	public static ComponentUI createUI( JComponent c ) {
@@ -114,6 +116,7 @@ public class FlatSpinnerUI
 		buttonArrowColor = UIManager.getColor( "Spinner.buttonArrowColor" );
 		buttonDisabledArrowColor = UIManager.getColor( "Spinner.buttonDisabledArrowColor" );
 		buttonHoverArrowColor = UIManager.getColor( "Spinner.buttonHoverArrowColor" );
+		buttonPressedArrowColor = UIManager.getColor( "Spinner.buttonPressedArrowColor" );
 		padding = UIManager.getInsets( "Spinner.padding" );
 
 		// scale
@@ -134,6 +137,7 @@ public class FlatSpinnerUI
 		buttonArrowColor = null;
 		buttonDisabledArrowColor = null;
 		buttonHoverArrowColor = null;
+		buttonPressedArrowColor = null;
 		padding = null;
 
 		MigLayoutVisualPadding.uninstall( spinner );
@@ -244,7 +248,7 @@ public class FlatSpinnerUI
 
 	private Component createArrowButton( int direction, String name ) {
 		FlatArrowButton button = new FlatArrowButton( direction, arrowType, buttonArrowColor,
-			buttonDisabledArrowColor, buttonHoverArrowColor, null );
+			buttonDisabledArrowColor, buttonHoverArrowColor, null, buttonPressedArrowColor, null );
 		button.setName( name );
 		button.setYOffset( (direction == SwingConstants.NORTH) ? 1 : -1 );
 		if( direction == SwingConstants.NORTH )
@@ -264,7 +268,7 @@ public class FlatSpinnerUI
 			FlatUIUtils.paintParentBackground( g, c );
 
 		Graphics2D g2 = (Graphics2D) g;
-		FlatUIUtils.setRenderingHints( g2 );
+		Object[] oldRenderingHints = FlatUIUtils.setRenderingHints( g2 );
 
 		int width = c.getWidth();
 		int height = c.getHeight();
@@ -303,6 +307,8 @@ public class FlatSpinnerUI
 		}
 
 		paint( g, c );
+
+		FlatUIUtils.resetRenderingHints( g, oldRenderingHints );
 	}
 
 	//---- class Handler ------------------------------------------------------

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

@@ -17,11 +17,17 @@
 package com.formdev.flatlaf.ui;
 
 import java.awt.Color;
+import java.awt.Container;
 import java.awt.Cursor;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeEvent;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JSplitPane;
 import javax.swing.SwingConstants;
+import javax.swing.ToolTipManager;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicSplitPaneDivider;
@@ -42,10 +48,16 @@ import com.formdev.flatlaf.util.UIScale;
  *
  * <!-- FlatSplitPaneUI -->
  *
- * @uiDefault Component.arrowType						String	triangle (default) or chevron
+ * @uiDefault Component.arrowType						String	chevron (default) or triangle
  * @uiDefault SplitPane.continuousLayout				boolean
  * @uiDefault SplitPaneDivider.oneTouchArrowColor		Color
  * @uiDefault SplitPaneDivider.oneTouchHoverArrowColor	Color
+ * @uiDefault SplitPaneDivider.oneTouchPressedArrowColor Color
+ * @uiDefault SplitPaneDivider.style					String	grip (default) or plain
+ * @uiDefault SplitPaneDivider.gripColor				Color
+ * @uiDefault SplitPaneDivider.gripDotCount				int
+ * @uiDefault SplitPaneDivider.gripDotSize				int
+ * @uiDefault SplitPaneDivider.gripGap					int
  *
  * @author Karl Tauber
  */
@@ -54,8 +66,9 @@ public class FlatSplitPaneUI
 {
 	protected String arrowType;
 	private Boolean continuousLayout;
-	private Color oneTouchArrowColor;
-	private Color oneTouchHoverArrowColor;
+	protected Color oneTouchArrowColor;
+	protected Color oneTouchHoverArrowColor;
+	protected Color oneTouchPressedArrowColor;
 
 	public static ComponentUI createUI( JComponent c ) {
 		return new FlatSplitPaneUI();
@@ -69,12 +82,22 @@ public class FlatSplitPaneUI
 		// used in there on LaF switching
 		oneTouchArrowColor = UIManager.getColor( "SplitPaneDivider.oneTouchArrowColor" );
 		oneTouchHoverArrowColor = UIManager.getColor( "SplitPaneDivider.oneTouchHoverArrowColor" );
+		oneTouchPressedArrowColor = UIManager.getColor( "SplitPaneDivider.oneTouchPressedArrowColor" );
 
 		super.installDefaults();
 
 		continuousLayout = (Boolean) UIManager.get( "SplitPane.continuousLayout" );
 	}
 
+	@Override
+	protected void uninstallDefaults() {
+		super.uninstallDefaults();
+
+		oneTouchArrowColor = null;
+		oneTouchHoverArrowColor = null;
+		oneTouchPressedArrowColor = null;
+	}
+
 	@Override
 	public boolean isContinuousLayout() {
 		return super.isContinuousLayout() || (continuousLayout != null && Boolean.TRUE.equals( continuousLayout ));
@@ -90,8 +113,16 @@ public class FlatSplitPaneUI
 	protected class FlatSplitPaneDivider
 		extends BasicSplitPaneDivider
 	{
+		protected final String style = UIManager.getString( "SplitPaneDivider.style" );
+		protected final Color gripColor = UIManager.getColor( "SplitPaneDivider.gripColor" );
+		protected final int gripDotCount = FlatUIUtils.getUIInt( "SplitPaneDivider.gripDotCount", 3 );
+		protected final int gripDotSize = FlatUIUtils.getUIInt( "SplitPaneDivider.gripDotSize", 3 );
+		protected final int gripGap = FlatUIUtils.getUIInt( "SplitPaneDivider.gripGap", 2 );
+
 		protected FlatSplitPaneDivider( BasicSplitPaneUI ui ) {
 			super( ui );
+
+			setLayout( new FlatDividerLayout() );
 		}
 
 		@Override
@@ -109,16 +140,67 @@ public class FlatSplitPaneUI
 			return new FlatOneTouchButton( false );
 		}
 
+		@Override
+		public void propertyChange( PropertyChangeEvent e ) {
+			super.propertyChange( e );
+
+			switch( e.getPropertyName() ) {
+				case JSplitPane.DIVIDER_LOCATION_PROPERTY:
+					// necessary to show/hide one-touch buttons on expand/collapse
+					revalidate();
+					break;
+			}
+		}
+
+		@Override
+		public void paint( Graphics g ) {
+			super.paint( g );
+
+			if( "plain".equals( style ) )
+				return;
+
+			Object[] oldRenderingHints = FlatUIUtils.setRenderingHints( g );
+
+			g.setColor( gripColor );
+			paintGrip( g, 0, 0, getWidth(), getHeight() );
+
+			FlatUIUtils.resetRenderingHints( g, oldRenderingHints );
+		}
+
+		protected void paintGrip( Graphics g, int x, int y, int width, int height ) {
+			FlatUIUtils.paintGrip( g, x, y, width, height,
+				splitPane.getOrientation() == JSplitPane.VERTICAL_SPLIT,
+				gripDotCount, gripDotSize, gripGap, true );
+		}
+
+		protected boolean isLeftCollapsed() {
+			int location = splitPane.getDividerLocation();
+			Insets insets = splitPane.getInsets();
+			return (orientation == JSplitPane.VERTICAL_SPLIT)
+				? location == insets.top
+				: location == insets.left;
+		}
+
+		protected boolean isRightCollapsed() {
+			int location = splitPane.getDividerLocation();
+			Insets insets = splitPane.getInsets();
+			return (orientation == JSplitPane.VERTICAL_SPLIT)
+				? location == (splitPane.getHeight() - getHeight() - insets.bottom)
+				: location == (splitPane.getWidth() - getWidth() - insets.right);
+		}
+
 		//---- class FlatOneTouchButton ---------------------------------------
 
-		private class FlatOneTouchButton
+		protected class FlatOneTouchButton
 			extends FlatArrowButton
 		{
-			private final boolean left;
+			protected final boolean left;
 
-			public FlatOneTouchButton( boolean left ) {
-				super( SwingConstants.NORTH, arrowType, oneTouchArrowColor, null, oneTouchHoverArrowColor, null );
+			protected FlatOneTouchButton( boolean left ) {
+				super( SwingConstants.NORTH, arrowType, oneTouchArrowColor, null,
+					oneTouchHoverArrowColor, null, oneTouchPressedArrowColor, null );
 				setCursor( Cursor.getPredefinedCursor( Cursor.DEFAULT_CURSOR ) );
+				ToolTipManager.sharedInstance().registerComponent( this );
 
 				this.left = left;
 			}
@@ -129,7 +211,67 @@ public class FlatSplitPaneUI
 					? (left ? SwingConstants.NORTH : SwingConstants.SOUTH)
 					: (left ? SwingConstants.WEST : SwingConstants.EAST);
 			}
+
+			@Override
+			public String getToolTipText( MouseEvent e ) {
+				String key = (orientation == JSplitPane.VERTICAL_SPLIT)
+					? (left
+						? (isRightCollapsed()
+							? "SplitPaneDivider.expandBottomToolTipText"
+							: "SplitPaneDivider.collapseTopToolTipText")
+						: (isLeftCollapsed()
+							? "SplitPaneDivider.expandTopToolTipText"
+							: "SplitPaneDivider.collapseBottomToolTipText"))
+					: (left
+						? (isRightCollapsed()
+							? "SplitPaneDivider.expandRightToolTipText"
+							: "SplitPaneDivider.collapseLeftToolTipText")
+						: (isLeftCollapsed()
+							? "SplitPaneDivider.expandLeftToolTipText"
+							: "SplitPaneDivider.collapseRightToolTipText"));
+
+				// get text from client property
+				Object value = splitPane.getClientProperty( key );
+				if( value instanceof String )
+					return (String) value;
+
+				// get text from bundle
+				return UIManager.getString( key, getLocale() );
+			}
+		}
+
+		//---- class FlatDividerLayout ----------------------------------------
+
+		protected class FlatDividerLayout
+			extends DividerLayout
+		{
+			@Override
+			public void layoutContainer( Container c ) {
+				super.layoutContainer( c );
+
+				if( leftButton == null || rightButton == null || !splitPane.isOneTouchExpandable() )
+					return;
+
+				// increase side of buttons, which makes them easier to hit by the user
+				// and avoids cut arrows at small divider sizes
+				int extraSize = UIScale.scale( 4 );
+				if( orientation == JSplitPane.VERTICAL_SPLIT ) {
+					leftButton.setSize( leftButton.getWidth() + extraSize, leftButton.getHeight() );
+					rightButton.setBounds( leftButton.getX() + leftButton.getWidth(), rightButton.getY(),
+						rightButton.getWidth() + extraSize, rightButton.getHeight() );
+				} else {
+					leftButton.setSize( leftButton.getWidth(), leftButton.getHeight() + extraSize );
+					rightButton.setBounds( rightButton.getX(), leftButton.getY() + leftButton.getHeight(),
+						rightButton.getWidth(), rightButton.getHeight() + extraSize );
+				}
+
+				// hide buttons if not applicable
+				boolean leftCollapsed = isLeftCollapsed();
+				if( leftCollapsed )
+					rightButton.setLocation( leftButton.getLocation() );
+				leftButton.setVisible( !leftCollapsed );
+				rightButton.setVisible( !isRightCollapsed() );
+			}
 		}
 	}
-
 }

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

@@ -31,6 +31,7 @@ import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
+import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingConstants;
 import javax.swing.UIManager;
 import javax.swing.border.Border;
@@ -98,10 +99,13 @@ public class FlatTableHeaderUI
 
 	@Override
 	public void paint( Graphics g, JComponent c ) {
+		if( header.getColumnModel().getColumnCount() <= 0 )
+			return;
+
 		// do not paint borders if JTableHeader.setDefaultRenderer() was used
 		TableCellRenderer defaultRenderer = header.getDefaultRenderer();
 		boolean paintBorders = isSystemDefaultRenderer( defaultRenderer );
-		if( !paintBorders && header.getColumnModel().getColumnCount() > 0 ) {
+		if( !paintBorders ) {
 			// check whether the renderer delegates to the system default renderer
 			Component rendererComponent = defaultRenderer.getTableCellRendererComponent(
 				header.getTable(), "", false, false, -1, 0 );
@@ -137,7 +141,7 @@ public class FlatTableHeaderUI
 			   rendererClassName.equals( "sun.swing.FilePane$AlignableTableHeaderRenderer" );
 	}
 
-	private void paintColumnBorders( Graphics g, JComponent c ) {
+	protected void paintColumnBorders( Graphics g, JComponent c ) {
 		int width = c.getWidth();
 		int height = c.getHeight();
 		float lineWidth = UIScale.scale( 1f );
@@ -145,6 +149,9 @@ public class FlatTableHeaderUI
 		float bottomLineIndent = lineWidth * 3;
 		TableColumnModel columnModel = header.getColumnModel();
 		int columnCount = columnModel.getColumnCount();
+		int sepCount = columnCount;
+		if( hideLastVerticalLine() )
+			sepCount--;
 
 		Graphics2D g2 = (Graphics2D) g.create();
 		try {
@@ -157,23 +164,30 @@ public class FlatTableHeaderUI
 			// paint column separator lines
 			g2.setColor( separatorColor );
 
-			int sepCount = columnCount;
-			if( header.getTable() != null && header.getTable().getAutoResizeMode() != JTable.AUTO_RESIZE_OFF && !isVerticalScrollBarVisible() )
-				sepCount--;
+			float y = topLineIndent;
+			float h = height - bottomLineIndent;
 
 			if( header.getComponentOrientation().isLeftToRight() ) {
 				int x = 0;
 				for( int i = 0; i < sepCount; i++ ) {
 					x += columnModel.getColumn( i ).getWidth();
-					g2.fill( new Rectangle2D.Float( x - lineWidth, topLineIndent, lineWidth, height - bottomLineIndent ) );
+					g2.fill( new Rectangle2D.Float( x - lineWidth, y, lineWidth, h ) );
 				}
+
+				// paint trailing separator (on right side)
+				if( !hideTrailingVerticalLine() )
+					g2.fill( new Rectangle2D.Float( header.getWidth() - lineWidth, y, lineWidth, h ) );
 			} else {
-				int x = width;
+				Rectangle cellRect = header.getHeaderRect( 0 );
+				int x = cellRect.x + cellRect.width;
 				for( int i = 0; i < sepCount; i++ ) {
 					x -= columnModel.getColumn( i ).getWidth();
-					g2.fill( new Rectangle2D.Float( x - (i < sepCount - 1 ? lineWidth : 0),
-						topLineIndent, lineWidth, height - bottomLineIndent ) );
+					g2.fill( new Rectangle2D.Float( x - (i < sepCount - 1 ? lineWidth : 0), y, lineWidth, h ) );
 				}
+
+				// paint trailing separator (on left side)
+				if( !hideTrailingVerticalLine() )
+					g2.fill( new Rectangle2D.Float( 0, y, lineWidth, h ) );
 			}
 		} finally {
 			g2.dispose();
@@ -230,20 +244,30 @@ public class FlatTableHeaderUI
 		return size;
 	}
 
-	private boolean isVerticalScrollBarVisible() {
-		JScrollPane scrollPane = getScrollPane();
-		return (scrollPane != null && scrollPane.getVerticalScrollBar() != null)
-			? scrollPane.getVerticalScrollBar().isVisible()
-			: false;
+	protected boolean hideLastVerticalLine() {
+		Container viewport = header.getParent();
+		Container viewportParent = (viewport != null) ? viewport.getParent() : null;
+		if( !(viewportParent instanceof JScrollPane) )
+			return false;
+
+		Rectangle cellRect = header.getHeaderRect( header.getColumnModel().getColumnCount() - 1 );
+
+		// using component orientation of scroll pane here because it is also used in FlatTableUI
+		JScrollPane scrollPane = (JScrollPane) viewportParent;
+		return scrollPane.getComponentOrientation().isLeftToRight()
+			? cellRect.x + cellRect.width >= viewport.getWidth()
+			: cellRect.x <= 0;
 	}
 
-	private JScrollPane getScrollPane() {
-		Container parent = header.getParent();
-		if( parent == null )
-			return null;
+	protected boolean hideTrailingVerticalLine() {
+		Container viewport = header.getParent();
+		Container viewportParent = (viewport != null) ? viewport.getParent() : null;
+		if( !(viewportParent instanceof JScrollPane) )
+			return false;
 
-		parent = parent.getParent();
-		return (parent instanceof JScrollPane) ? (JScrollPane) parent : null;
+		JScrollPane scrollPane = (JScrollPane) viewportParent;
+		return viewport == scrollPane.getColumnHeader() &&
+			scrollPane.getCorner( ScrollPaneConstants.UPPER_TRAILING_CORNER ) == null;
 	}
 
 	//---- class FlatTableCellHeaderRenderer ----------------------------------

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

@@ -17,17 +17,23 @@
 package com.formdev.flatlaf.ui;
 
 import java.awt.Color;
+import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.EventQueue;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import javax.swing.JCheckBox;
+import java.awt.geom.Rectangle2D;
 import javax.swing.JComponent;
+import javax.swing.JScrollPane;
+import javax.swing.JViewport;
 import javax.swing.LookAndFeel;
+import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicTableUI;
-import javax.swing.table.TableCellRenderer;
+import com.formdev.flatlaf.util.Graphics2DProxy;
 import com.formdev.flatlaf.util.UIScale;
 
 /**
@@ -129,12 +135,6 @@ public class FlatTableUI
 			oldIntercellSpacing = table.getIntercellSpacing();
 			table.setIntercellSpacing( intercellSpacing );
 		}
-
-		// checkbox is non-opaque in FlatLaf and therefore would not paint selection
-		// --> make checkbox renderer opaque (but opaque in Metal or Windows LaF)
-		TableCellRenderer booleanRenderer = table.getDefaultRenderer( Boolean.class );
-		if( booleanRenderer instanceof JCheckBox )
-			((JCheckBox)booleanRenderer).setOpaque( true );
 	}
 
 	@Override
@@ -203,4 +203,94 @@ public class FlatTableUI
 				table.setSelectionForeground( selectionInactiveForeground );
 		}
 	}
+
+	@Override
+	public void paint( Graphics g, JComponent c ) {
+		boolean horizontalLines = table.getShowHorizontalLines();
+		boolean verticalLines = table.getShowVerticalLines();
+		if( horizontalLines || verticalLines ) {
+			// fix grid painting issues in BasicTableUI
+			//   - do not paint last vertical grid line if line is on right edge of scroll pane
+			//   - fix unstable grid line thickness when scaled at 125%, 150%, 175%, 225%, ...
+			//     which paints either 1px or 2px lines depending on location
+
+			boolean hideLastVerticalLine = hideLastVerticalLine();
+			int tableWidth = table.getWidth();
+
+			double systemScaleFactor = UIScale.getSystemScaleFactor( (Graphics2D) g );
+			double lineThickness = (1. / systemScaleFactor) * (int) systemScaleFactor;
+
+			// Java 8 uses drawLine() to paint grid lines
+			// Java 9+ uses fillRect() to paint grid lines
+			g = new Graphics2DProxy( (Graphics2D) g ) {
+				@Override
+				public void drawLine( int x1, int y1, int x2, int y2 ) {
+					// do not paint last vertical line
+					if( hideLastVerticalLine && verticalLines &&
+						x1 == x2 && y1 == 0 && x1 == tableWidth - 1 &&
+						wasInvokedFromPaintGrid() )
+					  return;
+
+					super.drawLine( x1, y1, x2, y2 );
+				}
+
+				@Override
+				public void fillRect( int x, int y, int width, int height ) {
+					// do not paint last vertical line
+					if( hideLastVerticalLine && verticalLines &&
+						width == 1 && y == 0 && x == tableWidth - 1 &&
+						wasInvokedFromPaintGrid() )
+					  return;
+
+					// reduce line thickness to avoid unstable painted line thickness
+					if( lineThickness != 1 ) {
+						if( horizontalLines && height == 1 && wasInvokedFromPaintGrid() ) {
+							super.fill( new Rectangle2D.Double( x, y, width, lineThickness ) );
+							return;
+						}
+						if( verticalLines && width == 1 && y == 0 && wasInvokedFromPaintGrid() ) {
+							super.fill( new Rectangle2D.Double( x, y, lineThickness, height ) );
+							return;
+						}
+					}
+
+					super.fillRect( x, y, width, height );
+				}
+
+				private boolean wasInvokedFromPaintGrid() {
+					StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+					for( int i = 0; i < 10 || i < stackTrace.length; i++ ) {
+						if( "javax.swing.plaf.basic.BasicTableUI".equals( stackTrace[i].getClassName() ) &&
+							"paintGrid".equals( stackTrace[i].getMethodName() ) )
+						  return true;
+					}
+					return false;
+				}
+			};
+		}
+
+		super.paint( g, c );
+	}
+
+	protected boolean hideLastVerticalLine() {
+		Container viewport = SwingUtilities.getUnwrappedParent( table );
+		Container viewportParent = (viewport != null) ? viewport.getParent() : null;
+		if( !(viewportParent instanceof JScrollPane) )
+			return false;
+
+		// do not hide last vertical line if table is smaller than viewport
+		if( table.getX() + table.getWidth() < viewport.getWidth() )
+			return false;
+
+		// in left-to-right:
+		//   - do not hide last vertical line if table used as row header in scroll pane
+		// in right-to-left:
+		//   - hide last vertical line if table used as row header in scroll pane
+		//   - do not hide last vertical line if table is in center and scroll pane has row header
+		JScrollPane scrollPane = (JScrollPane) viewportParent;
+		JViewport rowHeader = scrollPane.getRowHeader();
+		return scrollPane.getComponentOrientation().isLeftToRight()
+			? (viewport != rowHeader)
+			: (viewport == rowHeader || rowHeader == null);
+	}
 }

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

@@ -39,6 +39,7 @@ import javax.swing.text.Caret;
 import javax.swing.text.JTextComponent;
 import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.util.HiDPIUtils;
+import com.formdev.flatlaf.util.JavaCompatibility;
 
 /**
  * Provides the Flat LaF UI delegate for {@link javax.swing.JTextField}.
@@ -64,6 +65,7 @@ import com.formdev.flatlaf.util.HiDPIUtils;
  * @uiDefault Component.isIntelliJTheme			boolean
  * @uiDefault TextField.placeholderForeground	Color
  * @uiDefault TextComponent.selectAllOnFocusPolicy	String	never, once (default) or always
+ * @uiDefault TextComponent.selectAllOnMouseClick	boolean
  *
  * @author Karl Tauber
  */
@@ -121,7 +123,8 @@ public class FlatTextFieldUI
 
 	@Override
 	protected Caret createCaret() {
-		return new FlatCaret( UIManager.getString( "TextComponent.selectAllOnFocusPolicy" ) );
+		return new FlatCaret( UIManager.getString( "TextComponent.selectAllOnFocusPolicy"),
+			UIManager.getBoolean( "TextComponent.selectAllOnMouseClick" ) );
 	}
 
 	@Override
@@ -211,7 +214,9 @@ public class FlatTextFieldUI
 
 		// paint placeholder
 		g.setColor( placeholderForeground );
-		FlatUIUtils.drawString( c, g, (String) placeholder, x, y );
+		String clippedPlaceholder = JavaCompatibility.getClippedString( jc, fm,
+				(String) placeholder, c.getWidth() - insets.left - insets.right );
+		FlatUIUtils.drawString( c, g, clippedPlaceholder, x, y );
 	}
 
 	@Override

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

@@ -76,6 +76,7 @@ import com.formdev.flatlaf.util.UIScale;
  * @uiDefault TitlePane.foreground							Color
  * @uiDefault TitlePane.inactiveForeground					Color
  * @uiDefault TitlePane.embeddedForeground					Color
+ * @uiDefault TitlePane.borderColor							Color	optional
  * @uiDefault TitlePane.iconSize							Dimension
  * @uiDefault TitlePane.iconMargins							Insets
  * @uiDefault TitlePane.titleMargins						Insets
@@ -97,6 +98,7 @@ public class FlatTitlePane
 	protected final Color activeForeground = UIManager.getColor( "TitlePane.foreground" );
 	protected final Color inactiveForeground = UIManager.getColor( "TitlePane.inactiveForeground" );
 	protected final Color embeddedForeground = UIManager.getColor( "TitlePane.embeddedForeground" );
+	protected final Color borderColor = UIManager.getColor( "TitlePane.borderColor" );
 
 	protected final Insets menuBarMargins = UIManager.getInsets( "TitlePane.menuBarMargins" );
 	protected final Dimension iconSize = UIManager.getDimension( "TitlePane.iconSize" );
@@ -157,7 +159,7 @@ public class FlatTitlePane
 			@Override
 			public Dimension getPreferredSize() {
 				JMenuBar menuBar = rootPane.getJMenuBar();
-				return (menuBar != null && isMenuBarEmbedded())
+				return (menuBar != null && menuBar.isVisible() && isMenuBarEmbedded())
 					? FlatUIUtils.addInsets( menuBar.getPreferredSize(), UIScale.scale( menuBarMargins ) )
 					: new Dimension();
 			}
@@ -238,7 +240,7 @@ public class FlatTitlePane
 	}
 
 	protected void activeChanged( boolean active ) {
-		boolean hasEmbeddedMenuBar = rootPane.getJMenuBar() != null && isMenuBarEmbedded();
+		boolean hasEmbeddedMenuBar = rootPane.getJMenuBar() != null && rootPane.getJMenuBar().isVisible() && isMenuBarEmbedded();
 		Color background = FlatUIUtils.nonUIResource( active ? activeBackground : inactiveBackground );
 		Color foreground = FlatUIUtils.nonUIResource( active ? activeForeground : inactiveForeground );
 		Color titleForeground = (hasEmbeddedMenuBar && active) ? FlatUIUtils.nonUIResource( embeddedForeground ) : foreground;
@@ -422,6 +424,10 @@ public class FlatTitlePane
 	protected void menuBarChanged() {
 		menuBarPlaceholder.invalidate();
 
+		// necessary for the case that an embedded menu bar is made invisible
+		// and a border color is specified
+		repaint();
+
 		// update title foreground color
 		EventQueue.invokeLater( () -> {
 			activeChanged( window == null || window.isActive() );
@@ -662,12 +668,13 @@ debug*/
 		public Insets getBorderInsets( Component c, Insets insets ) {
 			super.getBorderInsets( c, insets );
 
-			// if menu bar is embedded, add bottom insets of menu bar border
 			Border menuBarBorder = getMenuBarBorder();
 			if( menuBarBorder != null ) {
+				// if menu bar is embedded, add bottom insets of menu bar border
 				Insets menuBarInsets = menuBarBorder.getBorderInsets( c );
 				insets.bottom += menuBarInsets.bottom;
-			}
+			} else if( borderColor != null && (rootPane.getJMenuBar() == null || !rootPane.getJMenuBar().isVisible()) )
+				insets.bottom += UIScale.scale( 1 );
 
 			if( hasJBRCustomDecoration() )
 				insets = FlatUIUtils.addInsets( insets, JBRWindowTopBorder.getInstance().getBorderInsets() );
@@ -677,10 +684,16 @@ debug*/
 
 		@Override
 		public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
-			// if menu bar is embedded, paint menu bar border
+			// paint bottom border
 			Border menuBarBorder = getMenuBarBorder();
-			if( menuBarBorder != null )
+			if( menuBarBorder != null ) {
+				// if menu bar is embedded, paint menu bar border
 				menuBarBorder.paintBorder( c, g, x, y, width, height );
+			} else if( borderColor != null && (rootPane.getJMenuBar() == null || !rootPane.getJMenuBar().isVisible()) ) {
+				// paint border between title pane and content if border color is specified
+				float lineHeight = UIScale.scale( (float) 1 );
+				FlatUIUtils.paintFilledRectangle( g, borderColor, x, y + height - lineHeight, width, lineHeight );
+			}
 
 			if( hasJBRCustomDecoration() )
 				JBRWindowTopBorder.getInstance().paintBorder( c, g, x, y, width, height );
@@ -688,7 +701,7 @@ debug*/
 
 		protected Border getMenuBarBorder() {
 			JMenuBar menuBar = rootPane.getJMenuBar();
-			return (menuBar != null && isMenuBarEmbedded()) ? menuBar.getBorder() : null;
+			return (menuBar != null && menuBar.isVisible() && isMenuBarEmbedded()) ? menuBar.getBorder() : null;
 		}
 	}
 

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

@@ -146,10 +146,17 @@ public class FlatToggleButtonUI
 			int height = c.getHeight();
 			int width = c.getWidth();
 			boolean selected = ((AbstractButton)c).isSelected();
+			Color enabledColor = selected ? clientPropertyColor( c, TAB_BUTTON_SELECTED_BACKGROUND, tabSelectedBackground ) : null;
+
+			// use component background if explicitly set
+			if( enabledColor == null ) {
+				Color bg = c.getBackground();
+				if( isCustomBackground( bg ) )
+					enabledColor = bg;
+			}
 
 			// paint background
-			Color background = buttonStateColor( c,
-				selected ? clientPropertyColor( c, TAB_BUTTON_SELECTED_BACKGROUND, tabSelectedBackground ) : null,
+			Color background = buttonStateColor( c, enabledColor,
 				null, tabFocusBackground, tabHoverBackground, null );
 			if( background != null ) {
 				g.setColor( background );

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

@@ -16,15 +16,16 @@
 
 package com.formdev.flatlaf.ui;
 
-import static com.formdev.flatlaf.util.UIScale.*;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Insets;
+import java.awt.Rectangle;
 import javax.swing.JToolBar;
 import javax.swing.SwingConstants;
 import javax.swing.UIManager;
+import com.formdev.flatlaf.util.UIScale;
 
 /**
  * Border for {@link javax.swing.JToolBar}.
@@ -39,7 +40,7 @@ public class FlatToolBarBorder
 {
 	private static final int DOT_COUNT = 4;
 	private static final int DOT_SIZE = 2;
-	private static final int GRIP_WIDTH = DOT_SIZE * 3;
+	private static final int GRIP_SIZE = DOT_SIZE * 3;
 
 	protected final Color gripColor = UIManager.getColor( "ToolBar.gripColor" );
 
@@ -64,35 +65,27 @@ public class FlatToolBarBorder
 	}
 
 	protected void paintGrip( Component c, Graphics g, int x, int y, int width, int height ) {
-		int dotSize = scale( DOT_SIZE );
-		int gapSize = dotSize;
-		int gripSize = (dotSize * DOT_COUNT) + ((gapSize * (DOT_COUNT - 1)));
+		Rectangle r = calculateGripBounds( c, x, y, width, height );
+		FlatUIUtils.paintGrip( g, r.x, r.y, r.width, r.height,
+			((JToolBar)c).getOrientation() == SwingConstants.VERTICAL,
+			DOT_COUNT, DOT_SIZE, DOT_SIZE, false );
+	}
 
-		// include toolbar margin in grip position calculation
-		Insets insets = getBorderInsets( c );
+	protected Rectangle calculateGripBounds( Component c, int x, int y, int width, int height ) {
+		// include toolbar margin in grip bounds calculation
+		Insets insets = super.getBorderInsets( c, new Insets( 0, 0, 0, 0 ) );
+		Rectangle r = FlatUIUtils.subtractInsets( new Rectangle( x, y, width, height ), insets );
 
-		// calculate grip position
-		boolean horizontal = ((JToolBar)c).getOrientation() == SwingConstants.HORIZONTAL;
-		if( horizontal ) {
-			if( c.getComponentOrientation().isLeftToRight() )
-				x += insets.left - (dotSize * 2);
-			else
-				x += width - insets.right + dotSize;
-			y += Math.round( (height - gripSize) / 2f );
-		} else {
-			// vertical
-			x += Math.round( (width - gripSize) / 2f );
-			y += insets.top - (dotSize * 2);
-		}
+		// calculate grip bounds
+		int gripSize = UIScale.scale( GRIP_SIZE );
+		if( ((JToolBar)c).getOrientation() == SwingConstants.HORIZONTAL ) {
+			if( !c.getComponentOrientation().isLeftToRight() )
+				r.x = r.x + r.width - gripSize;
+			r.width = gripSize;
+		} else
+			r.height = gripSize;
 
-		// paint dots
-		for( int i = 0; i < DOT_COUNT; i++ ) {
-			g.fillOval( x, y, dotSize, dotSize );
-			if( horizontal )
-				y += dotSize + gapSize;
-			else
-				x += dotSize + gapSize;
-		}
+		return r;
 	}
 
 	@Override
@@ -101,7 +94,7 @@ public class FlatToolBarBorder
 
 		// add grip inset if floatable
 		if( c instanceof JToolBar && ((JToolBar)c).isFloatable() ) {
-			int gripInset = scale( GRIP_WIDTH );
+			int gripInset = UIScale.scale( GRIP_SIZE );
 			if( ((JToolBar)c).getOrientation() == SwingConstants.HORIZONTAL ) {
 				if( c.getComponentOrientation().isLeftToRight() )
 					insets.left += gripInset;

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

@@ -106,13 +106,15 @@ public class FlatToolBarSeparatorUI
 		float lineWidth = scale( 1f );
 		float offset = scale( 2f );
 
-		FlatUIUtils.setRenderingHints( (Graphics2D) g );
+		Object[] oldRenderingHints = FlatUIUtils.setRenderingHints( g );
 		g.setColor( separatorColor );
 
 		if( isVertical( c ) )
 			((Graphics2D)g).fill( new Rectangle2D.Float( Math.round( (width - lineWidth) / 2f ), offset, lineWidth, height - (offset * 2) ) );
 		else
 			((Graphics2D)g).fill( new Rectangle2D.Float( offset, Math.round( (height - lineWidth) / 2f ), width - (offset * 2), lineWidth ) );
+
+		FlatUIUtils.resetRenderingHints( g, oldRenderingHints );
 	}
 
 	private boolean isVertical( JComponent c ) {

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

@@ -116,7 +116,6 @@ public class FlatToolTipUI
 			FontMetrics fm = c.getFontMetrics( c.getFont() );
 			Insets insets = c.getInsets();
 
-			FlatUIUtils.setRenderingHints( (Graphics2D) g );
 			g.setColor( c.getForeground() );
 
 			List<String> lines = StringUtils.split( ((JToolTip)c).getTipText(), '\n' );

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

@@ -16,6 +16,8 @@
 
 package com.formdev.flatlaf.ui;
 
+import static com.formdev.flatlaf.FlatClientProperties.*;
+
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics;
@@ -26,7 +28,9 @@ import java.awt.event.MouseListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import javax.swing.CellRendererPane;
+import javax.swing.Icon;
 import javax.swing.JComponent;
+import javax.swing.JLabel;
 import javax.swing.JTree;
 import javax.swing.LookAndFeel;
 import javax.swing.SwingUtilities;
@@ -145,9 +149,6 @@ public class FlatTreeUI
 
 	@Override
 	protected MouseListener createMouseListener() {
-		if( !wideSelection )
-			return super.createMouseListener();
-
 		return new BasicTreeUI.MouseHandler() {
 			@Override
 			public void mousePressed( MouseEvent e ) {
@@ -165,7 +166,7 @@ public class FlatTreeUI
 			}
 
 			private MouseEvent handleWideMouseEvent( MouseEvent e ) {
-				if( !tree.isEnabled() || !SwingUtilities.isLeftMouseButton( e ) || e.isConsumed() )
+				if( !isWideSelection() || !tree.isEnabled() || !SwingUtilities.isLeftMouseButton( e ) || e.isConsumed() )
 					return e;
 
 				int x = e.getX();
@@ -192,18 +193,26 @@ public class FlatTreeUI
 
 	@Override
 	protected PropertyChangeListener createPropertyChangeListener() {
-		if( !wideSelection )
-			return super.createPropertyChangeListener();
-
 		return new BasicTreeUI.PropertyChangeHandler() {
 			@Override
 			public void propertyChange( PropertyChangeEvent e ) {
 				super.propertyChange( e );
 
-				if( e.getSource() == tree && e.getPropertyName() == "dropLocation" ) {
-					JTree.DropLocation oldValue = (JTree.DropLocation) e.getOldValue();
-					repaintWideDropLocation( oldValue );
-					repaintWideDropLocation( tree.getDropLocation() );
+				if( e.getSource() == tree ) {
+					switch( e.getPropertyName() ) {
+						case TREE_WIDE_SELECTION:
+						case TREE_PAINT_SELECTION:
+							tree.repaint();
+							break;
+
+						case "dropLocation":
+							if( isWideSelection() ) {
+								JTree.DropLocation oldValue = (JTree.DropLocation) e.getOldValue();
+								repaintWideDropLocation( oldValue );
+								repaintWideDropLocation( tree.getDropLocation() );
+							}
+							break;
+					}
 				}
 			}
 
@@ -227,34 +236,22 @@ public class FlatTreeUI
 		TreePath path, int row, boolean isExpanded, boolean hasBeenExpanded, boolean isLeaf )
 	{
 		boolean isEditing = (editingComponent != null && editingRow == row);
-		boolean hasFocus = FlatUIUtils.isPermanentFocusOwner( tree );
-		boolean cellHasFocus = hasFocus && (row == getLeadSelectionRow());
 		boolean isSelected = tree.isRowSelected( row );
 		boolean isDropRow = isDropRow( row );
+		boolean needsSelectionPainting = (isSelected || isDropRow) && isPaintSelection();
+
+		// do not paint row if editing, except if selection needs painted
+		if( isEditing && !needsSelectionPainting )
+			return;
+
+		boolean hasFocus = FlatUIUtils.isPermanentFocusOwner( tree );
+		boolean cellHasFocus = hasFocus && (row == getLeadSelectionRow());
 
 		// if tree is used as cell renderer in another component (e.g. in Rhino JavaScript debugger),
 		// check whether that component is focused to get correct selection colors
 		if( !hasFocus && isSelected && tree.getParent() instanceof CellRendererPane )
 			hasFocus = FlatUIUtils.isPermanentFocusOwner( tree.getParent().getParent() );
 
-		// wide selection background
-		if( wideSelection && (isSelected || isDropRow) ) {
-			// fill background
-			g.setColor( isDropRow
-				? UIManager.getColor( "Tree.dropCellBackground" )
-				: (hasFocus ? selectionBackground : selectionInactiveBackground) );
-			g.fillRect( 0, bounds.y, tree.getWidth(), bounds.height );
-
-			// paint expand/collapse icon
-			if( shouldPaintExpandControl( path, row, isExpanded, hasBeenExpanded, isLeaf ) ) {
-				paintExpandControl( g, clipBounds, insets, bounds,
-					path, row, isExpanded, hasBeenExpanded, isLeaf );
-			}
-		}
-
-		if( isEditing )
-			return;
-
 		// get renderer component
 		Component rendererComponent = currentCellRenderer.getTreeCellRendererComponent( tree,
 			path.getLastPathComponent(), isSelected, isExpanded, isLeaf, row, cellHasFocus );
@@ -290,8 +287,51 @@ public class FlatTreeUI
 			}
 		}
 
+		// paint selection background
+		if( needsSelectionPainting ) {
+			// set selection color
+			Color oldColor = g.getColor();
+			g.setColor( isDropRow
+				? UIManager.getColor( "Tree.dropCellBackground" )
+				: (rendererComponent instanceof DefaultTreeCellRenderer
+					? ((DefaultTreeCellRenderer)rendererComponent).getBackgroundSelectionColor()
+					: (hasFocus ? selectionBackground : selectionInactiveBackground)) );
+
+			if( isWideSelection() ) {
+				// wide selection
+				g.fillRect( 0, bounds.y, tree.getWidth(), bounds.height );
+
+				// paint expand/collapse icon
+				// (was already painted before, but painted over with wide selection)
+				if( shouldPaintExpandControl( path, row, isExpanded, hasBeenExpanded, isLeaf ) ) {
+					paintExpandControl( g, clipBounds, insets, bounds,
+						path, row, isExpanded, hasBeenExpanded, isLeaf );
+				}
+			} else {
+				// non-wide selection
+				int xOffset = 0;
+				int imageOffset = 0;
+
+				if( rendererComponent instanceof JLabel ) {
+					JLabel label = (JLabel) rendererComponent;
+					Icon icon = label.getIcon();
+					imageOffset = (icon != null && label.getText() != null)
+						? icon.getIconWidth() + Math.max( label.getIconTextGap() - 1, 0 )
+						: 0;
+					xOffset = label.getComponentOrientation().isLeftToRight() ? imageOffset : 0;
+				}
+
+				g.fillRect( bounds.x + xOffset, bounds.y, bounds.width - imageOffset, bounds.height );
+			}
+
+			// this is actually not necessary because renderer should always set color
+			// before painting, but doing anyway to avoid any side effect (in bad renderers)
+			g.setColor( oldColor );
+		}
+
 		// paint renderer
-		rendererPane.paintComponent( g, rendererComponent, tree, bounds.x, bounds.y, bounds.width, bounds.height, true );
+		if( !isEditing )
+			rendererPane.paintComponent( g, rendererComponent, tree, bounds.x, bounds.y, bounds.width, bounds.height, true );
 
 		// restore background selection color and border selection color
 		if( oldBackgroundSelectionColor != null )
@@ -314,6 +354,14 @@ public class FlatTreeUI
 	@Override
 	protected Rectangle getDropLineRect( DropLocation loc ) {
 		Rectangle r = super.getDropLineRect( loc );
-		return wideSelection ? new Rectangle( 0, r.y, tree.getWidth(), r.height ) : r;
+		return isWideSelection() ? new Rectangle( 0, r.y, tree.getWidth(), r.height ) : r;
+	}
+
+	protected boolean isWideSelection() {
+		return clientPropertyBoolean( tree, TREE_WIDE_SELECTION, wideSelection );
+	}
+
+	protected boolean isPaintSelection() {
+		return clientPropertyBoolean( tree, TREE_PAINT_SELECTION, true );
 	}
 }

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

@@ -23,21 +23,23 @@ import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
 import java.awt.Insets;
 import java.awt.KeyboardFocusManager;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.Shape;
+import java.awt.Window;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
+import java.awt.geom.Ellipse2D;
 import java.awt.geom.Path2D;
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.RoundRectangle2D;
 import java.util.IdentityHashMap;
 import java.util.WeakHashMap;
-import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 import javax.swing.JComponent;
 import javax.swing.JTable;
@@ -127,6 +129,10 @@ public class FlatUIUtils
 		return (value instanceof Number) ? ((Number)value).floatValue() : defaultValue;
 	}
 
+	public static boolean isChevron( String arrowType ) {
+		return !"triangle".equals( arrowType );
+	}
+
 	public static Color nonUIResource( Color c ) {
 		return (c instanceof UIResource) ? new Color( c.getRGB(), true ) : c;
 	}
@@ -170,12 +176,32 @@ public class FlatUIUtils
 	 * Returns whether the given component is the permanent focus owner and
 	 * is in the active window. Used to paint focus indicators.
 	 */
+	@SuppressWarnings( "unchecked" )
 	public static boolean isPermanentFocusOwner( Component c ) {
 		KeyboardFocusManager keyboardFocusManager = KeyboardFocusManager.getCurrentKeyboardFocusManager();
+
+		if( c instanceof JComponent ) {
+			Object value = ((JComponent)c).getClientProperty( FlatClientProperties.COMPONENT_FOCUS_OWNER );
+			if( value instanceof Predicate ) {
+				return ((Predicate<JComponent>)value).test( (JComponent) c ) &&
+					keyboardFocusManager.getActiveWindow() == SwingUtilities.windowForComponent( c );
+			}
+		}
+
 		return keyboardFocusManager.getPermanentFocusOwner() == c &&
 			keyboardFocusManager.getActiveWindow() == SwingUtilities.windowForComponent( c );
 	}
 
+	/**
+	 * Returns whether the given component is in a window that is in full-screen mode.
+	 */
+	public static boolean isFullScreen( Component c ) {
+		GraphicsConfiguration gc = c.getGraphicsConfiguration();
+		GraphicsDevice gd = (gc != null) ? gc.getDevice() : null;
+		Window fullScreenWindow = (gd != null) ? gd.getFullScreenWindow() : null;
+		return (fullScreenWindow != null && fullScreenWindow == SwingUtilities.windowForComponent( c ));
+	}
+
 	public static Boolean isRoundRect( Component c ) {
 		return (c instanceof JComponent)
 			? FlatClientProperties.clientPropertyBooleanStrict(
@@ -222,10 +248,57 @@ public class FlatUIUtils
 	/**
 	 * Sets rendering hints used for painting.
 	 */
-	public static void setRenderingHints( Graphics2D g ) {
-		g.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON );
-		g.setRenderingHint( RenderingHints.KEY_STROKE_CONTROL,
+	public static Object[] setRenderingHints( Graphics g ) {
+		Graphics2D g2 = (Graphics2D) g;
+		Object[] oldRenderingHints = new Object[] {
+			g2.getRenderingHint( RenderingHints.KEY_ANTIALIASING ),
+			g2.getRenderingHint( RenderingHints.KEY_STROKE_CONTROL ),
+		};
+
+		g2.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON );
+		g2.setRenderingHint( RenderingHints.KEY_STROKE_CONTROL,
 			MAC_USE_QUARTZ ? RenderingHints.VALUE_STROKE_PURE : RenderingHints.VALUE_STROKE_NORMALIZE );
+
+		return oldRenderingHints;
+	}
+
+	/**
+	 * Resets rendering hints previously set with {@link #setRenderingHints}.
+	 */
+	public static void resetRenderingHints( Graphics g, Object[] oldRenderingHints ) {
+		Graphics2D g2 = (Graphics2D) g;
+		g2.setRenderingHint( RenderingHints.KEY_ANTIALIASING, oldRenderingHints[0] );
+		g2.setRenderingHint( RenderingHints.KEY_STROKE_CONTROL, oldRenderingHints[1] );
+	}
+
+	/**
+	 * Temporary resets rendering hints set with {@link #setRenderingHints}
+	 * and runs the given runnable.
+	 * <p>
+	 * This is intended for painting text while rendering hints are set.
+	 * <p>
+	 * If text antialiasing is disabled (in OS system settings or via
+	 * {@code -Dawt.useSystemAAFontSettings=off}), but general antialiasing is enabled,
+	 * then text is still painted using some kind of "grayscale" antialiasing,
+	 * which may make the text look bold (depends on font and font size).
+	 * To avoid this, temporary disable general antialiasing.
+	 * This does not affect text rendering if text antialiasing is enabled (usually the default).
+	 */
+	public static void runWithoutRenderingHints( Graphics g, Object[] oldRenderingHints, Runnable runnable ) {
+		if( oldRenderingHints == null ) {
+			runnable.run();
+			return;
+		}
+
+		Graphics2D g2 = (Graphics2D) g;
+		Object[] oldRenderingHints2 = new Object[] {
+			g2.getRenderingHint( RenderingHints.KEY_ANTIALIASING ),
+			g2.getRenderingHint( RenderingHints.KEY_STROKE_CONTROL ),
+		};
+
+		resetRenderingHints( g2, oldRenderingHints );
+		runnable.run();
+		resetRenderingHints( g2, oldRenderingHints2 );
 	}
 
 	public static Color deriveColor( Color color, Color baseColor ) {
@@ -272,7 +345,7 @@ public class FlatUIUtils
 		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 ) )
+		if( focusWidth > 0 && arc > 0 && arc < UIScale.scale( 10 ) )
 			outerArc -= UIScale.scale( 2f );
 
 		Path2D path = new Path2D.Float( Path2D.WIND_EVEN_ODD );
@@ -379,6 +452,52 @@ public class FlatUIUtils
 		return new RoundRectangle2D.Float( x, y, w, h, arc, arc );
 	}
 
+	static void paintFilledRectangle( Graphics g, Color color, float x, float y, float w, float h ) {
+		Graphics2D g2 = (Graphics2D) g.create();
+		try {
+			FlatUIUtils.setRenderingHints( g2 );
+			g2.setColor( color );
+			g2.fill( new Rectangle2D.Float( x, y, w, h ) );
+		} finally {
+			g2.dispose();
+		}
+	}
+
+	public static void paintGrip( Graphics g, int x, int y, int width, int height,
+		boolean horizontal, int dotCount, int dotSize, int gap, boolean centerPrecise )
+	{
+		dotSize = UIScale.scale( dotSize );
+		gap = UIScale.scale( gap );
+		int gripSize = (dotSize * dotCount) + ((gap * (dotCount - 1)));
+
+		// calculate grip position
+		float gx;
+		float gy;
+		if( horizontal ) {
+			gx = x + Math.round( (width - gripSize) / 2f );
+			gy = y + ((height - dotSize) / 2f);
+
+			if( !centerPrecise )
+				gy = Math.round( gy );
+		} else {
+			// vertical
+			gx = x + ((width - dotSize) / 2f);
+			gy = y + Math.round( (height - gripSize) / 2f );
+
+			if( !centerPrecise )
+				gx = Math.round( gx );
+		}
+
+		// paint dots
+		for( int i = 0; i < dotCount; i++ ) {
+			((Graphics2D)g).fill( new Ellipse2D.Float( gx, gy, dotSize, dotSize ) );
+			if( horizontal )
+				gx += dotSize + gap;
+			else
+				gy += dotSize + gap;
+		}
+	}
+
 	/**
 	 * Fill background with parent's background color because the visible component
 	 * is smaller than its bounds (for the focus decoration).
@@ -455,15 +574,31 @@ public class FlatUIUtils
 		float x2 = x + width;
 		float y2 = y + height;
 
+		// same constant as in java.awt.geom.EllipseIterator.CtrlVal used to paint circles
+		double c = 0.5522847498307933;
+		double ci = 1. - c;
+		double ciTopLeft = arcTopLeft * ci;
+		double ciTopRight = arcTopRight * ci;
+		double ciBottomLeft = arcBottomLeft * ci;
+		double ciBottomRight = arcBottomRight * ci;
+
 		Path2D rect = new Path2D.Float();
-		rect.moveTo( x2 - arcTopRight, y );
-		rect.quadTo( x2, y, x2, y + arcTopRight );
-		rect.lineTo( x2, y2 - arcBottomRight );
-		rect.quadTo( x2, y2, x2 - arcBottomRight, y2 );
-		rect.lineTo( x + arcBottomLeft, y2 );
-		rect.quadTo( x, y2, x, y2 - arcBottomLeft );
-		rect.lineTo( x, y + arcTopLeft );
-		rect.quadTo( x, y, x + arcTopLeft, y );
+		rect.moveTo(  x2 - arcTopRight, y );
+		rect.curveTo( x2 - ciTopRight, y,
+					  x2, y + ciTopRight,
+					  x2, y + arcTopRight );
+		rect.lineTo(  x2, y2 - arcBottomRight );
+		rect.curveTo( x2, y2 - ciBottomRight,
+					  x2 - ciBottomRight, y2,
+					  x2 - arcBottomRight, y2 );
+		rect.lineTo(  x + arcBottomLeft, y2 );
+		rect.curveTo( x + ciBottomLeft, y2,
+					  x, y2 - ciBottomLeft,
+					  x, y2 - arcBottomLeft );
+		rect.lineTo(  x, y + arcTopLeft );
+		rect.curveTo( x, y + ciTopLeft,
+					  x + ciTopLeft, y,
+					  x + arcTopLeft, y );
 		rect.closePath();
 
 		return rect;
@@ -553,37 +688,6 @@ public class FlatUIUtils
 			.computeIfAbsent( key, k -> newInstanceSupplier.get() );
 	}
 
-	//---- class HoverListener ------------------------------------------------
-
-	public static class HoverListener
-		extends MouseAdapter
-	{
-		private final Component repaintComponent;
-		private final Consumer<Boolean> hoverChanged;
-
-		public HoverListener( Component repaintComponent, Consumer<Boolean> hoverChanged ) {
-			this.repaintComponent = repaintComponent;
-			this.hoverChanged = hoverChanged;
-		}
-
-		@Override
-		public void mouseEntered( MouseEvent e ) {
-			hoverChanged.accept( true );
-			repaint();
-		}
-
-		@Override
-		public void mouseExited( MouseEvent e ) {
-			hoverChanged.accept( false );
-			repaint();
-		}
-
-		private void repaint() {
-			if( repaintComponent != null && repaintComponent.isEnabled() )
-				repaintComponent.repaint();
-		}
-	}
-
 	//---- class RepaintFocusListener -----------------------------------------
 
 	public static class RepaintFocusListener

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

@@ -256,6 +256,8 @@ public abstract class FlatWindowResizer
 
 		@Override
 		protected boolean isWindowResizable() {
+			if( FlatUIUtils.isFullScreen( resizeComp ) )
+				return false;
 			if( window instanceof Frame )
 				return ((Frame)window).isResizable() && (((Frame)window).getExtendedState() & Frame.MAXIMIZED_BOTH) == 0;
 			if( window instanceof Dialog )
@@ -429,9 +431,9 @@ public abstract class FlatWindowResizer
 		protected void paintComponent( Graphics g ) {
 			super.paintChildren( g );
 
-			// this is necessary because Dialog.setResizable() does not fire events
-			if( isDialog() )
-				updateVisibility();
+			// for dialogs: necessary because Dialog.setResizable() does not fire events
+			// for frames: necessary because GraphicsDevice.setFullScreenWindow() does not fire events
+			updateVisibility();
 
 /*debug
 			int width = getWidth();

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

@@ -227,7 +227,6 @@ public class JBRCustomDecorations
 
 		private final Color defaultActiveBorder = new Color( 0x707070 );
 		private final Color inactiveLightColor = new Color( 0xaaaaaa );
-		private final Color inactiveDarkColor = new Color( 0x3f3f3f );
 
 		private boolean colorizationAffectsBorders;
 		private Color activeColor = defaultActiveBorder;
@@ -273,7 +272,7 @@ public class JBRCustomDecorations
 				Object colorizationColorBalanceObj = toolkit.getDesktopProperty( "win.dwm.colorizationColorBalance" );
 				if( colorizationColorBalanceObj instanceof Integer ) {
 					int colorizationColorBalance = (Integer) colorizationColorBalanceObj;
-					if( colorizationColorBalance < 0 )
+					if( colorizationColorBalance < 0 || colorizationColorBalance > 100 )
 						colorizationColorBalance = 100;
 
 					if( colorizationColorBalance == 0 )
@@ -283,9 +282,15 @@ public class JBRCustomDecorations
 
 					float alpha = colorizationColorBalance / 100.0f;
 					float remainder = 1 - alpha;
-					int r = Math.round( (colorizationColor.getRed() * alpha + 0xD9 * remainder) );
-					int g = Math.round( (colorizationColor.getGreen() * alpha + 0xD9 * remainder) );
-					int b = Math.round( (colorizationColor.getBlue() * alpha + 0xD9 * remainder) );
+					int r = Math.round( colorizationColor.getRed() * alpha + 0xD9 * remainder );
+					int g = Math.round( colorizationColor.getGreen() * alpha + 0xD9 * remainder );
+					int b = Math.round( colorizationColor.getBlue() * alpha + 0xD9 * remainder );
+
+					// avoid potential IllegalArgumentException in Color constructor
+					r = Math.min( Math.max( r, 0 ), 255 );
+					g = Math.min( Math.max( g, 0 ), 255 );
+					b = Math.min( Math.max( b, 0 ), 255 );
+
 					return new Color( r, g, b );
 				}
 				return colorizationColor;
@@ -300,7 +305,14 @@ public class JBRCustomDecorations
 			Window window = SwingUtilities.windowForComponent( c );
 			boolean active = (window != null) ? window.isActive() : false;
 
-			g.setColor( active ? activeColor : (FlatLaf.isLafDark() ? inactiveDarkColor : inactiveLightColor) );
+			// paint top border
+			//  - in light themes
+			//  - in dark themes only for active windows if colorization affects borders
+			boolean paintTopBorder = !FlatLaf.isLafDark() || (active && colorizationAffectsBorders);
+			if( !paintTopBorder )
+				return;
+
+			g.setColor( active ? activeColor : inactiveLightColor );
 			HiDPIUtils.paintAtScale1x( (Graphics2D) g, x, y, width, height, this::paintImpl );
 		}
 

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

@@ -0,0 +1,249 @@
+/*
+ * 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.util;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import com.formdev.flatlaf.util.Animator.Interpolator;
+
+/**
+ * Icon that automatically animates painting on component value changes.
+ * <p>
+ * {@link #getValue(Component)} returns the value of the component.
+ * If the value changes, then {@link #paintIconAnimated(Component, Graphics, int, int, float)}
+ * is invoked multiple times with animated value (from old value to new value).
+ * <p>
+ * Example for an animated icon:
+ * <pre>
+ * private class AnimatedMinimalTestIcon
+ *     implements AnimatedIcon
+ * {
+ *     &#64;Override public int getIconWidth() { return 100; }
+ *     &#64;Override public int getIconHeight() { return 20; }
+ *
+ *     &#64;Override
+ *     public void paintIconAnimated( Component c, Graphics g, int x, int y, float animatedValue ) {
+ *         int w = getIconWidth();
+ *         int h = getIconHeight();
+ *
+ *         g.setColor( Color.red );
+ *         g.drawRect( x, y, w - 1, h - 1 );
+ *         g.fillRect( x, y, Math.round( w * animatedValue ), h );
+ *     }
+ *
+ *     &#64;Override
+ *     public float getValue( Component c ) {
+ *         return ((AbstractButton)c).isSelected() ? 1 : 0;
+ *     }
+ * }
+ *
+ * // sample usage
+ * JCheckBox checkBox = new JCheckBox( "test" );
+ * checkBox.setIcon( new AnimatedMinimalTestIcon() );
+ * </pre>
+ *
+ * Animation works only if the component passed to {@link #paintIcon(Component, Graphics, int, int)}
+ * is a instance of {@link JComponent}.
+ * A client property is set on the component to store the animation state.
+ *
+ * @author Karl Tauber
+ */
+public interface AnimatedIcon
+	extends Icon
+{
+	@Override
+	public default void paintIcon( Component c, Graphics g, int x, int y ) {
+		AnimationSupport.paintIcon( this, c, g, x, y );
+	}
+
+	/**
+	 * Paints the icon for the given animated value.
+	 *
+	 * @param c the component that this icon belongs to
+	 * @param g the graphics context
+	 * @param x the x coordinate of the icon
+	 * @param y the y coordinate of the icon
+	 * @param animatedValue the animated value, which is either equal to what {@link #getValue(Component)}
+	 *     returned, or somewhere between the previous value and the latest value
+	 *     that {@link #getValue(Component)} returned
+	 */
+	void paintIconAnimated( Component c, Graphics g, int x, int y, float animatedValue );
+
+	/**
+	 * Gets the value of the component.
+	 * <p>
+	 * This can be any value and depends on the component.
+	 * If the value changes, then this class animates from the old value to the new one.
+	 * <p>
+	 * For a toggle button this could be {@code 0} for off and {@code 1} for on.
+	 */
+	float getValue( Component c );
+
+	/**
+	 * Returns whether animation is enabled for this icon (default is {@code true}).
+	 */
+	default boolean isAnimationEnabled() {
+		return true;
+	}
+
+	/**
+	 * Returns the duration of the animation in milliseconds (default is 150).
+	 */
+	default int getAnimationDuration() {
+		return 150;
+	}
+
+	/**
+	 * Returns the resolution of the animation in milliseconds (default is 10).
+	 * Resolution is the amount of time between timing events.
+	 */
+	default int getAnimationResolution() {
+		return 10;
+	}
+
+	/**
+	 * Returns the interpolator for the animation.
+	 * Default is {@link CubicBezierEasing#STANDARD_EASING}.
+	 */
+	default Interpolator getAnimationInterpolator() {
+		return CubicBezierEasing.STANDARD_EASING;
+	}
+
+	/**
+	 * Returns the client property key used to store the animation support.
+	 */
+	default Object getClientPropertyKey() {
+		return getClass();
+	}
+
+	//---- class AnimationSupport ---------------------------------------------
+
+	/**
+	 * Animation support class that stores the animation state and implements the animation.
+	 */
+	class AnimationSupport
+	{
+		private float startValue;
+		private float targetValue;
+		private float animatedValue;
+		private float fraction;
+
+		private Animator animator;
+
+		// last x,y coordinates of the icon needed to repaint while animating
+		private int x;
+		private int y;
+
+		public static void paintIcon( AnimatedIcon icon, Component c, Graphics g, int x, int y ) {
+			if( !isAnimationEnabled( icon, c ) ) {
+				// paint without animation if animation is disabled or
+				// component is not a JComponent and therefore does not support
+				// client properties, which are required to keep animation state
+				paintIconImpl( icon, c, g, x, y, null );
+				return;
+			}
+
+			JComponent jc = (JComponent) c;
+			Object key = icon.getClientPropertyKey();
+			AnimationSupport as = (AnimationSupport) jc.getClientProperty( key );
+			if( as == null ) {
+				// painted first time --> do not animate, but remember current component value
+				as = new AnimationSupport();
+				as.startValue = as.targetValue = as.animatedValue = icon.getValue( c );
+				as.x = x;
+				as.y = y;
+				jc.putClientProperty( key, as );
+			} else {
+				// get component value
+				float value = icon.getValue( c );
+
+				if( value != as.targetValue ) {
+					// value changed --> (re)start animation
+
+					if( as.animator == null ) {
+						// create animator
+						AnimationSupport as2 = as;
+						as.animator = new Animator( icon.getAnimationDuration(), fraction -> {
+							// check whether component was removed while animation is running
+							if( !c.isDisplayable() ) {
+								as2.animator.stop();
+								return;
+							}
+
+							// compute animated value
+							as2.animatedValue = as2.startValue + ((as2.targetValue - as2.startValue) * fraction);
+							as2.fraction = fraction;
+
+							// repaint icon
+							c.repaint( as2.x, as2.y, icon.getIconWidth(), icon.getIconHeight() );
+						}, () -> {
+							as2.startValue = as2.animatedValue = as2.targetValue;
+							as2.animator = null;
+						} );
+					}
+
+					if( as.animator.isRunning() ) {
+						// if animation is still running, restart it from the current
+						// animated value to the new target value with reduced duration
+						as.animator.cancel();
+						int duration2 = (int) (icon.getAnimationDuration() * as.fraction);
+						if( duration2 > 0 )
+							as.animator.setDuration( duration2 );
+						as.startValue = as.animatedValue;
+					} else {
+						// new animation
+						as.animator.setDuration( icon.getAnimationDuration() );
+						as.animator.setResolution( icon.getAnimationResolution() );
+						as.animator.setInterpolator( icon.getAnimationInterpolator() );
+
+						as.animatedValue = as.startValue;
+					}
+
+					as.targetValue = value;
+					as.animator.start();
+				}
+
+				as.x = x;
+				as.y = y;
+			}
+
+			paintIconImpl( icon, c, g, x, y, as );
+		}
+
+		private static void paintIconImpl( AnimatedIcon icon, Component c, Graphics g, int x, int y, AnimationSupport as ) {
+			float value = (as != null) ? as.animatedValue : icon.getValue( c );
+			icon.paintIconAnimated( c, g, x, y, value );
+		}
+
+		private static boolean isAnimationEnabled( AnimatedIcon icon, Component c ) {
+			return Animator.useAnimation() && icon.isAnimationEnabled() && c instanceof JComponent;
+		}
+
+		public static void saveIconLocation( AnimatedIcon icon, Component c, int x, int y ) {
+			if( !isAnimationEnabled( icon, c ) )
+				return;
+
+			AnimationSupport as = (AnimationSupport) ((JComponent)c).getClientProperty( icon.getClientPropertyKey() );
+			if( as != null ) {
+				as.x = x;
+				as.y = y;
+			}
+		}
+	}
+}

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

@@ -18,6 +18,7 @@ package com.formdev.flatlaf.util;
 
 import java.util.ArrayList;
 import javax.swing.Timer;
+import com.formdev.flatlaf.FlatSystemProperties;
 
 /**
  * Simple animator based on ideas and concepts from "Filthy Rich Clients" book
@@ -39,6 +40,15 @@ public class Animator
 	private long startTime;
 	private Timer timer;
 
+	/**
+	 * Checks whether animations are enabled (the default) or disabled via
+	 * system property {@code flatlaf.animation} set to {@code false}.
+	 * This allows disabling all animations at command line with {@code -Dflatlaf.animation=false}.
+	 */
+	public static boolean useAnimation() {
+		return FlatSystemProperties.getBoolean( FlatSystemProperties.ANIMATION, true );
+	}
+
 	/**
 	 * Creates an animation that runs duration milliseconds.
 	 * Use {@link #addTarget(TimingTarget)} to receive timing events
@@ -86,7 +96,7 @@ public class Animator
 	 * Sets the duration of the animation in milliseconds.
 	 *
 	 * @throws IllegalStateException if animation is running
-	 * @throws IllegalArgumentException if duration is <= zero
+	 * @throws IllegalArgumentException if duration is &lt;= zero
 	 */
 	public void setDuration( int duration ) {
 		throwExceptionIfRunning();
@@ -108,7 +118,7 @@ public class Animator
 	 *
 	 * @param resolution the resolution of the animation in milliseconds
 	 * @throws IllegalStateException if animation is running
-	 * @throws IllegalArgumentException if resolution is <= zero
+	 * @throws IllegalArgumentException if resolution is &lt;= zero
 	 */
 	public void setResolution( int resolution ) {
 		throwExceptionIfRunning();
@@ -174,14 +184,17 @@ public class Animator
 		timeToStop = false;
 		startTime = System.nanoTime() / 1000000;
 
-		timer = new Timer( resolution, e -> {
-			if( !hasBegun ) {
-				begin();
-				hasBegun = true;
-			}
+		if( timer == null ) {
+			timer = new Timer( resolution, e -> {
+				if( !hasBegun ) {
+					begin();
+					hasBegun = true;
+				}
 
-			timingEvent( getTimingFraction() );
-		} );
+				timingEvent( getTimingFraction() );
+			} );
+		} else
+			timer.setDelay( resolution );
 		timer.setInitialDelay( 0 );
 		timer.start();
 	}
@@ -203,10 +216,11 @@ public class Animator
 	}
 
 	private void stop( boolean cancel ) {
-		if( timer != null ) {
+		if( !running )
+			return;
+
+		if( timer != null )
 			timer.stop();
-			timer = null;
-		}
 
 		if( !cancel )
 			end();
@@ -215,6 +229,15 @@ public class Animator
 		timeToStop = false;
 	}
 
+	/**
+	 * Restarts the animation.
+	 * Invokes {@link #cancel()} and {@link #start()}.
+	 */
+	public void restart() {
+		cancel();
+		start();
+	}
+
 	/**
 	 * Returns whether this animation is running.
 	 */

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

@@ -28,11 +28,12 @@ public class ColorFunctions
 	public static Color applyFunctions( Color color, ColorFunction... functions ) {
 		float[] hsl = HSLColor.fromRGB( color );
 		float alpha = color.getAlpha() / 255f;
+		float[] hsla = { hsl[0], hsl[1], hsl[2], alpha * 100 };
 
 		for( ColorFunction function : functions )
-			function.apply( hsl );
+			function.apply( hsla );
 
-		return HSLColor.toRGB( hsl, alpha );
+		return HSLColor.toRGB( hsla[0], hsla[1], hsla[2], hsla[3] / 100 );
 	}
 
 	public static float clamp( float value ) {
@@ -43,16 +44,48 @@ public class ColorFunctions
 				: value);
 	}
 
+	/**
+	 * Returns a color that is a mixture of two colors.
+	 *
+	 * @param color1 first color
+	 * @param color2 second color
+	 * @param weight the weight (in range 0-1) to mix the two colors.
+	 *               Larger weight uses more of first color, smaller weight more of second color.
+	 * @return mixture of colors
+	 */
+	public static Color mix( Color color1, Color color2, float weight ) {
+		if( weight >= 1 )
+			return color1;
+		if( weight <= 0 )
+			return color2;
+
+		int r1 = color1.getRed();
+		int g1 = color1.getGreen();
+		int b1 = color1.getBlue();
+		int a1 = color1.getAlpha();
+
+		int r2 = color2.getRed();
+		int g2 = color2.getGreen();
+		int b2 = color2.getBlue();
+		int a2 = color2.getAlpha();
+
+		return new Color(
+			Math.round( r2 + ((r1 - r2) * weight) ),
+			Math.round( g2 + ((g1 - g2) * weight) ),
+			Math.round( b2 + ((b1 - b2) * weight) ),
+			Math.round( a2 + ((a1 - a2) * weight) ) );
+	}
+
 	//---- interface ColorFunction --------------------------------------------
 
 	public interface ColorFunction {
-		void apply( float[] hsl );
+		void apply( float[] hsla );
 	}
 
 	//---- class HSLIncreaseDecrease ------------------------------------------
 
 	/**
-	 * Increase or decrease hue, saturation or luminance of a color in the HSL color space
+	 * Increase or decrease hue, saturation, luminance or alpha of a color in the HSL color space
 	 * by an absolute or relative amount.
 	 */
 	public static class HSLIncreaseDecrease
@@ -75,18 +108,45 @@ public class ColorFunctions
 		}
 
 		@Override
-		public void apply( float[] hsl ) {
+		public void apply( float[] hsla ) {
 			float amount2 = increase ? amount : -amount;
-			amount2 = autoInverse && shouldInverse( hsl ) ? -amount2 : amount2;
-			hsl[hslIndex] = clamp( relative
-				? (hsl[hslIndex] * ((100 + amount2) / 100))
-				: (hsl[hslIndex] + amount2) );
+
+			if( hslIndex == 0 ) {
+				// hue is range 0-360
+				hsla[0] = (hsla[0] + amount2) % 360;
+				return;
+			}
+
+			amount2 = autoInverse && shouldInverse( hsla ) ? -amount2 : amount2;
+			hsla[hslIndex] = clamp( relative
+				? (hsla[hslIndex] * ((100 + amount2) / 100))
+				: (hsla[hslIndex] + amount2) );
 		}
 
-		protected boolean shouldInverse( float[] hsl ) {
+		protected boolean shouldInverse( float[] hsla ) {
 			return increase
-				? hsl[hslIndex] >= 50
-				: hsl[hslIndex] < 50;
+				? hsla[hslIndex] > 65
+				: hsla[hslIndex] < 35;
+		}
+	}
+
+	//---- class HSLIncreaseDecrease ------------------------------------------
+
+	/**
+	 * Set the alpha of a color.
+	 */
+	public static class Fade
+		implements ColorFunction
+	{
+		public final float amount;
+
+		public Fade( float amount ) {
+			this.amount = amount;
+		}
+
+		@Override
+		public void apply( float[] hsla ) {
+			hsla[3] = clamp( amount );
 		}
 	}
 }

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

@@ -24,6 +24,13 @@ package com.formdev.flatlaf.util;
 public class CubicBezierEasing
 	implements Animator.Interpolator
 {
+	/**
+	 * Standard easing as specified in Material design (0.4, 0, 0.2, 1).
+	 *
+	 * @see <a href="https://material.io/design/motion/speed.html#easing">https://material.io/design/motion/speed.html#easing</a>
+	 */
+	public static final CubicBezierEasing STANDARD_EASING = new CubicBezierEasing( 0.4f, 0f, 0.2f, 1f );
+
 	// common cubic-bezier easing functions (same as in CSS)
 	// https://developer.mozilla.org/en-US/docs/Web/CSS/easing-function
 	public static final CubicBezierEasing EASE = new CubicBezierEasing( 0.25f, 0.1f, 0.25f, 1f );

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

@@ -134,7 +134,7 @@ public class HiDPIUtils
 		// - fractional scale factors result in fractional component Y device coordinates
 		// - fractional text Y device coordinates are rounded for horizontal lines of characters
 		// - maybe different rounding methods for drawing primitives (e.g. rectangle) and text
-		// - Java adds 0.5 to X/Y positions in before drawing string in BufferedTextPipe.enqueueGlyphList()
+		// - Java adds 0.5 to X/Y positions before drawing string in BufferedTextPipe.enqueueGlyphList()
 
 		// this is not the optimal solution, but works very good in most cases
 		// (tested with class FlatPaintingStringTest on Windows 10 with font "Segoe UI")

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

@@ -16,6 +16,7 @@
 
 package com.formdev.flatlaf.util;
 
+import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.lang.reflect.InvocationTargetException;
@@ -27,7 +28,7 @@ import com.formdev.flatlaf.FlatLaf;
 
 /**
  * Provides Java version compatibility methods.
- *
+ * <p>
  * WARNING: This is private API and may change.
  *
  * @author Karl Tauber
@@ -35,10 +36,12 @@ import com.formdev.flatlaf.FlatLaf;
 public class JavaCompatibility
 {
 	private static Method drawStringUnderlineCharAtMethod;
+	private static Method getClippedStringMethod;
 
 	/**
 	 * Java 8: sun.swing.SwingUtilities2.drawStringUnderlineCharAt( JComponent c,
 	 *				Graphics g, String text, int underlinedIndex, int x, int y )
+	 * <br>
 	 * Java 9: javax.swing.plaf.basic.BasicGraphicsUtils.drawStringUnderlineCharAt( JComponent c,
 	 *				Graphics2D g, String string, int underlinedIndex, float x, float y )
 	 */
@@ -71,4 +74,37 @@ public class JavaCompatibility
 			throw new RuntimeException( ex );
 		}
 	}
+
+	/**
+	 * Java 8: sun.swing.SwingUtilities2.clipStringIfNecessary( JComponent c,
+	 *				FontMetrics fm, String string, int availTextWidth )
+	 * <br>
+	 * Java 9: javax.swing.plaf.basic.BasicGraphicsUtils.getClippedString( JComponent c,
+	 *				FontMetrics fm, String string, int availTextWidth )
+	 */
+	public static String getClippedString( JComponent c, FontMetrics fm, String string, int availTextWidth ) {
+		synchronized( JavaCompatibility.class ) {
+			if( getClippedStringMethod == null ) {
+				try {
+					Class<?> cls = Class.forName( SystemInfo.isJava_9_orLater
+						? "javax.swing.plaf.basic.BasicGraphicsUtils"
+						: "sun.swing.SwingUtilities2" );
+					getClippedStringMethod = cls.getMethod( SystemInfo.isJava_9_orLater
+							? "getClippedString"
+							: "clipStringIfNecessary",
+						new Class[] { JComponent.class, FontMetrics.class, String.class, int.class } );
+				} catch( Exception ex ) {
+					Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex );
+					throw new RuntimeException( ex );
+				}
+			}
+		}
+
+		try {
+			return (String) getClippedStringMethod.invoke( null, c, fm, string, availTextWidth );
+		} catch( IllegalAccessException | IllegalArgumentException | InvocationTargetException ex ) {
+			Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex );
+			throw new RuntimeException( ex );
+		}
+	}
 }

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

@@ -16,11 +16,20 @@
 
 package com.formdev.flatlaf.util;
 
+import java.awt.Dimension;
 import java.awt.Image;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Function;
 
+//
+// NOTE:
+//     This implementation is for Java 8 only.
+//     There is also a variant for Java 9 and later.
+// 
+//     Make sure that the API is in sync.
+//
+
 /**
  * Support for multi-resolution images available since Java 9.
  *
@@ -28,26 +37,86 @@ import java.util.function.Function;
  */
 public class MultiResolutionImageSupport
 {
+	/**
+	 * Checks whether multi-resolution image support is available.
+	 * 
+	 * @return {@code true} when running on Java 9 or later; {@code false} on Java 8
+	 */
 	public static boolean isAvailable() {
 		return false;
 	}
 
+	/**
+	 * Checks whether the given image is a multi-resolution image that implements
+	 * the interface {@code java.awt.image.MultiResolutionImage}.
+	 */
 	public static boolean isMultiResolutionImage( Image image ) {
 		return false;
 	}
 
+	/**
+	 * Creates a multi-resolution image from the given resolution variants.
+	 * 
+	 * @param baseImageIndex index of the base image in the resolution variants array
+	 * @param resolutionVariants image resolution variants (sorted by size; smallest first)
+	 * @return a multi-resolution image on Java 9 or later; the base image on Java 8
+	 */
 	public static Image create( int baseImageIndex, Image... resolutionVariants ) {
 		return resolutionVariants[baseImageIndex];
 	}
 
+	/**
+	 * Creates a multi-resolution image for the given dimensions.
+	 * Initially the image does not contain any image data.
+	 * The real images are created (and cached) on demand by invoking the given producer function.
+	 * <p>
+	 * The given dimensions array is only used for {@link #getResolutionVariants(Image)}.
+	 * The producer function may be invoked with any dimension (that is not contained in 
+	 * dimensions array) and is expected to produce a image for the passed in dimension.
+	 * 
+	 * @param baseImageIndex index of the base image in the dimensions array
+	 * @param dimensions dimensions of resolution variants (sorted by size; smallest first)
+	 * @param producer producer function that creates a real image for the requested size
+	 * @return a multi-resolution image on Java 9 or later; the base image on Java 8
+	 */
+	public static Image create( int baseImageIndex, Dimension[] dimensions, Function<Dimension, Image> producer ) {
+		return producer.apply( dimensions[baseImageIndex] );
+	}
+
+	/**
+	 * Creates a multi-resolution image that maps images from another multi-resolution image
+	 * using the given mapper function.
+	 * <p>
+	 * Can be used to apply filter to multi-resolution images on demand.
+	 * E.g. passed in image is for "enabled" state and mapper function creates images
+	 * for "disabled" state.  
+	 * 
+	 * @param image a multi-resolution image that is mapped using the given mapper function
+	 * @param mapper mapper function that maps a single resolution variant to a new image (e.g. applying an filter)
+	 * @return a multi-resolution image on Java 9 or later; a mapped image on Java 8
+	 */
 	public static Image map( Image image, Function<Image, Image> mapper ) {
 		return mapper.apply( image );
 	}
 
+	/**
+	 * Get the image variant that best matches the given width and height.
+	 * <p>
+	 * If the given image is a multi-resolution image then invokes
+	 * {@code java.awt.image.MultiResolutionImage.getResolutionVariant(destImageWidth, destImageHeight)}.
+	 * Otherwise returns the given image.
+	 */
 	public static Image getResolutionVariant( Image image, int destImageWidth, int destImageHeight ) {
 		return image;
 	}
 
+	/**
+	 * Get a list of all resolution variants.
+	 * <p>
+	 * If the given image is a multi-resolution image then invokes
+	 * {@code java.awt.image.MultiResolutionImage.getResolutionVariants()}.
+	 * Otherwise returns a list containing only the given image.
+	 */
 	public static List<Image> getResolutionVariants( Image image ) {
 		return Collections.singletonList( image );
 	}

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

@@ -26,6 +26,13 @@ import java.util.List;
  */
 public class StringUtils
 {
+	/**
+	 * Returns {@code true} if given string is {@code null} or length is zero.
+	 */
+	public static boolean isEmpty( String string ) {
+		return string == null || string.isEmpty();
+	}
+
 	public static String removeLeading( String string, String leading ) {
 		return string.startsWith( leading )
 			? string.substring( leading.length() )

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

@@ -36,9 +36,14 @@ import javax.swing.plaf.UIResource;
 import com.formdev.flatlaf.FlatSystemProperties;
 
 /**
- * Two scaling modes are supported for HiDPI displays:
+ * This class handles scaling in Swing UIs.
+ * It computes user scaling factor based on font size and
+ * provides methods to scale integer, float, {@link Dimension} and {@link Insets}.
+ * This class is look and feel independent.
+ * <p>
+ * Two scaling modes are supported by FlatLaf for HiDPI displays:
  *
- * 1) system scaling mode
+ * <h3>1) system scaling mode</h3>
  *
  * This mode is supported since Java 9 on all platforms and in some Java 8 VMs
  * (e.g. Apple and JetBrains). The JRE determines the scale factor per-display and
@@ -49,7 +54,7 @@ import com.formdev.flatlaf.FlatSystemProperties;
  * The scale factor may be different for each connected display.
  * The scale factor may change for a window when moving the window from one display to another one.
  *
- * 2) user scaling mode
+ * <h3>2) user scaling mode</h3>
  *
  * This mode is mainly for Java 8 compatibility, but is also used on Linux
  * or if the default font is changed.
@@ -85,6 +90,9 @@ public class UIScale
 
 	private static Boolean jreHiDPI;
 
+	/**
+	 * Returns whether system scaling is enabled.
+	 */
 	public static boolean isSystemScalingEnabled() {
 		if( jreHiDPI != null )
 			return jreHiDPI;
@@ -112,10 +120,16 @@ public class UIScale
 		return jreHiDPI;
 	}
 
+	/**
+	 * Returns the system scale factor for the given graphics context.
+	 */
 	public static double getSystemScaleFactor( Graphics2D g ) {
-		return isSystemScalingEnabled() ? g.getDeviceConfiguration().getDefaultTransform().getScaleX() : 1;
+		return isSystemScalingEnabled() ? getSystemScaleFactor( g.getDeviceConfiguration() ) : 1;
 	}
 
+	/**
+	 * Returns the system scale factor for the given graphics configuration.
+	 */
 	public static double getSystemScaleFactor( GraphicsConfiguration gc ) {
 		return (isSystemScalingEnabled() && gc != null) ? gc.getDefaultTransform().getScaleX() : 1;
 	}
@@ -297,11 +311,17 @@ public class UIScale
 		}
 	}
 
+	/**
+	 * Returns the user scale factor.
+	 */
 	public static float getUserScaleFactor() {
 		initialize();
 		return scaleFactor;
 	}
 
+	/**
+	 * Sets the user scale factor.
+	 */
 	private static void setUserScaleFactor( float scaleFactor ) {
 		if( scaleFactor <= 1f )
 			scaleFactor = 1f;
@@ -318,40 +338,65 @@ public class UIScale
 			changeSupport.firePropertyChange( "userScaleFactor", oldScaleFactor, scaleFactor );
 	}
 
+	/**
+	 * Multiplies the given value by the user scale factor.
+	 */
 	public static float scale( float value ) {
 		initialize();
 		return (scaleFactor == 1) ? value : (value * scaleFactor);
 	}
 
+	/**
+	 * Multiplies the given value by the user scale factor and rounds the result.
+	 */
 	public static int scale( int value ) {
 		initialize();
 		return (scaleFactor == 1) ? value : Math.round( value * scaleFactor );
 	}
 
 	/**
-	 * Similar as scale(int) but always "rounds down".
+	 * Similar as {@link #scale(int)} but always "rounds down".
+	 * <p>
+	 * For use in special cases. {@link #scale(int)} is the preferred method.
 	 */
 	public static int scale2( int value ) {
 		initialize();
 		return (scaleFactor == 1) ? value : (int) (value * scaleFactor);
 	}
 
+	/**
+	 * Divides the given value by the user scale factor.
+	 */
 	public static float unscale( float value ) {
 		initialize();
 		return (scaleFactor == 1f) ? value : (value / scaleFactor);
 	}
 
+	/**
+	 * Divides the given value by the user scale factor and rounds the result.
+	 */
 	public static int unscale( int value ) {
 		initialize();
 		return (scaleFactor == 1f) ? value : Math.round( value / scaleFactor );
 	}
 
+	/**
+	 * If user scale factor is not 1, scale the given graphics context by invoking
+	 * {@link Graphics2D#scale(double, double)} with user scale factor.
+	 */
 	public static void scaleGraphics( Graphics2D g ) {
 		initialize();
 		if( scaleFactor != 1f )
 			g.scale( scaleFactor, scaleFactor );
 	}
 
+	/**
+	 * Scales the given dimension with the user scale factor.
+	 * <p>
+	 * If user scale factor is 1, then the given dimension is simply returned.
+	 * Otherwise a new instance of {@link Dimension} or {@link DimensionUIResource}
+	 * is returned, depending on whether the passed dimension implements {@link UIResource}.
+	 */
 	public static Dimension scale( Dimension dimension ) {
 		initialize();
 		return (dimension == null || scaleFactor == 1f)
@@ -361,6 +406,13 @@ public class UIScale
 				: new Dimension          ( scale( dimension.width ), scale( dimension.height ) ));
 	}
 
+	/**
+	 * Scales the given insets with the user scale factor.
+	 * <p>
+	 * If user scale factor is 1, then the given insets is simply returned.
+	 * Otherwise a new instance of {@link Insets} or {@link InsetsUIResource}
+	 * is returned, depending on whether the passed dimension implements {@link UIResource}.
+	 */
 	public static Insets scale( Insets insets ) {
 		initialize();
 		return (insets == null || scaleFactor == 1f)

flatlaf-core/src/main/java9/com/formdev/flatlaf/util/MultiResolutionImageSupport.java

@@ -16,6 +16,7 @@
 
 package com.formdev.flatlaf.util;
 
+import java.awt.Dimension;
 import java.awt.Image;
 import java.awt.image.AbstractMultiResolutionImage;
 import java.awt.image.BaseMultiResolutionImage;
@@ -27,6 +28,14 @@ import java.util.List;
 import java.util.function.Function;
 import javax.swing.ImageIcon;
 
+//
+// NOTE:
+//     This implementation is for Java 9 and later.
+//     There is also a variant for Java 8.
+//
+//     Make sure that the API is in sync.
+//
+
 /**
  * Support for multi-resolution images available since Java 9.
  *
@@ -46,6 +55,10 @@ public class MultiResolutionImageSupport
 		return new BaseMultiResolutionImage( baseImageIndex, resolutionVariants );
 	}
 
+	public static Image create( int baseImageIndex, Dimension[] dimensions, Function<Dimension, Image> producer ) {
+		return new ProducerMultiResolutionImage( dimensions, producer );
+	}
+
 	public static Image map( Image image, Function<Image, Image> mapper ) {
 		return image instanceof MultiResolutionImage
 			? new MappedMultiResolutionImage( image, mapper )
@@ -66,6 +79,9 @@ public class MultiResolutionImageSupport
 
 	//---- class MappedMultiResolutionImage -----------------------------------
 
+	/**
+	 * A multi-resolution image implementation that maps images on demand for requested sizes.
+	 */
 	private static class MappedMultiResolutionImage
 		extends AbstractMultiResolutionImage
 	{
@@ -102,8 +118,52 @@ public class MultiResolutionImageSupport
 
 		private Image mapAndCacheImage( Image image ) {
 			return cache.computeIfAbsent( image, img -> {
+				// using ImageIcon here makes sure that the image is loaded
 				return new ImageIcon( mapper.apply( img ) ).getImage();
 			} );
 		}
 	}
+
+	//---- class ProducerMultiResolutionImage ---------------------------------
+
+	/**
+	 * A multi-resolution image implementation that produces images on demand for requested sizes.
+	 */
+	private static class ProducerMultiResolutionImage
+		extends AbstractMultiResolutionImage
+	{
+		private final Dimension[] dimensions;
+		private final Function<Dimension, Image> producer;
+		private final IdentityHashMap<Dimension, Image> cache = new IdentityHashMap<>();
+
+		ProducerMultiResolutionImage( Dimension[] dimensions, Function<Dimension, Image> producer ) {
+			this.dimensions = dimensions;
+			this.producer = producer;
+		}
+
+		@Override
+		public Image getResolutionVariant( double destImageWidth, double destImageHeight ) {
+			return produceAndCacheImage( new Dimension( (int) destImageWidth, (int) destImageHeight ) );
+		}
+
+		@Override
+		public List<Image> getResolutionVariants() {
+			List<Image> mappedVariants = new ArrayList<>();
+			for( Dimension size : dimensions )
+				mappedVariants.add( produceAndCacheImage( size ) );
+			return mappedVariants;
+		}
+
+		@Override
+		protected Image getBaseImage() {
+			return produceAndCacheImage( dimensions[0] );
+		}
+
+		private Image produceAndCacheImage( Dimension size ) {
+			return cache.computeIfAbsent( size, size2 -> {
+				// using ImageIcon here makes sure that the image is loaded
+				return new ImageIcon( producer.apply( size2 ) ).getImage();
+			} );
+		}
+	}
 }

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

@@ -14,29 +14,49 @@
 # limitations under the License.
 #
 
+#
+# This file is loaded for "FlatLaf Darcula" theme (that extend class FlatDarculaLaf)
+# and for all dark IntelliJ Platform themes.
+#
+# Documentation:
+#  - https://www.formdev.com/flatlaf/properties-files/
+#  - https://www.formdev.com/flatlaf/how-to-customize/
+#
+# NOTE: Avoid copying the whole content of this file to own properties files.
+#       This will make upgrading to newer FlatLaf versions complex and error-prone.
+#       Instead copy and modify only those properties that you need to alter.
+#
+
 # Colors and style mostly based on Darcula theme from IntelliJ IDEA Community Edition,
 # which is licensed under the Apache 2.0 license. Copyright 2000-2019 JetBrains s.r.o.
 # See: https://github.com/JetBrains/intellij-community/
 
 #---- Button ----
 
-Button.default.boldText=true
+Button.innerFocusWidth = 0
+
+Button.default.boldText = true
+
+
+#---- CheckBox ----
+
+CheckBox.icon.focusedBackground = null
 
 
 #---- Component ----
 
-Component.focusWidth=2
-Component.innerFocusWidth=0
-Component.innerOutlineWidth=0
-Component.arrowType=triangle
+Component.focusWidth = 2
+Component.innerFocusWidth = 0
+Component.innerOutlineWidth = 0
+Component.arrowType = triangle
 
 
 #---- ProgressBar ----
 
-ProgressBar.foreground=#a0a0a0
-ProgressBar.selectionForeground=@background
+ProgressBar.foreground = #a0a0a0
+ProgressBar.selectionForeground = @background
 
 
 #---- RadioButton ----
 
-RadioButton.icon.centerDiameter=5
+RadioButton.icon.centerDiameter = 5

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

@@ -14,283 +14,314 @@
 # limitations under the License.
 #
 
+#
+# This file is loaded for all dark themes (that extend class FlatDarkLaf).
+#
+# Documentation:
+#  - https://www.formdev.com/flatlaf/properties-files/
+#  - https://www.formdev.com/flatlaf/how-to-customize/
+#
+# NOTE: Avoid copying the whole content of this file to own properties files.
+#       This will make upgrading to newer FlatLaf versions complex and error-prone.
+#       Instead copy and modify only those properties that you need to alter.
+#
+
 # Colors and style mostly based on Darcula theme from IntelliJ IDEA Community Edition,
 # which is licensed under the Apache 2.0 license. Copyright 2000-2019 JetBrains s.r.o.
 # See: https://github.com/JetBrains/intellij-community/
 
 #---- variables ----
 
-@background=#3c3f41
-@foreground=#bbb
-@selectionBackground=#4B6EAF
-@selectionForeground=@foreground
-@selectionInactiveBackground=#0D293E
-@selectionInactiveForeground=@foreground
-@disabledText=#888
-@textComponentBackground=#45494A
-@menuBackground=darken(@background,5%)
-@menuHoverBackground=lighten(@menuBackground,10%,derived)
-@menuCheckBackground=darken(@selectionBackground,10%)
-@menuAcceleratorForeground=darken(@foreground,15%)
-@menuAcceleratorSelectionForeground=@selectionForeground
-@cellFocusColor=#000
-@icon=#adadad
+@background = #3c3f41
+@foreground = #bbb
+@selectionBackground = #4B6EAF
+@selectionForeground = @foreground
+@selectionInactiveBackground = #0D293E
+@selectionInactiveForeground = @foreground
+@disabledText = #888
+@textComponentBackground = #45494A
+@menuBackground = darken(@background,5%)
+@menuHoverBackground = lighten(@menuBackground,10%,derived)
+@menuCheckBackground = darken(@selectionBackground,10%,derived noAutoInverse)
+@menuAcceleratorForeground = darken(@foreground,15%)
+@menuAcceleratorSelectionForeground = @selectionForeground
+@cellFocusColor = #000
+@icon = #adadad
+
+# for buttons within components (e.g. combobox or spinner)
+@buttonArrowColor = #9A9DA1
+@buttonDisabledArrowColor = darken(@buttonArrowColor,25%)
+@buttonHoverArrowColor = lighten(@buttonArrowColor,10%,derived noAutoInverse)
+@buttonPressedArrowColor = lighten(@buttonArrowColor,20%,derived noAutoInverse)
 
 # Drop (use lazy colors for IntelliJ platform themes, which usually do not specify these colors)
-@dropCellBackground=darken(List.selectionBackground,10%,lazy)
-@dropCellForeground=lazy(List.selectionForeground)
-@dropLineColor=lighten(List.selectionBackground,10%,lazy)
-@dropLineShortColor=lighten(List.selectionBackground,30%,lazy)
+@dropCellBackground = darken(List.selectionBackground,10%,lazy)
+@dropCellForeground = lazy(List.selectionForeground)
+@dropLineColor = lighten(List.selectionBackground,10%,lazy)
+@dropLineShortColor = lighten(List.selectionBackground,30%,lazy)
 
 
 #---- system colors ----
 
-activeCaption=#434E60
-inactiveCaption=#393C3D
-controlHighlight=darken($controlShadow,20%)
-controlLtHighlight=darken($controlShadow,25%)
-controlDkShadow=lighten($controlShadow,10%)
+activeCaption = #434E60
+inactiveCaption = #393C3D
+controlHighlight = darken($controlShadow,20%)
+controlLtHighlight = darken($controlShadow,25%)
+controlDkShadow = lighten($controlShadow,10%)
 
 
 #---- Button ----
 
-Button.background=#4c5052
-Button.hoverBackground=lighten($Button.background,3%,derived)
-Button.pressedBackground=lighten($Button.background,6%,derived)
-Button.selectedBackground=lighten($Button.background,10%,derived)
-Button.selectedForeground=@foreground
-Button.disabledSelectedBackground=lighten($Button.background,3%,derived)
+Button.background = #4c5052
+Button.hoverBackground = lighten($Button.background,3%,derived)
+Button.pressedBackground = lighten($Button.background,6%,derived)
+Button.selectedBackground = lighten($Button.background,10%,derived)
+Button.selectedForeground = @foreground
+Button.disabledSelectedBackground = lighten($Button.background,3%,derived)
 
-Button.borderColor=#5e6060
-Button.disabledBorderColor=#5e6060
-Button.focusedBorderColor=#466d94
-Button.hoverBorderColor=$Button.focusedBorderColor
+Button.borderColor = #5e6060
+Button.disabledBorderColor = $Button.borderColor
+Button.focusedBorderColor = $Component.focusedBorderColor
+Button.hoverBorderColor = $Button.focusedBorderColor
 
-Button.default.background=#365880
-Button.default.foreground=#bbb
-Button.default.hoverBackground=lighten($Button.default.background,3%,derived)
-Button.default.pressedBackground=lighten($Button.default.background,6%,derived)
-Button.default.borderColor=#4c708c
-Button.default.hoverBorderColor=#537699
-Button.default.focusedBorderColor=#537699
-Button.default.focusColor=#43688c
-Button.default.boldText=true
+Button.innerFocusWidth = 1
 
-Button.toolbar.hoverBackground=lighten($Button.background,1%,derived)
-Button.toolbar.pressedBackground=lighten($Button.background,4%,derived)
-Button.toolbar.selectedBackground=lighten($Button.background,7%,derived)
+Button.default.background = #365880
+Button.default.foreground = #bbb
+Button.default.hoverBackground = lighten($Button.default.background,3%,derived)
+Button.default.pressedBackground = lighten($Button.default.background,6%,derived)
+Button.default.borderColor = #4c708c
+Button.default.hoverBorderColor = #537699
+Button.default.focusedBorderColor = #537699
+Button.default.focusColor = #43688c
+Button.default.boldText = true
+
+Button.toolbar.hoverBackground = lighten($Button.background,1%,derived)
+Button.toolbar.pressedBackground = lighten($Button.background,4%,derived)
+Button.toolbar.selectedBackground = lighten($Button.background,7%,derived)
 
 
 #---- CheckBox ----
 
 # enabled
-CheckBox.icon.borderColor=#6B6B6B
-CheckBox.icon.background=#43494A
-CheckBox.icon.selectedBorderColor=$CheckBox.icon.borderColor
-CheckBox.icon.selectedBackground=$CheckBox.icon.background
-CheckBox.icon.checkmarkColor=#A7A7A7
+CheckBox.icon.borderColor = #6B6B6B
+CheckBox.icon.background = #43494A
+CheckBox.icon.selectedBorderColor = $CheckBox.icon.borderColor
+CheckBox.icon.selectedBackground = $CheckBox.icon.background
+CheckBox.icon.checkmarkColor = #A7A7A7
 
 # disabled
-CheckBox.icon.disabledBorderColor=#545556
-CheckBox.icon.disabledBackground=@background
-CheckBox.icon.disabledCheckmarkColor=#606060
+CheckBox.icon.disabledBorderColor = #545556
+CheckBox.icon.disabledBackground = @background
+CheckBox.icon.disabledCheckmarkColor = #606060
 
 # focused
-CheckBox.icon.focusedBorderColor=#466D94
-CheckBox.icon.selectedFocusedBorderColor=#466D94
+CheckBox.icon.focusedBorderColor = #466D94
+CheckBox.icon.focusedBackground = fade($CheckBox.icon.focusedBorderColor,30%)
 
 # hover
-CheckBox.icon.hoverBorderColor=$CheckBox.icon.focusedBorderColor
-CheckBox.icon.hoverBackground=lighten($CheckBox.icon.background,3%,derived)
+CheckBox.icon.hoverBorderColor = $CheckBox.icon.focusedBorderColor
+CheckBox.icon.hoverBackground = lighten($CheckBox.icon.background,3%,derived)
 
 # pressed
-CheckBox.icon.pressedBackground=lighten($CheckBox.icon.background,6%,derived)
+CheckBox.icon.pressedBackground = lighten($CheckBox.icon.background,6%,derived)
 
-# used if CheckBox.icon.style=filled
+
+# used if CheckBox.icon.style = filled
 # enabled
-CheckBox.icon[filled].selectedBorderColor=$CheckBox.icon.checkmarkColor
-CheckBox.icon[filled].selectedBackground=$CheckBox.icon.checkmarkColor
-CheckBox.icon[filled].checkmarkColor=$CheckBox.icon.background
+CheckBox.icon[filled].selectedBorderColor = $CheckBox.icon.checkmarkColor
+CheckBox.icon[filled].selectedBackground = $CheckBox.icon.checkmarkColor
+CheckBox.icon[filled].checkmarkColor = $CheckBox.icon.background
 # hover
-CheckBox.icon[filled].selectedHoverBackground=darken($CheckBox.icon[filled].selectedBackground,3%)
+CheckBox.icon[filled].selectedHoverBackground = darken($CheckBox.icon[filled].selectedBackground,3%,derived)
 # pressed
-CheckBox.icon[filled].selectedPressedBackground=darken($CheckBox.icon[filled].selectedBackground,6%)
+CheckBox.icon[filled].selectedPressedBackground = darken($CheckBox.icon[filled].selectedBackground,6%,derived)
 
 
 #---- ComboBox ----
 
-ComboBox.buttonEditableBackground=#404445
-ComboBox.buttonArrowColor=#9A9DA1
-ComboBox.buttonDisabledArrowColor=#585858
-ComboBox.buttonHoverArrowColor=#bbb
+ComboBox.buttonEditableBackground = darken($ComboBox.background,2%)
 
 
 #---- Component ----
 
-Component.borderColor=#646464
-Component.disabledBorderColor=#646464
-Component.focusedBorderColor=#466d94
-Component.focusColor=#3d6185
-Component.linkColor=#589df6
-Component.grayFilter=-20,-70,100
+Component.borderColor = #646464
+Component.disabledBorderColor = #646464
+Component.focusedBorderColor = #466d94
+Component.focusColor = #3d6185
+Component.linkColor = #589df6
+Component.grayFilter = -20,-70,100
 
-Component.error.borderColor=desaturate($Component.error.focusedBorderColor,25%)
-Component.error.focusedBorderColor=#8b3c3c
-Component.warning.borderColor=darken(desaturate($Component.warning.focusedBorderColor,20%),10%)
-Component.warning.focusedBorderColor=#ac7920
-Component.custom.borderColor=desaturate(#f00,50%,relative derived noAutoInverse)
+Component.error.borderColor = desaturate($Component.error.focusedBorderColor,25%)
+Component.error.focusedBorderColor = #8b3c3c
+Component.warning.borderColor = darken(desaturate($Component.warning.focusedBorderColor,20%),10%)
+Component.warning.focusedBorderColor = #ac7920
+Component.custom.borderColor = desaturate(#f00,50%,relative derived noAutoInverse)
 
 
 #---- Desktop ----
 
-Desktop.background=#3E434C
+Desktop.background = #3E434C
 
 
 #---- DesktopIcon ----
 
-DesktopIcon.background=lighten($Desktop.background,10%)
+DesktopIcon.background = lighten($Desktop.background,10%)
 
 
 #---- InternalFrame ----
 
-InternalFrame.activeTitleBackground=darken(@background,10%)
-InternalFrame.activeTitleForeground=@foreground
-InternalFrame.inactiveTitleBackground=darken(@background,5%)
-InternalFrame.inactiveTitleForeground=@disabledText
+InternalFrame.activeTitleBackground = darken(@background,10%)
+InternalFrame.activeTitleForeground = @foreground
+InternalFrame.inactiveTitleBackground = darken(@background,5%)
+InternalFrame.inactiveTitleForeground = @disabledText
 
-InternalFrame.activeBorderColor=darken(@background,7%)
-InternalFrame.inactiveBorderColor=darken(@background,3%)
+InternalFrame.activeBorderColor = darken(@background,7%)
+InternalFrame.inactiveBorderColor = darken(@background,3%)
 
-InternalFrame.buttonHoverBackground=lighten($InternalFrame.activeTitleBackground,10%,derived)
-InternalFrame.buttonPressedBackground=lighten($InternalFrame.activeTitleBackground,20%,derived)
-InternalFrame.closeHoverBackground=lazy(Actions.Red)
-InternalFrame.closePressedBackground=darken(Actions.Red,10%,lazy)
-InternalFrame.closeHoverForeground=#fff
-InternalFrame.closePressedForeground=#fff
+InternalFrame.buttonHoverBackground = lighten($InternalFrame.activeTitleBackground,10%,derived)
+InternalFrame.buttonPressedBackground = lighten($InternalFrame.activeTitleBackground,20%,derived)
+InternalFrame.closeHoverBackground = lazy(Actions.Red)
+InternalFrame.closePressedBackground = darken(Actions.Red,10%,lazy)
+InternalFrame.closeHoverForeground = #fff
+InternalFrame.closePressedForeground = #fff
 
-InternalFrame.activeDropShadowOpacity=0.5
-InternalFrame.inactiveDropShadowOpacity=0.75
+InternalFrame.activeDropShadowOpacity = 0.5
+InternalFrame.inactiveDropShadowOpacity = 0.75
 
 
 #---- Menu ----
 
-Menu.icon.arrowColor=#A7A7A7
-Menu.icon.disabledArrowColor=#606060
+Menu.icon.arrowColor = #A7A7A7
+Menu.icon.disabledArrowColor = #606060
 
 
 #---- MenuBar ----
 
-MenuBar.borderColor=#515151
+MenuBar.borderColor = #515151
 
 
 #---- MenuItemCheckBox ----
 
-MenuItemCheckBox.icon.checkmarkColor=#A7A7A7
-MenuItemCheckBox.icon.disabledCheckmarkColor=#606060
+MenuItemCheckBox.icon.checkmarkColor = #A7A7A7
+MenuItemCheckBox.icon.disabledCheckmarkColor = #606060
 
 
 #---- PasswordField ----
 
-PasswordField.capsLockIconColor=#ffffff64
+PasswordField.capsLockIconColor = #ffffff64
 
 
 #---- Popup ----
 
-Popup.dropShadowColor=#000
-Popup.dropShadowOpacity=0.25
+Popup.dropShadowColor = #000
+Popup.dropShadowOpacity = 0.25
 
 
 #---- PopupMenu ----
 
-PopupMenu.borderColor=#5e5e5e
+PopupMenu.borderColor = #5e5e5e
 
 
 #---- ProgressBar ----
 
-ProgressBar.background=#555
-ProgressBar.foreground=#4A88C7
-ProgressBar.selectionForeground=@foreground
-ProgressBar.selectionBackground=@foreground
+ProgressBar.background = #555
+ProgressBar.foreground = #4A88C7
+ProgressBar.selectionForeground = @foreground
+ProgressBar.selectionBackground = @foreground
 
 
 #---- RootPane ----
 
-RootPane.activeBorderColor=darken(@background,7%,derived)
-RootPane.inactiveBorderColor=darken(@background,5%,derived)
+RootPane.activeBorderColor = lighten(@background,7%,derived)
+RootPane.inactiveBorderColor = lighten(@background,5%,derived)
 
 
 #---- ScrollBar ----
 
-ScrollBar.track=lighten(@background,1%,derived noAutoInverse)
-ScrollBar.thumb=lighten($ScrollBar.track,10%,derived noAutoInverse)
-ScrollBar.hoverTrackColor=lighten($ScrollBar.track,4%,derived noAutoInverse)
-ScrollBar.hoverThumbColor=lighten($ScrollBar.thumb,10%,derived noAutoInverse)
-ScrollBar.pressedThumbColor=lighten($ScrollBar.thumb,15%,derived noAutoInverse)
-ScrollBar.hoverButtonBackground=lighten(@background,5%,derived noAutoInverse)
-ScrollBar.pressedButtonBackground=lighten(@background,10%,derived noAutoInverse)
+ScrollBar.track = lighten(@background,1%,derived noAutoInverse)
+ScrollBar.thumb = lighten($ScrollBar.track,10%,derived noAutoInverse)
+ScrollBar.hoverTrackColor = lighten($ScrollBar.track,4%,derived noAutoInverse)
+ScrollBar.hoverThumbColor = lighten($ScrollBar.thumb,10%,derived noAutoInverse)
+ScrollBar.pressedThumbColor = lighten($ScrollBar.thumb,15%,derived noAutoInverse)
+ScrollBar.hoverButtonBackground = lighten(@background,5%,derived noAutoInverse)
+ScrollBar.pressedButtonBackground = lighten(@background,10%,derived noAutoInverse)
 
 
 #---- Separator ----
 
-Separator.foreground=#515151
+Separator.foreground = #515151
 
 
 #---- Slider ----
 
-Slider.trackColor=#646464
-Slider.thumbColor=#A6A6A6
-Slider.tickColor=#888
-Slider.hoverColor=darken($Slider.thumbColor,15%,derived)
-Slider.disabledForeground=#4c5052
+Slider.trackValueColor = #4A88C7
+Slider.trackColor = #646464
+Slider.thumbColor = $Slider.trackValueColor
+Slider.tickColor = #888
+Slider.focusedColor = fade($Component.focusColor,70%,derived)
+Slider.hoverThumbColor = lighten($Slider.thumbColor,5%,derived)
+Slider.pressedThumbColor = lighten($Slider.thumbColor,8%,derived)
+Slider.disabledTrackColor = #4c5052
+Slider.disabledThumbColor = $Slider.disabledTrackColor
 
 
 #---- SplitPane ----
 
-SplitPaneDivider.draggingColor=#646464
-SplitPaneDivider.oneTouchHoverArrowColor=#7A7D81
+SplitPaneDivider.draggingColor = #646464
 
 
 #---- TabbedPane ----
 
-TabbedPane.underlineColor=#4A88C7
-TabbedPane.disabledUnderlineColor=#7a7a7a
-TabbedPane.hoverColor=#2e3133
-TabbedPane.focusColor=#3d4b5c
-TabbedPane.contentAreaColor=#646464
+TabbedPane.underlineColor = #4A88C7
+TabbedPane.disabledUnderlineColor = #7a7a7a
+TabbedPane.hoverColor = darken($TabbedPane.background,5%,derived noAutoInverse)
+TabbedPane.focusColor = #3d4b5c
+TabbedPane.contentAreaColor = #646464
+
+TabbedPane.buttonHoverBackground = darken($TabbedPane.background,5%,derived noAutoInverse)
+TabbedPane.buttonPressedBackground = darken($TabbedPane.background,8%,derived noAutoInverse)
+
+TabbedPane.closeBackground = null
+TabbedPane.closeForeground = @disabledText
+TabbedPane.closeHoverBackground = lighten($TabbedPane.background,5%,derived)
+TabbedPane.closeHoverForeground = @foreground
+TabbedPane.closePressedBackground = lighten($TabbedPane.background,10%,derived)
+TabbedPane.closePressedForeground = $TabbedPane.closeHoverForeground
 
 
 #---- Table ----
 
-Table.gridColor=lighten($Table.background,3%)
+Table.gridColor = lighten($Table.background,5%)
 
 
 #---- TableHeader ----
 
-TableHeader.separatorColor=lighten($TableHeader.background,10%)
-TableHeader.bottomSeparatorColor=$TableHeader.separatorColor
+TableHeader.separatorColor = lighten($TableHeader.background,10%)
+TableHeader.bottomSeparatorColor = $TableHeader.separatorColor
 
 
 #---- TitlePane ----
 
-TitlePane.embeddedForeground=darken($TitlePane.foreground,15%)
-TitlePane.buttonHoverBackground=lighten($TitlePane.background,10%,derived)
-TitlePane.buttonPressedBackground=lighten($TitlePane.background,20%,derived)
+TitlePane.embeddedForeground = darken($TitlePane.foreground,15%)
+TitlePane.buttonHoverBackground = lighten($TitlePane.background,10%,derived)
+TitlePane.buttonPressedBackground = lighten($TitlePane.background,20%,derived)
 
 
 #---- ToggleButton ----
 
-ToggleButton.selectedBackground=lighten($ToggleButton.background,10%,derived)
-ToggleButton.disabledSelectedBackground=lighten($ToggleButton.background,3%,derived)
+ToggleButton.selectedBackground = lighten($ToggleButton.background,10%,derived)
+ToggleButton.disabledSelectedBackground = lighten($ToggleButton.background,3%,derived)
 
-ToggleButton.toolbar.selectedBackground=lighten($ToggleButton.background,7%,derived)
+ToggleButton.toolbar.selectedBackground = lighten($ToggleButton.background,7%,derived)
 
 
 #---- ToolTip ----
 
-ToolTip.border=4,6,4,6
-ToolTip.background=#1e2123
+ToolTip.border = 4,6,4,6
+ToolTip.background = #1e2123
 
 
 #---- Tree ----
 
-Tree.hash=#505355
+Tree.hash = lighten($Tree.background,5%)

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

@@ -14,33 +14,46 @@
 # limitations under the License.
 #
 
+#
+# This file is loaded for "FlatLaf IntelliJ" theme (that extend class FlatIntelliJLaf)
+# and for all light IntelliJ Platform themes.
+#
+# Documentation:
+#  - https://www.formdev.com/flatlaf/properties-files/
+#  - https://www.formdev.com/flatlaf/how-to-customize/
+#
+# NOTE: Avoid copying the whole content of this file to own properties files.
+#       This will make upgrading to newer FlatLaf versions complex and error-prone.
+#       Instead copy and modify only those properties that you need to alter.
+#
+
 # Colors and style mostly based on IntelliJ theme from IntelliJ IDEA Community Edition,
 # which is licensed under the Apache 2.0 license. Copyright 2000-2019 JetBrains s.r.o.
 # See: https://github.com/JetBrains/intellij-community/
 
 #---- Button ----
 
-Button.focusedBackground=null
+Button.focusedBackground = null
 
-Button.default.background=#4D8AC9
-Button.default.foreground=#fff
-Button.default.focusedBackground=null
-Button.default.borderColor=#3D75B2
-Button.default.hoverBorderColor=#A9C9F5
-Button.default.focusedBorderColor=#A9C9F5
-Button.default.focusColor=#97c3f3
-Button.default.boldText=true
-Button.default.borderWidth=1
+Button.default.background = #4D8AC9
+Button.default.foreground = #fff
+Button.default.focusedBackground = null
+Button.default.borderColor = #3D75B2
+Button.default.hoverBorderColor = #A9C9F5
+Button.default.focusedBorderColor = #A9C9F5
+Button.default.focusColor = #97c3f3
+Button.default.boldText = true
+Button.default.borderWidth = 1
 
 
 #---- CheckBox ----
 
-CheckBox.icon.style=filled
+CheckBox.icon.style = filled
 
 
 #---- Component ----
 
-Component.focusWidth=2
-Component.innerFocusWidth=0
-Component.innerOutlineWidth=0
-Component.arrowType=triangle
+Component.focusWidth = 2
+Component.innerFocusWidth = 0
+Component.innerOutlineWidth = 0
+Component.arrowType = triangle

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

@@ -14,295 +14,325 @@
 # limitations under the License.
 #
 
+#
+# This file is loaded for all light themes (that extend class FlatLightLaf).
+#
+# Documentation:
+#  - https://www.formdev.com/flatlaf/properties-files/
+#  - https://www.formdev.com/flatlaf/how-to-customize/
+#
+# NOTE: Avoid copying the whole content of this file to own properties files.
+#       This will make upgrading to newer FlatLaf versions complex and error-prone.
+#       Instead copy and modify only those properties that you need to alter.
+#
+
 # Colors and style mostly based on IntelliJ theme from IntelliJ IDEA Community Edition,
 # which is licensed under the Apache 2.0 license. Copyright 2000-2019 JetBrains s.r.o.
 # See: https://github.com/JetBrains/intellij-community/
 
 #---- variables ----
 
-@background=#f2f2f2
-@foreground=#000
-@selectionBackground=#2675BF
-@selectionForeground=#fff
-@selectionInactiveBackground=#d4d4d4
-@selectionInactiveForeground=@foreground
-@disabledText=#8C8C8C
-@textComponentBackground=#fff
-@menuBackground=#fff
-@menuHoverBackground=darken(@menuBackground,10%,derived)
-@menuCheckBackground=lighten(@selectionBackground,40%)
-@menuAcceleratorForeground=lighten(@foreground,30%)
-@menuAcceleratorSelectionForeground=@selectionForeground
-@cellFocusColor=#000
-@icon=#afafaf
+@background = #f2f2f2
+@foreground = #000
+@selectionBackground = #2675BF
+@selectionForeground = #fff
+@selectionInactiveBackground = #d4d4d4
+@selectionInactiveForeground = @foreground
+@disabledText = #8C8C8C
+@textComponentBackground = #fff
+@menuBackground = #fff
+@menuHoverBackground = darken(@menuBackground,10%,derived)
+@menuCheckBackground = lighten(@selectionBackground,40%,derived noAutoInverse)
+@menuAcceleratorForeground = lighten(@foreground,30%)
+@menuAcceleratorSelectionForeground = @selectionForeground
+@cellFocusColor = #000
+@icon = #afafaf
+
+# for buttons within components (e.g. combobox or spinner)
+@buttonArrowColor = #666
+@buttonDisabledArrowColor = lighten(@buttonArrowColor,25%)
+@buttonHoverArrowColor = lighten(@buttonArrowColor,20%,derived noAutoInverse)
+@buttonPressedArrowColor = lighten(@buttonArrowColor,30%,derived noAutoInverse)
 
 # Drop (use lazy colors for IntelliJ platform themes, which usually do not specify these colors)
-@dropCellBackground=lighten(List.selectionBackground,10%,lazy)
-@dropCellForeground=lazy(List.selectionForeground)
-@dropLineColor=lighten(List.selectionBackground,20%,lazy)
-@dropLineShortColor=darken(List.selectionBackground,20%,lazy)
+@dropCellBackground = lighten(List.selectionBackground,10%,lazy)
+@dropCellForeground = lazy(List.selectionForeground)
+@dropLineColor = lighten(List.selectionBackground,20%,lazy)
+@dropLineShortColor = darken(List.selectionBackground,20%,lazy)
 
 
 #---- system colors ----
 
-activeCaption=#99b4d1
-inactiveCaption=#bfcddb
-controlHighlight=#e3e3e3
-controlLtHighlight=#fff
-controlDkShadow=darken($controlShadow,15%)
+activeCaption = #99b4d1
+inactiveCaption = #bfcddb
+controlHighlight = lighten($controlShadow,12%)
+controlLtHighlight = lighten($controlShadow,25%)
+controlDkShadow = darken($controlShadow,15%)
 
 
 #---- Button ----
 
-Button.background=#fff
-Button.focusedBackground=#e3f1fa
-Button.hoverBackground=darken($Button.background,3%,derived)
-Button.pressedBackground=darken($Button.background,10%,derived)
-Button.selectedBackground=darken($Button.background,20%,derived)
-Button.selectedForeground=@foreground
-Button.disabledSelectedBackground=darken($Button.background,13%,derived)
+Button.background = #fff
+Button.focusedBackground = #e3f1fa
+Button.hoverBackground = darken($Button.background,3%,derived)
+Button.pressedBackground = darken($Button.background,10%,derived)
+Button.selectedBackground = darken($Button.background,20%,derived)
+Button.selectedForeground = @foreground
+Button.disabledSelectedBackground = darken($Button.background,13%,derived)
 
-Button.borderColor=$Component.borderColor
-Button.disabledBorderColor=$Component.disabledBorderColor
-Button.focusedBorderColor=$Component.focusedBorderColor
-Button.hoverBorderColor=$Button.focusedBorderColor
+Button.borderColor = $Component.borderColor
+Button.disabledBorderColor = $Component.disabledBorderColor
+Button.focusedBorderColor = $Component.focusedBorderColor
+Button.hoverBorderColor = $Button.focusedBorderColor
 
-Button.default.background=$Button.background
-Button.default.foreground=@foreground
-Button.default.focusedBackground=$Button.focusedBackground
-Button.default.hoverBackground=$Button.hoverBackground
-Button.default.pressedBackground=$Button.pressedBackground
-Button.default.borderColor=#4F9EE3
-Button.default.hoverBorderColor=$Button.hoverBorderColor
-Button.default.focusedBorderColor=$Button.focusedBorderColor
-Button.default.focusColor=$Component.focusColor
-Button.default.borderWidth=2
+Button.innerFocusWidth = 0
 
-Button.toolbar.hoverBackground=darken($Button.background,12%,derived)
-Button.toolbar.pressedBackground=darken($Button.background,15%,derived)
-Button.toolbar.selectedBackground=$Button.selectedBackground
+Button.default.background = $Button.background
+Button.default.foreground = @foreground
+Button.default.focusedBackground = $Button.focusedBackground
+Button.default.hoverBackground = darken($Button.default.background,3%,derived)
+Button.default.pressedBackground = darken($Button.default.background,10%,derived)
+Button.default.borderColor = #4F9EE3
+Button.default.hoverBorderColor = $Button.hoverBorderColor
+Button.default.focusedBorderColor = $Button.focusedBorderColor
+Button.default.focusColor = $Component.focusColor
+Button.default.borderWidth = 2
+
+Button.toolbar.hoverBackground = darken($Button.background,12%,derived)
+Button.toolbar.pressedBackground = darken($Button.background,15%,derived)
+Button.toolbar.selectedBackground = $Button.selectedBackground
 
 
 #---- CheckBox ----
 
 # enabled
-CheckBox.icon.borderColor=#b0b0b0
-CheckBox.icon.background=#fff
-CheckBox.icon.selectedBorderColor=$CheckBox.icon.borderColor
-CheckBox.icon.selectedBackground=$CheckBox.icon.background
-CheckBox.icon.checkmarkColor=#4F9EE3
+CheckBox.icon.borderColor = #b0b0b0
+CheckBox.icon.background = #fff
+CheckBox.icon.selectedBorderColor = $CheckBox.icon.borderColor
+CheckBox.icon.selectedBackground = $CheckBox.icon.background
+CheckBox.icon.checkmarkColor = #4F9EE3
 
 # disabled
-CheckBox.icon.disabledBorderColor=#BDBDBD
-CheckBox.icon.disabledBackground=@background
-CheckBox.icon.disabledCheckmarkColor=#ABABAB
+CheckBox.icon.disabledBorderColor = #BDBDBD
+CheckBox.icon.disabledBackground = @background
+CheckBox.icon.disabledCheckmarkColor = #ABABAB
 
 # focused
-CheckBox.icon.focusedBorderColor=#7B9FC7
-CheckBox.icon.focusedBackground=$Button.focusedBackground
+CheckBox.icon.focusedBorderColor = #7B9FC7
+CheckBox.icon.focusedBackground = $Button.focusedBackground
 
 # hover
-CheckBox.icon.hoverBorderColor=$CheckBox.icon.focusedBorderColor
-CheckBox.icon.hoverBackground=$Button.hoverBackground
+CheckBox.icon.hoverBorderColor = $CheckBox.icon.focusedBorderColor
+CheckBox.icon.hoverBackground = $Button.hoverBackground
 
 # pressed
-CheckBox.icon.pressedBackground=$Button.pressedBackground
+CheckBox.icon.pressedBackground = $Button.pressedBackground
 
 
-# used if CheckBox.icon.style=filled
+# used if CheckBox.icon.style = filled
 # enabled
-CheckBox.icon[filled].selectedBorderColor=#4B97D9
-CheckBox.icon[filled].selectedBackground=#4F9EE3
-CheckBox.icon[filled].checkmarkColor=#fff
+CheckBox.icon[filled].selectedBorderColor = #4B97D9
+CheckBox.icon[filled].selectedBackground = #4F9EE3
+CheckBox.icon[filled].checkmarkColor = #fff
 # focused
-CheckBox.icon[filled].selectedFocusedBorderColor=#ACCFF7
-CheckBox.icon[filled].selectedFocusedBackground=$CheckBox.icon[filled].selectedBackground
-CheckBox.icon[filled].selectedFocusedCheckmarkColor=$CheckBox.icon.focusedBackground
+CheckBox.icon[filled].selectedFocusedBorderColor = #ACCFF7
+CheckBox.icon[filled].selectedFocusedBackground = $CheckBox.icon[filled].selectedBackground
+CheckBox.icon[filled].selectedFocusedCheckmarkColor = $CheckBox.icon.focusedBackground
 # hover
-CheckBox.icon[filled].selectedHoverBackground=darken($CheckBox.icon[filled].selectedBackground,5%)
+CheckBox.icon[filled].selectedHoverBackground = darken($CheckBox.icon[filled].selectedBackground,5%,derived)
 # pressed
-CheckBox.icon[filled].selectedPressedBackground=darken($CheckBox.icon[filled].selectedBackground,10%)
+CheckBox.icon[filled].selectedPressedBackground = darken($CheckBox.icon[filled].selectedBackground,10%,derived)
 
 
 #---- ComboBox ----
 
-ComboBox.buttonEditableBackground=#fafafa
-ComboBox.buttonArrowColor=#666
-ComboBox.buttonDisabledArrowColor=#ABABAB
-ComboBox.buttonHoverArrowColor=#999
+ComboBox.buttonEditableBackground = darken($ComboBox.background,2%)
 
 
 #---- Component ----
 
-Component.borderColor=#c4c4c4
-Component.disabledBorderColor=#cfcfcf
-Component.focusedBorderColor=#87afda
-Component.focusColor=#97c3f3
-Component.linkColor=#2470B3
-Component.grayFilter=25,-25,100
+Component.borderColor = #c4c4c4
+Component.disabledBorderColor = #cfcfcf
+Component.focusedBorderColor = #87afda
+Component.focusColor = #97c3f3
+Component.linkColor = #2470B3
+Component.grayFilter = 25,-25,100
 
-Component.error.borderColor=lighten(desaturate($Component.error.focusedBorderColor,20%),25%)
-Component.error.focusedBorderColor=#e53e4d
-Component.warning.borderColor=lighten(saturate($Component.warning.focusedBorderColor,25%),20%)
-Component.warning.focusedBorderColor=#e2a53a
-Component.custom.borderColor=lighten(desaturate(#f00,20%,derived noAutoInverse),25%,derived noAutoInverse)
+Component.error.borderColor = lighten(desaturate($Component.error.focusedBorderColor,20%),25%)
+Component.error.focusedBorderColor = #e53e4d
+Component.warning.borderColor = lighten(saturate($Component.warning.focusedBorderColor,25%),20%)
+Component.warning.focusedBorderColor = #e2a53a
+Component.custom.borderColor = lighten(desaturate(#f00,20%,derived noAutoInverse),25%,derived noAutoInverse)
 
 
 #---- Desktop ----
 
-Desktop.background=#E6EBF0
+Desktop.background = #E6EBF0
 
 
 #---- DesktopIcon ----
 
-DesktopIcon.background=darken($Desktop.background,10%)
+DesktopIcon.background = darken($Desktop.background,10%)
 
 
 #---- HelpButton ----
 
-HelpButton.questionMarkColor=#4F9EE3
+HelpButton.questionMarkColor = #4F9EE3
 
 
 #---- InternalFrame ----
 
-InternalFrame.activeTitleBackground=#fff
-InternalFrame.activeTitleForeground=@foreground
-InternalFrame.inactiveTitleBackground=#fafafa
-InternalFrame.inactiveTitleForeground=@disabledText
+InternalFrame.activeTitleBackground = #fff
+InternalFrame.activeTitleForeground = @foreground
+InternalFrame.inactiveTitleBackground = #fafafa
+InternalFrame.inactiveTitleForeground = @disabledText
 
-InternalFrame.activeBorderColor=darken($Component.borderColor,20%)
-InternalFrame.inactiveBorderColor=$Component.borderColor
+InternalFrame.activeBorderColor = darken($Component.borderColor,20%)
+InternalFrame.inactiveBorderColor = $Component.borderColor
 
-InternalFrame.buttonHoverBackground=darken($InternalFrame.activeTitleBackground,10%,derived)
-InternalFrame.buttonPressedBackground=darken($InternalFrame.activeTitleBackground,20%,derived)
-InternalFrame.closeHoverBackground=lazy(Actions.Red)
-InternalFrame.closePressedBackground=darken(Actions.Red,10%,lazy)
-InternalFrame.closeHoverForeground=#fff
-InternalFrame.closePressedForeground=#fff
+InternalFrame.buttonHoverBackground = darken($InternalFrame.activeTitleBackground,10%,derived)
+InternalFrame.buttonPressedBackground = darken($InternalFrame.activeTitleBackground,20%,derived)
+InternalFrame.closeHoverBackground = lazy(Actions.Red)
+InternalFrame.closePressedBackground = darken(Actions.Red,10%,lazy)
+InternalFrame.closeHoverForeground = #fff
+InternalFrame.closePressedForeground = #fff
 
-InternalFrame.activeDropShadowOpacity=0.25
-InternalFrame.inactiveDropShadowOpacity=0.5
+InternalFrame.activeDropShadowOpacity = 0.25
+InternalFrame.inactiveDropShadowOpacity = 0.5
 
 
 #---- Menu ----
 
-Menu.icon.arrowColor=#666
-Menu.icon.disabledArrowColor=#ABABAB
+Menu.icon.arrowColor = #666
+Menu.icon.disabledArrowColor = #ABABAB
 
 
 #---- MenuBar ----
 
-MenuBar.borderColor=#cdcdcd
+MenuBar.borderColor = #cdcdcd
 
 
 #---- MenuItemCheckBox ----
 
-MenuItemCheckBox.icon.checkmarkColor=#4F9EE3
-MenuItemCheckBox.icon.disabledCheckmarkColor=#ABABAB
+MenuItemCheckBox.icon.checkmarkColor = #4F9EE3
+MenuItemCheckBox.icon.disabledCheckmarkColor = #ABABAB
 
 
 #---- PasswordField ----
 
-PasswordField.capsLockIconColor=#00000064
+PasswordField.capsLockIconColor = #00000064
 
 
 #---- Popup ----
 
-Popup.dropShadowColor=#000
-Popup.dropShadowOpacity=0.15
+Popup.dropShadowColor = #000
+Popup.dropShadowOpacity = 0.15
 
 
 #---- PopupMenu ----
 
-PopupMenu.borderColor=#adadad
+PopupMenu.borderColor = #adadad
 
 
 #---- ProgressBar ----
 
-ProgressBar.background=#D1D1D1
-ProgressBar.foreground=#1E82E6
-ProgressBar.selectionForeground=@textComponentBackground
-ProgressBar.selectionBackground=@foreground
+ProgressBar.background = #D1D1D1
+ProgressBar.foreground = #1E82E6
+ProgressBar.selectionForeground = @textComponentBackground
+ProgressBar.selectionBackground = @foreground
 
 
 #---- RootPane ----
 
-RootPane.activeBorderColor=#707070
-RootPane.inactiveBorderColor=lighten($RootPane.activeBorderColor,20%,derived)
+RootPane.activeBorderColor = darken(@background,50%,derived)
+RootPane.inactiveBorderColor = darken(@background,30%,derived)
 
 
 #---- ScrollBar ----
 
-ScrollBar.track=lighten(@background,1%,derived noAutoInverse)
-ScrollBar.thumb=darken($ScrollBar.track,10%,derived noAutoInverse)
-ScrollBar.hoverTrackColor=darken($ScrollBar.track,3%,derived noAutoInverse)
-ScrollBar.hoverThumbColor=darken($ScrollBar.thumb,10%,derived noAutoInverse)
-ScrollBar.pressedThumbColor=darken($ScrollBar.thumb,20%,derived noAutoInverse)
-ScrollBar.hoverButtonBackground=darken(@background,5%,derived noAutoInverse)
-ScrollBar.pressedButtonBackground=darken(@background,10%,derived noAutoInverse)
+ScrollBar.track = lighten(@background,1%,derived noAutoInverse)
+ScrollBar.thumb = darken($ScrollBar.track,10%,derived noAutoInverse)
+ScrollBar.hoverTrackColor = darken($ScrollBar.track,3%,derived noAutoInverse)
+ScrollBar.hoverThumbColor = darken($ScrollBar.thumb,10%,derived noAutoInverse)
+ScrollBar.pressedThumbColor = darken($ScrollBar.thumb,20%,derived noAutoInverse)
+ScrollBar.hoverButtonBackground = darken(@background,5%,derived noAutoInverse)
+ScrollBar.pressedButtonBackground = darken(@background,10%,derived noAutoInverse)
 
 
 #---- Separator ----
 
-Separator.foreground=#d1d1d1
+Separator.foreground = #d1d1d1
 
 
 #---- Slider ----
 
-Slider.trackColor=#c4c4c4
-Slider.thumbColor=#6e6e6e
-Slider.tickColor=#888
-Slider.hoverColor=lighten($Slider.thumbColor,15%,derived)
-Slider.disabledForeground=#c0c0c0
+Slider.trackValueColor = #1E82E6
+Slider.trackColor = #c4c4c4
+Slider.thumbColor = $Slider.trackValueColor
+Slider.tickColor = #888
+Slider.focusedColor = fade($Component.focusColor,50%,derived)
+Slider.hoverThumbColor = darken($Slider.thumbColor,5%,derived)
+Slider.pressedThumbColor = darken($Slider.thumbColor,8%,derived)
+Slider.disabledTrackColor = #c0c0c0
+Slider.disabledThumbColor = $Slider.disabledTrackColor
 
 
 #---- SplitPane ----
 
-SplitPaneDivider.draggingColor=#c4c4c4
-SplitPaneDivider.oneTouchHoverArrowColor=#333
+SplitPaneDivider.draggingColor = #c4c4c4
 
 
 #---- TabbedPane ----
 
-TabbedPane.underlineColor=#4083C9
-TabbedPane.disabledUnderlineColor=#ababab
-TabbedPane.hoverColor=#d9d9d9
-TabbedPane.focusColor=#dae4ed
-TabbedPane.contentAreaColor=#bfbfbf
+TabbedPane.underlineColor = #4083C9
+TabbedPane.disabledUnderlineColor = #ababab
+TabbedPane.hoverColor = darken($TabbedPane.background,7%,derived)
+TabbedPane.focusColor = #dae4ed
+TabbedPane.contentAreaColor = #bfbfbf
+
+TabbedPane.buttonHoverBackground = darken($TabbedPane.background,7%,derived)
+TabbedPane.buttonPressedBackground = darken($TabbedPane.background,10%,derived)
+
+TabbedPane.closeBackground = null
+TabbedPane.closeForeground = @disabledText
+TabbedPane.closeHoverBackground = darken($TabbedPane.background,20%,derived)
+TabbedPane.closeHoverForeground = @foreground
+TabbedPane.closePressedBackground = darken($TabbedPane.background,25%,derived)
+TabbedPane.closePressedForeground = $TabbedPane.closeHoverForeground
 
 
 #---- Table ----
 
-Table.gridColor=darken($Table.background,3%)
+Table.gridColor = darken($Table.background,5%)
 
 
 #---- TableHeader ----
 
-TableHeader.separatorColor=darken($TableHeader.background,10%)
-TableHeader.bottomSeparatorColor=$TableHeader.separatorColor
+TableHeader.separatorColor = darken($TableHeader.background,10%)
+TableHeader.bottomSeparatorColor = $TableHeader.separatorColor
 
 
 #---- TitlePane ----
 
-TitlePane.embeddedForeground=lighten($TitlePane.foreground,35%)
-TitlePane.buttonHoverBackground=darken($TitlePane.background,10%,derived)
-TitlePane.buttonPressedBackground=darken($TitlePane.background,20%,derived)
+TitlePane.embeddedForeground = lighten($TitlePane.foreground,35%)
+TitlePane.buttonHoverBackground = darken($TitlePane.background,10%,derived)
+TitlePane.buttonPressedBackground = darken($TitlePane.background,20%,derived)
 
 
 #---- ToggleButton ----
 
-ToggleButton.selectedBackground=darken($ToggleButton.background,20%,derived)
-ToggleButton.disabledSelectedBackground=darken($ToggleButton.background,13%,derived)
+ToggleButton.selectedBackground = darken($ToggleButton.background,20%,derived)
+ToggleButton.disabledSelectedBackground = darken($ToggleButton.background,13%,derived)
 
-ToggleButton.toolbar.selectedBackground=$ToggleButton.selectedBackground
+ToggleButton.toolbar.selectedBackground = $ToggleButton.selectedBackground
 
 
 #---- ToolTip ----
 
-ToolTip.border=4,6,4,6,$InternalFrame.activeBorderColor
-ToolTip.background=#fafafa
+ToolTip.border = 4,6,4,6,$InternalFrame.activeBorderColor
+ToolTip.background = #fafafa
 
 
 #---- Tree ----
 
-Tree.hash=#E6E6E6
+Tree.hash = darken($Tree.background,10%)

flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties

@@ -14,123 +14,199 @@
 # limitations under the License.
 #
 
+#
+# This file is loaded for all IntelliJ Platform themes.
+#
+# Documentation:
+#  - https://www.formdev.com/flatlaf/properties-files/
+#  - https://www.formdev.com/flatlaf/how-to-customize/
+#
+
 #---- Button ----
 
-Button.startBackground=$Button.background
-Button.endBackground=$Button.background
-Button.startBorderColor=$Button.borderColor
-Button.endBorderColor=$Button.borderColor
+Button.startBackground = $Button.background
+Button.endBackground = $Button.background
+Button.startBorderColor = $Button.borderColor
+Button.endBorderColor = $Button.borderColor
 
-Button.default.startBackground=$Button.default.background
-Button.default.endBackground=$Button.default.background
-Button.default.startBorderColor=$Button.default.borderColor
-Button.default.endBorderColor=$Button.default.borderColor
+Button.default.startBackground = $Button.default.background
+Button.default.endBackground = $Button.default.background
+Button.default.startBorderColor = $Button.default.borderColor
+Button.default.endBorderColor = $Button.default.borderColor
 
-Button.hoverBorderColor=null
-Button.default.hoverBorderColor=null
+Button.hoverBorderColor = null
+Button.default.hoverBorderColor = null
 
 
 #---- HelpButton ----
 
-HelpButton.hoverBorderColor=null
+HelpButton.hoverBorderColor = null
+
+
+#---- MenuItemCheckBox ----
+
+# colors from intellij/checkmark.svg and darcula/checkmark.svg
+[light]MenuItemCheckBox.icon.checkmarkColor=#3E3E3C
+[dark]MenuItemCheckBox.icon.checkmarkColor=#fff9
+
+
+#---- Slider ----
+
+Slider.focusedColor = fade($Component.focusColor,40%,derived)
 
 
 #---- ToggleButton ----
 
-ToggleButton.startBackground=$ToggleButton.background
-ToggleButton.endBackground=$ToggleButton.background
-[dark]ToggleButton.selectedBackground=lighten($ToggleButton.background,15%,derived)
-[dark]ToggleButton.disabledSelectedBackground=lighten($ToggleButton.background,5%,derived)
+ToggleButton.startBackground = $ToggleButton.background
+ToggleButton.endBackground = $ToggleButton.background
+[dark]ToggleButton.selectedBackground = lighten($ToggleButton.background,15%,derived)
+[dark]ToggleButton.disabledSelectedBackground = lighten($ToggleButton.background,5%,derived)
 
 
 #---- theme specific ----
 
-[Arc_Theme]ProgressBar.selectionBackground=#000
-[Arc_Theme]ProgressBar.selectionForeground=#fff
+@ijMenuCheckBackgroundL10 = lighten(@selectionBackground,10%,derived noAutoInverse)
+@ijMenuCheckBackgroundL20 = lighten(@selectionBackground,20%,derived noAutoInverse)
+@ijMenuCheckBackgroundD10 = darken(@selectionBackground,10%,derived noAutoInverse)
 
-[Arc_Theme_-_Orange]ProgressBar.selectionBackground=#000
-[Arc_Theme_-_Orange]ProgressBar.selectionForeground=#fff
+[Arc_Theme]ProgressBar.selectionBackground = #000
+[Arc_Theme]ProgressBar.selectionForeground = #fff
+[Arc_Theme]List.selectionInactiveForeground = #fff
+[Arc_Theme]Table.selectionInactiveForeground = #fff
+[Arc_Theme]Tree.selectionInactiveForeground = #fff
 
-[Arc_Theme_Dark]ProgressBar.selectionBackground=#ddd
-[Arc_Theme_Dark]ProgressBar.selectionForeground=#ddd
+[Arc_Theme_-_Orange]ProgressBar.selectionBackground = #000
+[Arc_Theme_-_Orange]ProgressBar.selectionForeground = #fff
+[Arc_Theme_-_Orange]List.selectionInactiveForeground = #fff
+[Arc_Theme_-_Orange]Table.selectionInactiveForeground = #fff
+[Arc_Theme_-_Orange]Tree.selectionInactiveForeground = #fff
 
-[Arc_Theme_Dark_-_Orange]ProgressBar.selectionBackground=#ddd
-[Arc_Theme_Dark_-_Orange]ProgressBar.selectionForeground=#fff
+[Arc_Theme_Dark]ProgressBar.selectionBackground = #ddd
+[Arc_Theme_Dark]ProgressBar.selectionForeground = #ddd
 
-[Cobalt_2]CheckBox.icon.background=#002946
-[Cobalt_2]CheckBox.icon.checkmarkColor=#002946
+[Arc_Theme_Dark_-_Orange]ProgressBar.selectionBackground = #ddd
+[Arc_Theme_Dark_-_Orange]ProgressBar.selectionForeground = #fff
 
-[Dracula]ProgressBar.selectionBackground=#fff
-[Dracula]ProgressBar.selectionForeground=#fff
+[Cobalt_2]CheckBox.icon.background = #002946
+[Cobalt_2]CheckBox.icon.checkmarkColor = #002946
+[Cobalt_2]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
+[Cobalt_2]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
 
-[Gruvbox_Dark_Hard]ToggleButton.selectedBackground=$ToggleButton.selectedBackground
-[Gruvbox_Dark_Hard]ToggleButton.toolbar.selectedBackground=$ToggleButton.toolbar.selectedBackground
+[Cyan_light]MenuItem.checkBackground = @ijMenuCheckBackgroundL20
+[Cyan_light]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL20
 
-[Gruvbox_Dark_Medium]ToggleButton.selectedBackground=$ToggleButton.selectedBackground
-[Gruvbox_Dark_Medium]ToggleButton.toolbar.selectedBackground=$ToggleButton.toolbar.selectedBackground
+[Dark_purple]Slider.focusedColor = fade($Component.focusColor,70%,derived)
 
-[Gruvbox_Dark_Soft]ToggleButton.selectedBackground=$ToggleButton.selectedBackground
-[Gruvbox_Dark_Soft]ToggleButton.toolbar.selectedBackground=$ToggleButton.toolbar.selectedBackground
+[Dracula]ProgressBar.selectionBackground = #fff
+[Dracula]ProgressBar.selectionForeground = #fff
 
-[Hiberbee_Dark]ToggleButton.selectedBackground=$ToggleButton.selectedBackground
-[Hiberbee_Dark]ToggleButton.selectedBackground=$ToggleButton.selectedBackground
-[Hiberbee_Dark]ToggleButton.toolbar.selectedBackground=$ToggleButton.toolbar.selectedBackground
+[Gradianto_Dark_Fuchsia]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
+[Gradianto_Dark_Fuchsia]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
 
-[High_contrast]ToggleButton.selectedBackground=#fff
-[High_contrast]ToggleButton.selectedForeground=#000
-[High_contrast]ToggleButton.disabledSelectedBackground=#444
-[High_contrast]ToggleButton.toolbar.selectedBackground=#fff
+[Gruvbox_Dark_Hard]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
+[Gruvbox_Dark_Hard]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground
+
+[Gruvbox_Dark_Medium]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
+[Gruvbox_Dark_Medium]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground
+
+[Gruvbox_Dark_Soft]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
+[Gruvbox_Dark_Soft]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
+[Gruvbox_Dark_Soft]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
+[Gruvbox_Dark_Soft]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground
+
+[Hiberbee_Dark]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
+[Hiberbee_Dark]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
+[Hiberbee_Dark]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground
+
+[High_contrast]ToggleButton.selectedBackground = #fff
+[High_contrast]ToggleButton.selectedForeground = #000
+[High_contrast]ToggleButton.disabledSelectedBackground = #444
+[High_contrast]ToggleButton.toolbar.selectedBackground = #fff
+
+[Monocai]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
+[Monocai]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
+@Monocai.acceleratorForeground = lazy(MenuItem.disabledForeground)
+@Monocai.acceleratorSelectionForeground = lighten(MenuItem.disabledForeground,10%,lazy)
+[Monocai]CheckBoxMenuItem.acceleratorForeground = @Monocai.acceleratorForeground
+[Monocai]CheckBoxMenuItem.acceleratorSelectionForeground = @Monocai.acceleratorSelectionForeground
+[Monocai]Menu.acceleratorForeground = @Monocai.acceleratorForeground
+[Monocai]Menu.acceleratorSelectionForeground = @Monocai.acceleratorSelectionForeground
+[Monocai]MenuItem.acceleratorForeground = @Monocai.acceleratorForeground
+[Monocai]MenuItem.acceleratorSelectionForeground = @Monocai.acceleratorSelectionForeground
+[Monocai]RadioButtonMenuItem.acceleratorForeground = @Monocai.acceleratorForeground
+[Monocai]RadioButtonMenuItem.acceleratorSelectionForeground = @Monocai.acceleratorSelectionForeground
+
+[Nord]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
+[Nord]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
+
+[One_Dark]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
+[One_Dark]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
+[One_Dark]Slider.focusedColor = fade(#568af2,40%)
+
+[Solarized_Dark]Slider.focusedColor = fade($Component.focusColor,80%,derived)
+
+[vuesion-theme]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
+[vuesion-theme]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
+[vuesion-theme]Slider.trackValueColor = #ececee
+[vuesion-theme]Slider.trackColor = #303a45
+[vuesion-theme]Slider.thumbColor = #ececee
+[vuesion-theme]Slider.focusedColor = fade(#ececee,20%)
 
 
 # Material Theme UI Lite
 
-[Dracula_Contrast]ProgressBar.selectionBackground=#fff
-[Dracula_Contrast]ProgressBar.selectionForeground=#fff
+[light][author-Mallowigi]MenuItem.checkBackground = @ijMenuCheckBackgroundD10
+[light][author-Mallowigi]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundD10
+[dark][author-Mallowigi]MenuItem.checkBackground = @ijMenuCheckBackgroundL20
+[dark][author-Mallowigi]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL20
 
-[GitHub]ProgressBar.selectionBackground=#222
-[GitHub]ProgressBar.selectionForeground=#222
+[Dracula_Contrast]ProgressBar.selectionBackground = #fff
+[Dracula_Contrast]ProgressBar.selectionForeground = #fff
 
-[GitHub_Contrast]ProgressBar.selectionBackground=#222
-[GitHub_Contrast]ProgressBar.selectionForeground=#222
+[GitHub]ProgressBar.selectionBackground = #222
+[GitHub]ProgressBar.selectionForeground = #222
 
-[Light_Owl]ProgressBar.selectionBackground=#111
-[Light_Owl]ProgressBar.selectionForeground=#fff
+[GitHub_Contrast]ProgressBar.selectionBackground = #222
+[GitHub_Contrast]ProgressBar.selectionForeground = #222
 
-[Light_Owl_Contrast]ProgressBar.selectionBackground=#111
-[Light_Owl_Contrast]ProgressBar.selectionForeground=#fff
+[Light_Owl]ProgressBar.selectionBackground = #111
+[Light_Owl]ProgressBar.selectionForeground = #fff
 
-[Material_Lighter]ProgressBar.selectionBackground=#222
-[Material_Lighter]ProgressBar.selectionForeground=#fff
+[Light_Owl_Contrast]ProgressBar.selectionBackground = #111
+[Light_Owl_Contrast]ProgressBar.selectionForeground = #fff
 
-[Material_Lighter_Contrast]ProgressBar.selectionBackground=#222
-[Material_Lighter_Contrast]ProgressBar.selectionForeground=#fff
+[Material_Lighter]ProgressBar.selectionBackground = #222
+[Material_Lighter]ProgressBar.selectionForeground = #fff
 
-[Material_Oceanic]ProgressBar.selectionBackground=#ddd
-[Material_Oceanic]ProgressBar.selectionForeground=#ddd
+[Material_Lighter_Contrast]ProgressBar.selectionBackground = #222
+[Material_Lighter_Contrast]ProgressBar.selectionForeground = #fff
 
-[Material_Oceanic_Contrast]ProgressBar.selectionBackground=#ddd
-[Material_Oceanic_Contrast]ProgressBar.selectionForeground=#ddd
+[Material_Oceanic]ProgressBar.selectionBackground = #ddd
+[Material_Oceanic]ProgressBar.selectionForeground = #ddd
 
-[Material_Palenight]ProgressBar.selectionBackground=#ddd
-[Material_Palenight]ProgressBar.selectionForeground=#ddd
+[Material_Oceanic_Contrast]ProgressBar.selectionBackground = #ddd
+[Material_Oceanic_Contrast]ProgressBar.selectionForeground = #ddd
 
-[Material_Palenight_Contrast]ProgressBar.selectionBackground=#ddd
-[Material_Palenight_Contrast]ProgressBar.selectionForeground=#ddd
+[Material_Palenight]ProgressBar.selectionBackground = #ddd
+[Material_Palenight]ProgressBar.selectionForeground = #ddd
 
-[Night_Owl]ProgressBar.selectionBackground=#ddd
-[Night_Owl]ProgressBar.selectionForeground=#ddd
+[Material_Palenight_Contrast]ProgressBar.selectionBackground = #ddd
+[Material_Palenight_Contrast]ProgressBar.selectionForeground = #ddd
 
-[Night_Owl_Contrast]ProgressBar.selectionBackground=#ddd
-[Night_Owl_Contrast]ProgressBar.selectionForeground=#ddd
+[Night_Owl]ProgressBar.selectionBackground = #ddd
+[Night_Owl]ProgressBar.selectionForeground = #ddd
 
-[Solarized_Dark]ProgressBar.selectionBackground=#ccc
-[Solarized_Dark]ProgressBar.selectionForeground=#ccc
+[Night_Owl_Contrast]ProgressBar.selectionBackground = #ddd
+[Night_Owl_Contrast]ProgressBar.selectionForeground = #ddd
 
-[Material_Solarized_Dark_Contrast]ProgressBar.selectionBackground=#ccc
-[Material_Solarized_Dark_Contrast]ProgressBar.selectionForeground=#ccc
+[Solarized_Dark]ProgressBar.selectionBackground = #ccc
+[Solarized_Dark]ProgressBar.selectionForeground = #ccc
 
-[Solarized_Light]ProgressBar.selectionBackground=#222
-[Solarized_Light]ProgressBar.selectionForeground=#fff
+[Material_Solarized_Dark_Contrast]ProgressBar.selectionBackground = #ccc
+[Material_Solarized_Dark_Contrast]ProgressBar.selectionForeground = #ccc
 
-[Material_Solarized_Light_Contrast]ProgressBar.selectionBackground=#222
-[Material_Solarized_Light_Contrast]ProgressBar.selectionForeground=#fff
+[Solarized_Light]ProgressBar.selectionBackground = #222
+[Solarized_Light]ProgressBar.selectionForeground = #fff
+
+[Material_Solarized_Light_Contrast]ProgressBar.selectionBackground = #222
+[Material_Solarized_Light_Contrast]ProgressBar.selectionForeground = #fff

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

@@ -15,34 +15,51 @@
 #---- FileChooser ----
 
 #fields
-FileChooser.lookInLabel.textAndMnemonic=Look &In:
-FileChooser.saveInLabelText=Save In:
-FileChooser.fileNameLabel.textAndMnemonic=File &Name:
-FileChooser.folderNameLabel.textAndMnemonic=Folder &name:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Files of &Type:
+FileChooser.lookInLabel.textAndMnemonic = Look &In:
+FileChooser.saveInLabelText = Save In:
+FileChooser.fileNameLabel.textAndMnemonic = File &Name:
+FileChooser.folderNameLabel.textAndMnemonic = Folder &name:
+FileChooser.filesOfTypeLabel.textAndMnemonic = Files of &Type:
 
 # toolbar
-FileChooser.upFolderToolTipText=Up One Level
-FileChooser.upFolderAccessibleName=Up
-FileChooser.homeFolderToolTipText=Home
-FileChooser.homeFolderAccessibleName=Home
-FileChooser.newFolderToolTipText=Create New Folder
-FileChooser.newFolderAccessibleName=New Folder
-FileChooser.listViewButtonToolTipText=List
-FileChooser.listViewButtonAccessibleName=List
-FileChooser.detailsViewButtonToolTipText=Details
-FileChooser.detailsViewButtonAccessibleName=Details
+FileChooser.upFolderToolTipText = Up One Level
+FileChooser.upFolderAccessibleName = Up
+FileChooser.homeFolderToolTipText = Home
+FileChooser.homeFolderAccessibleName = Home
+FileChooser.newFolderToolTipText = Create New Folder
+FileChooser.newFolderAccessibleName = New Folder
+FileChooser.listViewButtonToolTipText = List
+FileChooser.listViewButtonAccessibleName = List
+FileChooser.detailsViewButtonToolTipText = Details
+FileChooser.detailsViewButtonAccessibleName = Details
 
 # details table header
-FileChooser.fileNameHeaderText=Name
-FileChooser.fileSizeHeaderText=Size
-FileChooser.fileTypeHeaderText=Type
-FileChooser.fileDateHeaderText=Modified
-FileChooser.fileAttrHeaderText=Attributes
+FileChooser.fileNameHeaderText = Name
+FileChooser.fileSizeHeaderText = Size
+FileChooser.fileTypeHeaderText = Type
+FileChooser.fileDateHeaderText = Modified
+FileChooser.fileAttrHeaderText = Attributes
 
 # popup menu
-FileChooser.viewMenuLabelText=View
-FileChooser.refreshActionLabelText=Refresh
-FileChooser.newFolderActionLabelText=New Folder
-FileChooser.listViewActionLabelText=List
-FileChooser.detailsViewActionLabelText=Details
+FileChooser.viewMenuLabelText = View
+FileChooser.refreshActionLabelText = Refresh
+FileChooser.newFolderActionLabelText = New Folder
+FileChooser.listViewActionLabelText = List
+FileChooser.detailsViewActionLabelText = Details
+
+
+#---- SplitPaneDivider ----
+
+SplitPaneDivider.collapseLeftToolTipText = Collapse Left Pane
+SplitPaneDivider.collapseRightToolTipText = Collapse Right Pane
+SplitPaneDivider.collapseTopToolTipText = Collapse Top Pane
+SplitPaneDivider.collapseBottomToolTipText = Collapse Bottom Pane
+SplitPaneDivider.expandLeftToolTipText = Expand Left Pane
+SplitPaneDivider.expandRightToolTipText = Expand Right Pane
+SplitPaneDivider.expandTopToolTipText = Expand Top Pane
+SplitPaneDivider.expandBottomToolTipText = Expand Bottom Pane
+
+
+#---- TabbedPane ----
+
+TabbedPane.moreTabsButtonToolTipText = Show Hidden Tabs

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

@@ -15,34 +15,39 @@
 #---- FileChooser ----
 
 #fields
-FileChooser.lookInLabel.textAndMnemonic=Suchen &in:
-FileChooser.saveInLabelText=Speichern in:
-FileChooser.fileNameLabel.textAndMnemonic=&Dateiname:
-FileChooser.folderNameLabel.textAndMnemonic=Ordner&name:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Datei&typ:
+FileChooser.lookInLabel.textAndMnemonic = Suchen &in:
+FileChooser.saveInLabelText = Speichern in:
+FileChooser.fileNameLabel.textAndMnemonic = &Dateiname:
+FileChooser.folderNameLabel.textAndMnemonic = Ordner&name:
+FileChooser.filesOfTypeLabel.textAndMnemonic = Datei&typ:
 
 # toolbar
-FileChooser.upFolderToolTipText=Eine Ebene h\u00F6her
-FileChooser.upFolderAccessibleName=Nach oben
-FileChooser.homeFolderToolTipText=Home
-FileChooser.homeFolderAccessibleName=Home
-FileChooser.newFolderToolTipText=Neuen Ordner erstellen
-FileChooser.newFolderAccessibleName=Neuer Ordner
-FileChooser.listViewButtonToolTipText=Liste
-FileChooser.listViewButtonAccessibleName=Liste
-FileChooser.detailsViewButtonToolTipText=Details
-FileChooser.detailsViewButtonAccessibleName=Details
+FileChooser.upFolderToolTipText = Eine Ebene h\u00F6her
+FileChooser.upFolderAccessibleName = Nach oben
+FileChooser.homeFolderToolTipText = Home
+FileChooser.homeFolderAccessibleName = Home
+FileChooser.newFolderToolTipText = Neuen Ordner erstellen
+FileChooser.newFolderAccessibleName = Neuer Ordner
+FileChooser.listViewButtonToolTipText = Liste
+FileChooser.listViewButtonAccessibleName = Liste
+FileChooser.detailsViewButtonToolTipText = Details
+FileChooser.detailsViewButtonAccessibleName = Details
 
 # details table header
-FileChooser.fileNameHeaderText=Name
-FileChooser.fileSizeHeaderText=Gr\u00F6\u00DFe
-FileChooser.fileTypeHeaderText=Typ
-FileChooser.fileDateHeaderText=\u00C4nderungsdatum
-FileChooser.fileAttrHeaderText=Attribute
+FileChooser.fileNameHeaderText = Name
+FileChooser.fileSizeHeaderText = Gr\u00F6\u00DFe
+FileChooser.fileTypeHeaderText = Typ
+FileChooser.fileDateHeaderText = \u00C4nderungsdatum
+FileChooser.fileAttrHeaderText = Attribute
 
 # popup menu
-FileChooser.viewMenuLabelText=Ansicht
-FileChooser.refreshActionLabelText=Aktualisieren
-FileChooser.newFolderActionLabelText=Neuer Ordner
-FileChooser.listViewActionLabelText=Liste
-FileChooser.detailsViewActionLabelText=Details
+FileChooser.viewMenuLabelText = Ansicht
+FileChooser.refreshActionLabelText = Aktualisieren
+FileChooser.newFolderActionLabelText = Neuer Ordner
+FileChooser.listViewActionLabelText = Liste
+FileChooser.detailsViewActionLabelText = Details
+
+
+#---- TabbedPane ----
+
+TabbedPane.moreTabsButtonToolTipText = Verdeckte Tabs anzeigen

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

@@ -15,34 +15,34 @@
 #---- FileChooser ----
 
 #fields
-FileChooser.lookInLabel.textAndMnemonic=Rechercher &dans:
-FileChooser.saveInLabelText=Enregistrer dans:
-FileChooser.fileNameLabel.textAndMnemonic=&Nom du fichier:
-FileChooser.folderNameLabel.textAndMnemonic=&Nom du dossier:
-FileChooser.filesOfTypeLabel.textAndMnemonic=&Type de fichier:
+FileChooser.lookInLabel.textAndMnemonic = Rechercher &dans:
+FileChooser.saveInLabelText = Enregistrer dans:
+FileChooser.fileNameLabel.textAndMnemonic = &Nom du fichier:
+FileChooser.folderNameLabel.textAndMnemonic = &Nom du dossier:
+FileChooser.filesOfTypeLabel.textAndMnemonic = &Type de fichier:
 
 # toolbar
-FileChooser.upFolderToolTipText=Remonte d'un niveau
-FileChooser.upFolderAccessibleName=Monter
-FileChooser.homeFolderToolTipText=R\u00E9pertoire de base
-FileChooser.homeFolderAccessibleName=R\u00E9pertoire de base
-FileChooser.newFolderToolTipText=Cr\u00E9e un dossier
-FileChooser.newFolderAccessibleName=Nouveau dossier
-FileChooser.listViewButtonToolTipText=Liste
-FileChooser.listViewButtonAccessibleName=Liste
-FileChooser.detailsViewButtonToolTipText=D\u00E9tails
-FileChooser.detailsViewButtonAccessibleName=D\u00E9tails
+FileChooser.upFolderToolTipText = Remonte d'un niveau
+FileChooser.upFolderAccessibleName = Monter
+FileChooser.homeFolderToolTipText = R\u00E9pertoire de base
+FileChooser.homeFolderAccessibleName = R\u00E9pertoire de base
+FileChooser.newFolderToolTipText = Cr\u00E9e un dossier
+FileChooser.newFolderAccessibleName = Nouveau dossier
+FileChooser.listViewButtonToolTipText = Liste
+FileChooser.listViewButtonAccessibleName = Liste
+FileChooser.detailsViewButtonToolTipText = D\u00E9tails
+FileChooser.detailsViewButtonAccessibleName = D\u00E9tails
 
 # details table header
-FileChooser.fileNameHeaderText=Nom
-FileChooser.fileSizeHeaderText=Taille
-FileChooser.fileTypeHeaderText=Type
-FileChooser.fileDateHeaderText=Modifi\u00E9
-FileChooser.fileAttrHeaderText=Attributs
+FileChooser.fileNameHeaderText = Nom
+FileChooser.fileSizeHeaderText = Taille
+FileChooser.fileTypeHeaderText = Type
+FileChooser.fileDateHeaderText = Modifi\u00E9
+FileChooser.fileAttrHeaderText = Attributs
 
 # popup menu
-FileChooser.viewMenuLabelText=Affichage
-FileChooser.refreshActionLabelText=Actualiser
-FileChooser.newFolderActionLabelText=Nouveau dossier
-FileChooser.listViewActionLabelText=Liste
-FileChooser.detailsViewActionLabelText=D\u00E9tails
+FileChooser.viewMenuLabelText = Affichage
+FileChooser.refreshActionLabelText = Actualiser
+FileChooser.newFolderActionLabelText = Nouveau dossier
+FileChooser.listViewActionLabelText = Liste
+FileChooser.detailsViewActionLabelText = D\u00E9tails

flatlaf-demo/DemoLaf.properties

@@ -7,7 +7,7 @@
 
 
 # base theme (light, dark, intellij or darcula)
-@baseTheme=light
+@baseTheme = light
 
 # add you theme defaults here
-@background=#ccc
+@background = #ccc

flatlaf-demo/README.md

@@ -2,3 +2,12 @@ FlatLaf Demo
 ============
 
 This sub-project contains the FlatLaf Demo source code.
+
+
+Download
+--------
+
+[![Download Demo](https://download.formdev.com/flatlaf/images/download-demo.svg)](https://download.formdev.com/flatlaf/flatlaf-demo-latest.jar)
+
+Run demo with `java -jar flatlaf-demo-<version>.jar` (or double-click it).
+Requires Java 8 or newer.

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

@@ -136,6 +136,16 @@ class ControlBar
 		registerSwitchToLookAndFeel( KeyEvent.VK_F12, MetalLookAndFeel.class.getName() );
 		registerSwitchToLookAndFeel( KeyEvent.VK_F11, NimbusLookAndFeel.class.getName() );
 
+		// register Alt+UP and Alt+DOWN to switch to previous/next theme
+		((JComponent)frame.getContentPane()).registerKeyboardAction(
+			e -> frame.themesPanel.selectPreviousTheme(),
+			KeyStroke.getKeyStroke( KeyEvent.VK_UP, KeyEvent.ALT_DOWN_MASK ),
+			JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT );
+		((JComponent)frame.getContentPane()).registerKeyboardAction(
+			e -> frame.themesPanel.selectNextTheme(),
+			KeyStroke.getKeyStroke( KeyEvent.VK_DOWN, KeyEvent.ALT_DOWN_MASK ),
+			JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT );
+
 		// register ESC key to close frame
 		((JComponent)frame.getContentPane()).registerKeyboardAction(
 			e -> {

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

@@ -32,7 +32,7 @@ import com.formdev.flatlaf.demo.intellijthemes.*;
 import com.formdev.flatlaf.extras.FlatAnimatedLafChange;
 import com.formdev.flatlaf.extras.FlatSVGIcon;
 import com.formdev.flatlaf.extras.FlatUIDefaultsInspector;
-import com.formdev.flatlaf.extras.SVGUtils;
+import com.formdev.flatlaf.extras.FlatSVGUtils;
 import com.formdev.flatlaf.ui.JBRCustomDecorations;
 import net.miginfocom.layout.ConstraintParser;
 import net.miginfocom.layout.LC;
@@ -59,7 +59,7 @@ class DemoFrame
 		updateFontMenuItems();
 		controlBar.initialize( this, tabbedPane );
 
-		setIconImages( SVGUtils.createWindowIconImages( "/com/formdev/flatlaf/demo/FlatLaf.svg" ) );
+		setIconImages( FlatSVGUtils.createWindowIconImages( "/com/formdev/flatlaf/demo/FlatLaf.svg" ) );
 
 		if( tabIndex >= 0 && tabIndex < tabbedPane.getTabCount() && tabIndex != tabbedPane.getSelectedIndex() )
 			tabbedPane.setSelectedIndex( tabIndex );
@@ -141,11 +141,16 @@ class DemoFrame
 	private void windowDecorationsChanged() {
 		boolean windowDecorations = windowDecorationsCheckBoxMenuItem.isSelected();
 
+		// change window decoration of demo main frame
 		dispose();
 		setUndecorated( windowDecorations );
 		getRootPane().setWindowDecorationStyle( windowDecorations ? JRootPane.FRAME : JRootPane.NONE );
 		menuBarEmbeddedCheckBoxMenuItem.setEnabled( windowDecorations );
 		setVisible( true );
+
+		// enable/disable window decoration for later created frames/dialogs
+		JFrame.setDefaultLookAndFeelDecorated( windowDecorations );
+		JDialog.setDefaultLookAndFeelDecorated( windowDecorations );
 	}
 
 	private void menuBarEmbeddedChanged() {
@@ -675,11 +680,12 @@ class DemoFrame
 
 			//======== tabbedPane ========
 			{
+				tabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
 				tabbedPane.addChangeListener(e -> selectedTabChanged());
 				tabbedPane.addTab("Basic Components", basicComponentsPanel);
 				tabbedPane.addTab("More Components", moreComponentsPanel);
 				tabbedPane.addTab("Data Components", dataComponentsPanel);
-				tabbedPane.addTab("SplitPane & Tabs", tabsPanel);
+				tabbedPane.addTab("Tabs", tabsPanel);
 				tabbedPane.addTab("Option Pane", optionPanePanel);
 				tabbedPane.addTab("Extras", extrasPanel1);
 			}
@@ -743,6 +749,6 @@ class DemoFrame
 	private JCheckBoxMenuItem animatedLafChangeMenuItem;
 	private JTabbedPane tabbedPane;
 	private ControlBar controlBar;
-	private IJThemesPanel themesPanel;
+	IJThemesPanel themesPanel;
 	// 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.2.0.298" Java: "14" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.2.0.298" Java: "15" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
@@ -64,6 +64,7 @@ new FormModel {
 				name: "contentPanel"
 				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
 					name: "tabbedPane"
+					"tabLayoutPolicy": 1
 					auxiliary() {
 						"JavaCodeGenerator.variableLocal": false
 					}
@@ -86,7 +87,7 @@ new FormModel {
 					add( new FormComponent( "com.formdev.flatlaf.demo.TabsPanel" ) {
 						name: "tabsPanel"
 					}, new FormLayoutConstraints( null ) {
-						"title": "SplitPane & Tabs"
+						"title": "Tabs"
 					} )
 					add( new FormComponent( "com.formdev.flatlaf.demo.OptionPanePanel" ) {
 						name: "optionPanePanel"
@@ -116,6 +117,7 @@ new FormModel {
 				name: "themesPanel"
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": false
+					"JavaCodeGenerator.variableModifiers": 0
 				}
 			}, new FormLayoutConstraints( class java.lang.String ) {
 				"value": "East"

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

@@ -40,6 +40,9 @@ public class FlatLafDemo
 		if( SystemInfo.isMacOS && System.getProperty( "apple.laf.useScreenMenuBar" ) == null )
 			System.setProperty( "apple.laf.useScreenMenuBar", "true" );
 
+		if( FlatLafDemo.screenshotsMode && !SystemInfo.isJava_9_orLater && System.getProperty( "flatlaf.uiScale" ) == null )
+			System.setProperty( "flatlaf.uiScale", "2x" );
+
 		SwingUtilities.invokeLater( () -> {
 			DemoPrefs.init( PREFS_ROOT_PATH );
 
@@ -61,7 +64,7 @@ public class FlatLafDemo
 			DemoFrame frame = new DemoFrame();
 
 			if( FlatLafDemo.screenshotsMode )
-				frame.setPreferredSize( new Dimension( 1280, 620 ) );
+				frame.setPreferredSize( new Dimension( 1660, 840 ) );
 
 			// show frame
 			frame.pack();

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

@@ -101,6 +101,18 @@ class MoreComponentsPanel
 		JButton button8 = new JButton();
 		JToggleButton toggleButton6 = new JToggleButton();
 		JButton button1 = new JButton();
+		JLabel splitPaneLabel = new JLabel();
+		JSplitPane splitPane3 = new JSplitPane();
+		JSplitPane splitPane1 = new JSplitPane();
+		JPanel panel10 = new JPanel();
+		JLabel label1 = new JLabel();
+		JPanel panel11 = new JPanel();
+		JLabel label2 = new JLabel();
+		JSplitPane splitPane2 = new JSplitPane();
+		JPanel panel12 = new JPanel();
+		JLabel label5 = new JLabel();
+		JPanel panel13 = new JPanel();
+		JLabel label6 = new JLabel();
 
 		//======== this ========
 		setLayout(new MigLayout(
@@ -122,7 +134,8 @@ class MoreComponentsPanel
 			"[]" +
 			"[]" +
 			"[]" +
-			"[]"));
+			"[]" +
+			"[100,top]"));
 
 		//---- scrollPaneLabel ----
 		scrollPaneLabel.setText("JScrollPane:");
@@ -386,6 +399,81 @@ class MoreComponentsPanel
 			toolBar1.add(button1);
 		}
 		add(toolBar1, "cell 1 10 3 1,growx");
+
+		//---- splitPaneLabel ----
+		splitPaneLabel.setText("JSplitPane:");
+		add(splitPaneLabel, "cell 0 11");
+
+		//======== splitPane3 ========
+		{
+			splitPane3.setResizeWeight(0.5);
+
+			//======== splitPane1 ========
+			{
+				splitPane1.setResizeWeight(0.5);
+
+				//======== panel10 ========
+				{
+					panel10.setBackground(new Color(217, 163, 67));
+					panel10.setLayout(new BorderLayout());
+
+					//---- label1 ----
+					label1.setText("LEFT");
+					label1.setHorizontalAlignment(SwingConstants.CENTER);
+					label1.setForeground(Color.white);
+					panel10.add(label1, BorderLayout.CENTER);
+				}
+				splitPane1.setLeftComponent(panel10);
+
+				//======== panel11 ========
+				{
+					panel11.setBackground(new Color(98, 181, 67));
+					panel11.setLayout(new BorderLayout());
+
+					//---- label2 ----
+					label2.setText("RIGHT");
+					label2.setHorizontalAlignment(SwingConstants.CENTER);
+					label2.setForeground(Color.white);
+					panel11.add(label2, BorderLayout.CENTER);
+				}
+				splitPane1.setRightComponent(panel11);
+			}
+			splitPane3.setLeftComponent(splitPane1);
+
+			//======== splitPane2 ========
+			{
+				splitPane2.setOrientation(JSplitPane.VERTICAL_SPLIT);
+				splitPane2.setResizeWeight(0.5);
+
+				//======== panel12 ========
+				{
+					panel12.setBackground(new Color(242, 101, 34));
+					panel12.setLayout(new BorderLayout());
+
+					//---- label5 ----
+					label5.setText("TOP");
+					label5.setHorizontalAlignment(SwingConstants.CENTER);
+					label5.setForeground(Color.white);
+					panel12.add(label5, BorderLayout.CENTER);
+				}
+				splitPane2.setTopComponent(panel12);
+
+				//======== panel13 ========
+				{
+					panel13.setBackground(new Color(64, 182, 224));
+					panel13.setLayout(new BorderLayout());
+
+					//---- label6 ----
+					label6.setText("BOTTOM");
+					label6.setHorizontalAlignment(SwingConstants.CENTER);
+					label6.setForeground(Color.white);
+					panel13.add(label6, BorderLayout.CENTER);
+				}
+				splitPane2.setBottomComponent(panel13);
+			}
+			splitPane3.setRightComponent(splitPane2);
+		}
+		add(splitPane3, "cell 1 11 4 1,grow");
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents
 
 		if( FlatLafDemo.screenshotsMode ) {
@@ -393,6 +481,7 @@ class MoreComponentsPanel
 				indeterminateCheckBox,
 				toolTipLabel, toolTip1, toolTip2,
 				toolBarLabel, toolBar1, toolBar2,
+				splitPaneLabel, splitPane3,
 			};
 
 			for( Component c : components )

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

@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.2.0.298" Java: "14" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.2.0.298" Java: "15" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
@@ -9,7 +9,7 @@ new FormModel {
 		add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 			"$layoutConstraints": "insets dialog,hidemode 3"
 			"$columnConstraints": "[][][][][]"
-			"$rowConstraints": "[][][][][][][][][][][]"
+			"$rowConstraints": "[][][][][][][][][][][][100,top]"
 		} ) {
 			name: "this"
 			add( new FormComponent( "javax.swing.JLabel" ) {
@@ -358,9 +358,90 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 10 3 1,growx"
 			} )
+			add( new FormComponent( "javax.swing.JLabel" ) {
+				name: "splitPaneLabel"
+				"text": "JSplitPane:"
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 0 11"
+			} )
+			add( new FormContainer( "javax.swing.JSplitPane", new FormLayoutManager( class javax.swing.JSplitPane ) ) {
+				name: "splitPane3"
+				"resizeWeight": 0.5
+				add( new FormContainer( "javax.swing.JSplitPane", new FormLayoutManager( class javax.swing.JSplitPane ) ) {
+					name: "splitPane1"
+					"resizeWeight": 0.5
+					add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+						name: "panel10"
+						"background": new java.awt.Color( 217, 163, 67, 255 )
+						add( new FormComponent( "javax.swing.JLabel" ) {
+							name: "label1"
+							"text": "LEFT"
+							"horizontalAlignment": 0
+							"foreground": sfield java.awt.Color white
+						}, new FormLayoutConstraints( class java.lang.String ) {
+							"value": "Center"
+						} )
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "left"
+					} )
+					add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+						name: "panel11"
+						"background": new java.awt.Color( 98, 181, 67, 255 )
+						add( new FormComponent( "javax.swing.JLabel" ) {
+							name: "label2"
+							"text": "RIGHT"
+							"horizontalAlignment": 0
+							"foreground": sfield java.awt.Color white
+						}, new FormLayoutConstraints( class java.lang.String ) {
+							"value": "Center"
+						} )
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "right"
+					} )
+				}, new FormLayoutConstraints( class java.lang.String ) {
+					"value": "left"
+				} )
+				add( new FormContainer( "javax.swing.JSplitPane", new FormLayoutManager( class javax.swing.JSplitPane ) ) {
+					name: "splitPane2"
+					"orientation": 0
+					"resizeWeight": 0.5
+					add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+						name: "panel12"
+						"background": new java.awt.Color( 242, 101, 34, 255 )
+						add( new FormComponent( "javax.swing.JLabel" ) {
+							name: "label5"
+							"text": "TOP"
+							"horizontalAlignment": 0
+							"foreground": sfield java.awt.Color white
+						}, new FormLayoutConstraints( class java.lang.String ) {
+							"value": "Center"
+						} )
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "left"
+					} )
+					add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+						name: "panel13"
+						"background": new java.awt.Color( 64, 182, 224, 255 )
+						add( new FormComponent( "javax.swing.JLabel" ) {
+							name: "label6"
+							"text": "BOTTOM"
+							"horizontalAlignment": 0
+							"foreground": sfield java.awt.Color white
+						}, new FormLayoutConstraints( class java.lang.String ) {
+							"value": "Center"
+						} )
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "right"
+					} )
+				}, new FormLayoutConstraints( class java.lang.String ) {
+					"value": "right"
+				} )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 11 4 1,grow"
+			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new java.awt.Point( 0, 0 )
-			"size": new java.awt.Dimension( 700, 420 )
+			"size": new java.awt.Dimension( 700, 550 )
 		} )
 	}
 }

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

@@ -44,10 +44,12 @@ class NewDialog
 	}
 
 	private void okActionPerformed() {
+		System.out.println( "ok" );
 		dispose();
 	}
 
 	private void cancelActionPerformed() {
+		System.out.println( "cancel" );
 		dispose();
 	}
 

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

@@ -3,213 +3,604 @@ JFDML JFormDesigner: "7.0.2.0.298" Java: "15" encoding: "UTF-8"
 new FormModel {
 	contentType: "form/swing"
 	root: new FormRoot {
-		auxiliary() {
-			"JavaCodeGenerator.defaultVariableLocal": true
-		}
+		"$setComponentNames": true
 		add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 			"$layoutConstraints": "insets dialog,hidemode 3"
-			"$columnConstraints": "[grow,fill]"
-			"$rowConstraints": "[grow,fill]"
+			"$columnConstraints": "[grow,fill]para[fill]para[fill]"
+			"$rowConstraints": "[grow,fill]para[][]"
 		} ) {
 			name: "this"
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class com.jgoodies.forms.layout.FormLayout ) {
-				"$columnSpecs": "70dlu:grow, unrelgap, 70dlu:grow"
-				"$rowSpecs": "default, linegap, fill:70dlu, pargap, pref, linegap, fill:80dlu:grow, unrelgap, fill:80dlu:grow, unrelgap, pref"
+			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
+				"$layoutConstraints": "insets 0,hidemode 3"
+				"$columnConstraints": "[grow,fill]"
+				"$rowConstraints": "[][fill]para[]0[][]para[][]para[][]"
 			} ) {
-				name: "panel9"
+				name: "panel1"
+				auxiliary() {
+					"JavaCodeGenerator.variableLocal": true
+				}
 				add( new FormComponent( "javax.swing.JLabel" ) {
-					name: "splitPaneLabel"
-					"text": "JSplitPane:"
-				}, new FormLayoutConstraints( class com.jgoodies.forms.layout.CellConstraints ) )
-				add( new FormContainer( "javax.swing.JSplitPane", new FormLayoutManager( class javax.swing.JSplitPane ) ) {
-					name: "splitPane3"
-					"resizeWeight": 0.5
-					add( new FormContainer( "javax.swing.JSplitPane", new FormLayoutManager( class javax.swing.JSplitPane ) ) {
-						name: "splitPane1"
-						"resizeWeight": 0.5
-						add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-							name: "panel10"
-							"background": new java.awt.Color( 217, 163, 67, 255 )
-							add( new FormComponent( "javax.swing.JLabel" ) {
-								name: "label1"
-								"text": "LEFT"
-								"horizontalAlignment": 0
-								"foreground": sfield java.awt.Color white
-							}, new FormLayoutConstraints( class java.lang.String ) {
-								"value": "Center"
-							} )
-						}, new FormLayoutConstraints( class java.lang.String ) {
-							"value": "left"
-						} )
-						add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-							name: "panel11"
-							"background": new java.awt.Color( 98, 181, 67, 255 )
-							add( new FormComponent( "javax.swing.JLabel" ) {
-								name: "label2"
-								"text": "RIGHT"
-								"horizontalAlignment": 0
-								"foreground": sfield java.awt.Color white
-							}, new FormLayoutConstraints( class java.lang.String ) {
-								"value": "Center"
-							} )
-						}, new FormLayoutConstraints( class java.lang.String ) {
-							"value": "right"
-						} )
-					}, new FormLayoutConstraints( class java.lang.String ) {
-						"value": "left"
+					name: "tabPlacementLabel"
+					"text": "Tab placement"
+					"font": new com.jformdesigner.model.SwingDerivedFont( null, 0, 4, false )
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": true
+					}
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 0"
+				} )
+				add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
+					name: "tabPlacementToolBar"
+					"floatable": false
+					"border": new javax.swing.border.EmptyBorder( 0, 0, 0, 0 )
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "topPlacementButton"
+						"text": "top"
+						"selected": true
+						"$buttonGroup": new FormReference( "tabPlacementButtonGroup" )
+						"font": &SwingDerivedFont0 new com.jformdesigner.model.SwingDerivedFont( null, 0, -2, false )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "tabPlacementChanged", false ) )
 					} )
-					add( new FormContainer( "javax.swing.JSplitPane", new FormLayoutManager( class javax.swing.JSplitPane ) ) {
-						name: "splitPane2"
-						"orientation": 0
-						"resizeWeight": 0.5
-						add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-							name: "panel12"
-							"background": new java.awt.Color( 242, 101, 34, 255 )
-							add( new FormComponent( "javax.swing.JLabel" ) {
-								name: "label3"
-								"text": "TOP"
-								"horizontalAlignment": 0
-								"foreground": sfield java.awt.Color white
-							}, new FormLayoutConstraints( class java.lang.String ) {
-								"value": "Center"
-							} )
-						}, new FormLayoutConstraints( class java.lang.String ) {
-							"value": "left"
-						} )
-						add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-							name: "panel13"
-							"background": new java.awt.Color( 64, 182, 224, 255 )
-							add( new FormComponent( "javax.swing.JLabel" ) {
-								name: "label4"
-								"text": "BOTTOM"
-								"horizontalAlignment": 0
-								"foreground": sfield java.awt.Color white
-							}, new FormLayoutConstraints( class java.lang.String ) {
-								"value": "Center"
-							} )
-						}, new FormLayoutConstraints( class java.lang.String ) {
-							"value": "right"
-						} )
-					}, new FormLayoutConstraints( class java.lang.String ) {
-						"value": "right"
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "bottomPlacementButton"
+						"text": "bottom"
+						"$buttonGroup": new FormReference( "tabPlacementButtonGroup" )
+						"font": #SwingDerivedFont0
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "tabPlacementChanged", false ) )
 					} )
-				}, new FormLayoutConstraints( class com.jgoodies.forms.layout.CellConstraints ) {
-					"gridY": 3
-					"gridWidth": 3
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "leftPlacementButton"
+						"text": "left"
+						"$buttonGroup": new FormReference( "tabPlacementButtonGroup" )
+						"font": #SwingDerivedFont0
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "tabPlacementChanged", false ) )
+					} )
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "rightPlacementButton"
+						"text": "right"
+						"$buttonGroup": new FormReference( "tabPlacementButtonGroup" )
+						"font": #SwingDerivedFont0
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "tabPlacementChanged", false ) )
+					} )
+					add( new FormComponent( "javax.swing.JToolBar$Separator" ) {
+						name: "separator1"
+					} )
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "scrollButton"
+						"text": "scroll"
+						"font": new com.jformdesigner.model.SwingDerivedFont( null, 0, -2, false )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "scrollChanged", false ) )
+					} )
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "borderButton"
+						"text": "border"
+						"font": new com.jformdesigner.model.SwingDerivedFont( null, 0, -2, false )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "borderChanged", false ) )
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 0,alignx right,growx 0"
+				} )
+				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+					name: "tabPlacementTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 1,width 300:300,height 100:100"
 				} )
 				add( new FormComponent( "javax.swing.JLabel" ) {
-					name: "tabbedPaneLabel"
-					"text": "JTabbedPane:"
-				}, new FormLayoutConstraints( class com.jgoodies.forms.layout.CellConstraints ) {
-					"gridX": 1
-					"gridY": 5
+					name: "tabLayoutLabel"
+					"text": "Tab layout"
+					"font": &SwingDerivedFont1 new com.jformdesigner.model.SwingDerivedFont( null, 0, 4, false )
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": true
+					}
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 2"
+				} )
+				add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
+					name: "tabLayoutToolBar"
+					"floatable": false
+					"border": &EmptyBorder0 new javax.swing.border.EmptyBorder( 0, 0, 0, 0 )
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "scrollTabLayoutButton"
+						"text": "scroll"
+						"$buttonGroup": new FormReference( "tabLayoutButtonGroup" )
+						"font": &SwingDerivedFont2 new com.jformdesigner.model.SwingDerivedFont( null, 0, -2, false )
+						"selected": true
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "tabLayoutChanged", false ) )
+					} )
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "wrapTabLayoutButton"
+						"text": "wrap"
+						"$buttonGroup": new FormReference( "tabLayoutButtonGroup" )
+						"font": #SwingDerivedFont2
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "tabLayoutChanged", false ) )
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 2,alignx right,growx 0"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "scrollLayoutNoteLabel"
+					"text": "(use mouse wheel to scroll; arrow button shows hidden tabs)"
+					"enabled": false
+					"font": &SwingDerivedFont3 new com.jformdesigner.model.SwingDerivedFont( null, 0, -2, false )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 3"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "wrapLayoutNoteLabel"
+					"text": "(probably better to use scroll layout?)"
+					"enabled": false
+					"font": #SwingDerivedFont3
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 3"
 				} )
 				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
-					name: "tabbedPane1"
-					auxiliary() {
-						"JavaCodeGenerator.variableLocal": false
-					}
-				}, new FormLayoutConstraints( class com.jgoodies.forms.layout.CellConstraints ) {
-					"gridX": 1
-					"gridY": 7
+					name: "scrollLayoutTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 4"
 				} )
 				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
-					name: "tabbedPane3"
-					"tabPlacement": 2
+					name: "wrapLayoutTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 4,width 100:100,height pref*2px"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "closableTabsLabel"
+					"text": "Closable tabs"
+					"font": #SwingDerivedFont1
 					auxiliary() {
-						"JavaCodeGenerator.variableLocal": false
+						"JavaCodeGenerator.variableLocal": true
 					}
-				}, new FormLayoutConstraints( class com.jgoodies.forms.layout.CellConstraints ) {
-					"gridX": 3
-					"gridY": 7
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 5"
+				} )
+				add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
+					name: "closableTabsToolBar"
+					"floatable": false
+					"border": new javax.swing.border.EmptyBorder( 0, 0, 0, 0 )
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "squareCloseButton"
+						"text": "square"
+						"font": &SwingDerivedFont4 new com.jformdesigner.model.SwingDerivedFont( null, 0, -2, false )
+						"$buttonGroup": new FormReference( "closableTabsButtonGroup" )
+						"selected": true
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "closeButtonStyleChanged", false ) )
+					} )
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "circleCloseButton"
+						"text": "circle"
+						"font": #SwingDerivedFont4
+						"$buttonGroup": new FormReference( "closableTabsButtonGroup" )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "closeButtonStyleChanged", false ) )
+					} )
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "redCrossCloseButton"
+						"text": "red cross"
+						"font": #SwingDerivedFont4
+						"$buttonGroup": new FormReference( "closableTabsButtonGroup" )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "closeButtonStyleChanged", false ) )
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 5,alignx right,growx 0"
 				} )
 				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
-					name: "tabbedPane2"
-					"tabPlacement": 3
+					name: "closableTabsTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 6"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "tabAreaComponentsLabel"
+					"text": "Custom tab area components"
+					"font": #SwingDerivedFont1
 					auxiliary() {
-						"JavaCodeGenerator.variableLocal": false
+						"JavaCodeGenerator.variableLocal": true
 					}
-				}, new FormLayoutConstraints( class com.jgoodies.forms.layout.CellConstraints ) {
-					"gridY": 9
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 7"
+				} )
+				add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
+					name: "tabAreaComponentsToolBar"
+					"floatable": false
+					"border": new javax.swing.border.EmptyBorder( 0, 0, 0, 0 )
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "leadingComponentButton"
+						"text": "leading"
+						"font": &SwingDerivedFont5 new com.jformdesigner.model.SwingDerivedFont( null, 0, -2, false )
+						"selected": true
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "customComponentsChanged", false ) )
+					} )
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "trailingComponentButton"
+						"text": "trailing"
+						"font": #SwingDerivedFont5
+						"selected": true
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "customComponentsChanged", false ) )
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 7,alignx right,growx 0"
 				} )
 				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
-					name: "tabbedPane4"
-					"tabPlacement": 4
-					auxiliary() {
-						"JavaCodeGenerator.variableLocal": false
-					}
-				}, new FormLayoutConstraints( class com.jgoodies.forms.layout.CellConstraints ) {
-					"gridX": 3
-					"gridY": 9
-				} )
-				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
-					"$layoutConstraints": "insets 0,hidemode 3"
-					"$columnConstraints": "[][][][fill][]"
-					"$rowConstraints": "[center]"
-				} ) {
-					name: "panel14"
-					add( new FormComponent( "javax.swing.JCheckBox" ) {
-						name: "moreTabsCheckBox"
-						"text": "More tabs"
-						"mnemonic": 77
-						auxiliary() {
-							"JavaCodeGenerator.variableLocal": false
-						}
-						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "moreTabsChanged", false ) )
-					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-						"value": "cell 0 0"
-					} )
-					add( new FormComponent( "javax.swing.JCheckBox" ) {
-						name: "tabScrollCheckBox"
-						"text": "Use scroll layout"
-						"mnemonic": 83
-						auxiliary() {
-							"JavaCodeGenerator.variableLocal": false
-						}
-						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "tabScrollChanged", false ) )
-					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-						"value": "cell 1 0,alignx left,growx 0"
-					} )
-					add( new FormComponent( "javax.swing.JCheckBox" ) {
-						name: "showTabSeparatorsCheckBox"
-						"text": "Show tab separators"
-						auxiliary() {
-							"JavaCodeGenerator.variableLocal": false
-						}
-						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "showTabSeparatorsChanged", false ) )
-					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-						"value": "cell 2 0"
-					} )
-					add( new FormComponent( "javax.swing.JCheckBox" ) {
-						name: "hideContentSeparatorCheckBox"
-						"text": "Hide content separator"
-						auxiliary() {
-							"JavaCodeGenerator.variableLocal": false
-						}
-						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "hideContentSeparatorChanged", false ) )
-					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-						"value": "cell 3 0"
-					} )
-					add( new FormComponent( "javax.swing.JCheckBox" ) {
-						name: "hasFullBorderCheckBox"
-						"text": "Show content border"
-						auxiliary() {
-							"JavaCodeGenerator.variableLocal": false
-						}
-						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "hasFullBorderChanged", false ) )
-					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-						"value": "cell 4 0,alignx left,growx 0"
-					} )
-				}, new FormLayoutConstraints( class com.jgoodies.forms.layout.CellConstraints ) {
-					"gridY": 11
-					"gridWidth": 3
+					name: "customComponentsTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 8"
 				} )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 0"
 			} )
+			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
+				"$layoutConstraints": "insets 0,hidemode 3"
+				"$columnConstraints": "[grow,fill]"
+				"$rowConstraints": "[]0[][fill][center][center][center]para[center]0[][center][center][center][]"
+			} ) {
+				name: "panel2"
+				auxiliary() {
+					"JavaCodeGenerator.variableLocal": true
+				}
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "tabIconPlacementLabel"
+					"text": "Tab icon placement"
+					"font": new com.jformdesigner.model.SwingDerivedFont( null, 0, 4, false )
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": true
+					}
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 0"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "tabIconPlacementNodeLabel"
+					"text": "(top/bottom/leading/trailing)"
+					"enabled": false
+					"font": new com.jformdesigner.model.SwingDerivedFont( null, 0, -2, false )
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": true
+					}
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 1"
+				} )
+				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+					name: "iconTopTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 2"
+				} )
+				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+					name: "iconBottomTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 3"
+				} )
+				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+					name: "iconLeadingTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 4"
+				} )
+				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+					name: "iconTrailingTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 5"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "tabAreaAlignmentLabel"
+					"text": "Tab area alignment"
+					"font": &SwingDerivedFont6 new com.jformdesigner.model.SwingDerivedFont( null, 0, 4, false )
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": true
+					}
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 6"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "tabAreaAlignmentNoteLabel"
+					"text": "(leading/center/trailing/fill)"
+					"enabled": false
+					"font": &SwingDerivedFont7 new com.jformdesigner.model.SwingDerivedFont( null, 0, -2, false )
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": true
+					}
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 7"
+				} )
+				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+					name: "alignLeadingTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 8"
+				} )
+				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+					name: "alignCenterTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 9"
+				} )
+				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+					name: "alignTrailingTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 10"
+				} )
+				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+					name: "alignFillTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 11"
+				} )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 0,growy"
+			} )
+			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
+				"$layoutConstraints": "insets 0,hidemode 3"
+				"$columnConstraints": "[grow,fill]"
+				"$rowConstraints": "[]0[][][][]para[][][]para[]0[]"
+			} ) {
+				name: "panel3"
+				auxiliary() {
+					"JavaCodeGenerator.variableLocal": true
+				}
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "tabWidthModeLabel"
+					"text": "Tab width mode"
+					"font": #SwingDerivedFont6
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": true
+					}
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 0"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "tabWidthModeNoteLabel"
+					"text": "(preferred/equal/compact)"
+					"font": new com.jformdesigner.model.SwingDerivedFont( null, 0, -2, false )
+					"enabled": false
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": true
+					}
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 1"
+				} )
+				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+					name: "widthPreferredTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 2"
+				} )
+				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+					name: "widthEqualTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 3"
+				} )
+				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+					name: "widthCompactTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 4"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "minMaxTabWidthLabel"
+					"text": "Minimum/maximum tab width"
+					"font": new com.jformdesigner.model.SwingDerivedFont( null, 0, 4, false )
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": true
+					}
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 5"
+				} )
+				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+					name: "minimumTabWidthTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 6"
+				} )
+				add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+					name: "maximumTabWidthTabbedPane"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 7"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "tabAlignmentLabel"
+					"text": "Tab title alignment"
+					"font": #SwingDerivedFont6
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": true
+					}
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 8"
+				} )
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
+					"$columnConstraints": "[grow,fill]para[fill]"
+					"$rowConstraints": "[][][][]"
+					"$layoutConstraints": "insets 0,hidemode 3"
+				} ) {
+					name: "panel5"
+					add( new FormComponent( "javax.swing.JLabel" ) {
+						name: "tabAlignmentNoteLabel"
+						"text": "(leading/center/trailing)"
+						"enabled": false
+						"font": #SwingDerivedFont7
+						auxiliary() {
+							"JavaCodeGenerator.variableLocal": true
+						}
+					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+						"value": "cell 0 0"
+					} )
+					add( new FormComponent( "javax.swing.JLabel" ) {
+						name: "tabAlignmentNoteLabel2"
+						"text": "(trailing)"
+						"enabled": false
+						"font": #SwingDerivedFont7
+						auxiliary() {
+							"JavaCodeGenerator.variableLocal": true
+						}
+					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+						"value": "cell 1 0,alignx right,growx 0"
+					} )
+					add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+						name: "tabAlignLeadingTabbedPane"
+					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+						"value": "cell 0 1"
+					} )
+					add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+						name: "tabAlignVerticalTabbedPane"
+						"tabPlacement": 2
+					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+						"value": "cell 1 1 1 3,growy"
+					} )
+					add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+						name: "tabAlignCenterTabbedPane"
+					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+						"value": "cell 0 2"
+					} )
+					add( new FormContainer( "javax.swing.JTabbedPane", new FormLayoutManager( class javax.swing.JTabbedPane ) ) {
+						name: "tabAlignTrailingTabbedPane"
+					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+						"value": "cell 0 3"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 9"
+				} )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 2 0"
+			} )
+			add( new FormComponent( "javax.swing.JSeparator" ) {
+				name: "separator2"
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 0 1 3 1"
+			} )
+			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
+				"$layoutConstraints": "insets 0,hidemode 3"
+				"$columnConstraints": "[][fill]para[fill][fill]para"
+				"$rowConstraints": "[][center]"
+			} ) {
+				name: "panel4"
+				auxiliary() {
+					"JavaCodeGenerator.variableLocal": true
+				}
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "scrollButtonsPolicyLabel"
+					"text": "Scroll buttons policy:"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 0"
+				} )
+				add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
+					name: "scrollButtonsPolicyToolBar"
+					"floatable": false
+					"border": #EmptyBorder0
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "scrollAsNeededSingleButton"
+						"text": "asNeededSingle"
+						"font": #SwingDerivedFont2
+						"selected": true
+						"$buttonGroup": new FormReference( "scrollButtonsPolicyButtonGroup" )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "scrollButtonsPolicyChanged", false ) )
+					} )
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "scrollAsNeededButton"
+						"text": "asNeeded"
+						"font": #SwingDerivedFont2
+						"$buttonGroup": new FormReference( "scrollButtonsPolicyButtonGroup" )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "scrollButtonsPolicyChanged", false ) )
+					} )
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "scrollNeverButton"
+						"text": "never"
+						"font": #SwingDerivedFont2
+						"$buttonGroup": new FormReference( "scrollButtonsPolicyButtonGroup" )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "scrollButtonsPolicyChanged", false ) )
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 0"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "scrollButtonsPlacementLabel"
+					"text": "Scroll buttons placement:"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 0"
+				} )
+				add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
+					name: "scrollButtonsPlacementToolBar"
+					"floatable": false
+					"border": #EmptyBorder0
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "scrollBothButton"
+						"text": "both"
+						"font": #SwingDerivedFont2
+						"selected": true
+						"$buttonGroup": new FormReference( "scrollButtonsPlacementButtonGroup" )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "scrollButtonsPlacementChanged", false ) )
+					} )
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "scrollTrailingButton"
+						"text": "trailing"
+						"font": #SwingDerivedFont2
+						"$buttonGroup": new FormReference( "scrollButtonsPlacementButtonGroup" )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "scrollButtonsPlacementChanged", false ) )
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 3 0"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "tabsPopupPolicyLabel"
+					"text": "Tabs popup policy:"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 1"
+				} )
+				add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
+					name: "tabsPopupPolicyToolBar"
+					"floatable": false
+					"border": #EmptyBorder0
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "popupAsNeededButton"
+						"text": "asNeeded"
+						"font": #SwingDerivedFont2
+						"selected": true
+						"$buttonGroup": new FormReference( "tabsPopupPolicyButtonGroup" )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "tabsPopupPolicyChanged", false ) )
+					} )
+					add( new FormComponent( "javax.swing.JToggleButton" ) {
+						name: "popupNeverButton"
+						"text": "never"
+						"font": #SwingDerivedFont2
+						"$buttonGroup": new FormReference( "tabsPopupPolicyButtonGroup" )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "tabsPopupPolicyChanged", false ) )
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 1"
+				} )
+				add( new FormComponent( "javax.swing.JCheckBox" ) {
+					name: "showTabSeparatorsCheckBox"
+					"text": "Show tab separators"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "showTabSeparatorsChanged", false ) )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 1 2 1"
+				} )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 0 2 3 1"
+			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new java.awt.Point( 0, 0 )
-			"size": new java.awt.Dimension( 700, 515 )
+			"size": new java.awt.Dimension( 1075, 895 )
+		} )
+		add( new FormNonVisual( "javax.swing.ButtonGroup" ) {
+			name: "tabPlacementButtonGroup"
+		}, new FormLayoutConstraints( null ) {
+			"location": new java.awt.Point( 5, 915 )
+		} )
+		add( new FormNonVisual( "javax.swing.ButtonGroup" ) {
+			name: "closableTabsButtonGroup"
+		}, new FormLayoutConstraints( null ) {
+			"location": new java.awt.Point( 5, 970 )
+		} )
+		add( new FormNonVisual( "javax.swing.ButtonGroup" ) {
+			name: "tabLayoutButtonGroup"
+		}, new FormLayoutConstraints( null ) {
+			"location": new java.awt.Point( 5, 1020 )
+		} )
+		add( new FormNonVisual( "javax.swing.ButtonGroup" ) {
+			name: "tabsPopupPolicyButtonGroup"
+		}, new FormLayoutConstraints( null ) {
+			"location": new java.awt.Point( 200, 915 )
+		} )
+		add( new FormNonVisual( "javax.swing.ButtonGroup" ) {
+			name: "scrollButtonsPolicyButtonGroup"
+		}, new FormLayoutConstraints( null ) {
+			"location": new java.awt.Point( 200, 965 )
+		} )
+		add( new FormNonVisual( "javax.swing.ButtonGroup" ) {
+			name: "scrollButtonsPlacementButtonGroup"
+		}, new FormLayoutConstraints( null ) {
+			"location": new java.awt.Point( 200, 1020 )
 		} )
 	}
 }

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/extras/ExtrasPanel.java

@@ -18,6 +18,7 @@ package com.formdev.flatlaf.demo.extras;
 
 import javax.swing.*;
 import com.formdev.flatlaf.extras.*;
+import com.formdev.flatlaf.extras.components.FlatTriStateCheckBox;
 import net.miginfocom.swing.*;
 
 /**
@@ -63,7 +64,7 @@ public class ExtrasPanel
 		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
 		label4 = new JLabel();
 		label1 = new JLabel();
-		triStateCheckBox1 = new TriStateCheckBox();
+		triStateCheckBox1 = new FlatTriStateCheckBox();
 		triStateLabel1 = new JLabel();
 		label2 = new JLabel();
 		svgIconsPanel = new JPanel();
@@ -124,7 +125,7 @@ public class ExtrasPanel
 	// JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
 	private JLabel label4;
 	private JLabel label1;
-	private TriStateCheckBox triStateCheckBox1;
+	private FlatTriStateCheckBox triStateCheckBox1;
 	private JLabel triStateLabel1;
 	private JLabel label2;
 	private JPanel svgIconsPanel;

flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/extras/ExtrasPanel.jfd

@@ -21,7 +21,7 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 1"
 			} )
-			add( new FormComponent( "com.formdev.flatlaf.extras.TriStateCheckBox" ) {
+			add( new FormComponent( "com.formdev.flatlaf.extras.components.FlatTriStateCheckBox" ) {
 				name: "triStateCheckBox1"
 				"text": "Three States"
 				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "triStateCheckBox1Changed", false ) )

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

@@ -49,7 +49,9 @@ public class IJThemesClassGenerator
 		}
 
 		Path out = new File( toPath, "FlatAllIJThemes.java" ).toPath();
-		String allThemes = CLASS_HEADER + ALL_THEMES_TEMPLATE.replace( "${allInfos}", allInfos );
+		String allThemes = (CLASS_HEADER + ALL_THEMES_TEMPLATE)
+			.replace( "${subPackage}", "" )
+			.replace( "${allInfos}", allInfos );
 		writeFile( out, allThemes );
 
 		System.out.println( markdownTable );
@@ -69,6 +71,10 @@ public class IJThemesClassGenerator
 		if( nameSep >= 0 )
 			name = name.substring( nameSep + 1 ).trim();
 
+		String themeName = name;
+		if( "material-theme-ui-lite".equals( resourcePath ) )
+			themeName += " (Material)";
+
 		StringBuilder buf = new StringBuilder();
 		for( String n : name.split( " " ) ) {
 			if( n.length() == 0 || n.equals( "-" ) )
@@ -84,10 +90,11 @@ public class IJThemesClassGenerator
 		String themeClass = "Flat" + buf + "IJTheme";
 		String themeFile = resourceName;
 
-		String classBody = CLASS_HEADER + CLASS_TEMPLATE
+		String classBody = (CLASS_HEADER + CLASS_TEMPLATE)
 			.replace( "${subPackage}", subPackage )
 			.replace( "${themeClass}", themeClass )
-			.replace( "${themeFile}", themeFile );
+			.replace( "${themeFile}", themeFile )
+			.replace( "${themeName}", themeName );
 
 		File toDir = new File( toPath );
 		if( resourcePath != null )
@@ -101,10 +108,11 @@ public class IJThemesClassGenerator
 		allInfos.append( THEME_TEMPLATE
 			.replace( "${subPackage}", subPackage )
 			.replace( "${themeClass}", themeClass )
-			.replace( "${themeName}", name ) );
+			.replace( "${themeName}", themeName )
+			.replace( "${dark}", Boolean.toString( ti.dark ) ) );
 
 		markdownTable.append( String.format( "[%s](%s) | `com.formdev.flatlaf.intellijthemes%s.%s`\n",
-			name, ti.sourceCodeUrl, subPackage, themeClass ) );
+			themeName, ti.sourceCodeUrl, subPackage, themeClass ) );
 	}
 
 	private static void writeFile( Path out, String content ) {
@@ -132,11 +140,16 @@ public class IJThemesClassGenerator
 		" * See the License for the specific language governing permissions and\n" +
 		" * limitations under the License.\n" +
 		" */\n" +
+		"\n" +
+		"package com.formdev.flatlaf.intellijthemes${subPackage};\n" +
+		"\n" +
+		"//\n" +
+		"// DO NOT MODIFY\n" +
+		"// Generated with com.formdev.flatlaf.demo.intellijthemes.IJThemesClassGenerator\n" +
+		"//\n" +
 		"\n";
 
 	private static final String CLASS_TEMPLATE =
-		"package com.formdev.flatlaf.intellijthemes${subPackage};\n" +
-		"\n" +
 		"import com.formdev.flatlaf.IntelliJTheme;\n" +
 		"\n" +
 		"/**\n" +
@@ -145,7 +158,9 @@ public class IJThemesClassGenerator
 		"public class ${themeClass}\n" +
 		"	extends IntelliJTheme.ThemeLaf\n" +
 		"{\n" +
-		"	public static boolean install( ) {\n" +
+		"	public static final String NAME = \"${themeName}\";\n" +
+		"\n" +
+		"	public static boolean install() {\n" +
 		"		try {\n" +
 		"			return install( new ${themeClass}() );\n" +
 		"		} catch( RuntimeException ex ) {\n" +
@@ -153,14 +168,21 @@ public class IJThemesClassGenerator
 		"		}\n" +
 		"	}\n" +
 		"\n" +
+		"	public static void installLafInfo() {\n" +
+		"		installLafInfo( NAME, ${themeClass}.class );\n" +
+		"	}\n" +
+		"\n" +
 		"	public ${themeClass}() {\n" +
 		"		super( Utils.loadTheme( \"${themeFile}\" ) );\n" +
 		"	}\n" +
+		"\n" +
+		"	@Override\n" +
+		"	public String getName() {\n" +
+		"		return NAME;\n" +
+		"	}\n" +
 		"}\n";
 
 	private static final String ALL_THEMES_TEMPLATE =
-		"package com.formdev.flatlaf.intellijthemes;\n" +
-		"\n" +
 		"import javax.swing.UIManager.LookAndFeelInfo;\n" +
 		"\n" +
 		"/**\n" +
@@ -168,11 +190,28 @@ public class IJThemesClassGenerator
 		" */\n" +
 		"public class FlatAllIJThemes\n" +
 		"{\n" +
-		"	public static final LookAndFeelInfo[] INFOS = {\n" +
+		"	public static final FlatIJLookAndFeelInfo[] INFOS = {\n" +
 		"${allInfos}\n" +
 		"	};\n" +
+		"\n" +
+		"	//---- class FlatIJLookAndFeelInfo ----------------------------------------\n" +
+		"\n" +
+		"	public static class FlatIJLookAndFeelInfo\n" +
+		"		extends LookAndFeelInfo\n" +
+		"	{\n" +
+		"		private final boolean dark;\n" +
+		"\n" +
+		"		public FlatIJLookAndFeelInfo( String name, String className, boolean dark ) {\n" +
+		"			super( name, className );\n" +
+		"			this.dark = dark;\n" +
+		"		}\n" +
+		"\n" +
+		"		public boolean isDark() {\n" +
+		"			return dark;\n" +
+		"		}\n" +
+		"	}\n" +
 		"}\n";
 
 	private static final String THEME_TEMPLATE =
-		"		new LookAndFeelInfo( \"${themeName}\", \"com.formdev.flatlaf.intellijthemes${subPackage}.${themeClass}\" ),";
+		"		new FlatIJLookAndFeelInfo( \"${themeName}\", \"com.formdev.flatlaf.intellijthemes${subPackage}.${themeClass}\", ${dark} ),";
 }

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

@@ -220,6 +220,17 @@ public class IJThemesPanel
 		}
 	}
 
+	public void selectPreviousTheme() {
+		int sel = themesList.getSelectedIndex();
+		if( sel > 0 )
+			themesList.setSelectedIndex( sel - 1 );
+	}
+
+	public void selectNextTheme() {
+		int sel = themesList.getSelectedIndex();
+		themesList.setSelectedIndex( sel + 1 );
+	}
+
 	private void themesListValueChanged( ListSelectionEvent e ) {
 		IJThemeInfo themeInfo = themesList.getSelectedValue();
 		boolean bundledTheme = (themeInfo != null && themeInfo.resourceName != null);

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

@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-HintPanel.backgroundColor=darken(#ffffe1,80%)
+HintPanel.backgroundColor = darken(#ffffe1,80%)

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

@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-HintPanel.backgroundColor=#ffffe1
+HintPanel.backgroundColor = #ffffe1

flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/RecentlyUsed.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M10 0C8.02219 0 6.08879 0.58649 4.4443 1.6853C2.79981 2.78412 1.51809 4.3459 0.761209 6.17317C0.00433284 8.00043 -0.193701 10.0111 0.192152 11.9509C0.578004 13.8907 1.53041 15.6725 2.92894 17.0711C4.32746 18.4696 6.10929 19.422 8.0491 19.8079C9.98891 20.1937 11.9996 19.9957 13.8268 19.2388C15.6541 18.4819 17.2159 17.2002 18.3147 15.5557C19.4135 13.9112 20 11.9778 20 10C20 7.34784 18.9464 4.8043 17.0711 2.92893C15.1957 1.05357 12.6522 0 10 0ZM10 18.2C8.3782 18.2 6.79281 17.7191 5.44433 16.8181C4.09585 15.917 3.04483 14.6364 2.42419 13.138C1.80355 11.6397 1.64117 9.9909 1.95757 8.40026C2.27396 6.80961 3.05494 5.34852 4.20173 4.20172C5.34852 3.05493 6.80962 2.27396 8.40026 1.95756C9.99091 1.64116 11.6397 1.80355 13.138 2.42419C14.6364 3.04483 15.917 4.09584 16.8181 5.44432C17.7191 6.79281 18.2 8.37819 18.2 10C18.1974 12.174 17.3326 14.2581 15.7954 15.7954C14.2581 17.3326 12.174 18.1974 10 18.2ZM10.9 9.43L14.46 11.09L13.7 12.72L9.10001 10.57V4H10.9V9.43Z" fill="#9AA7B0" fill-opacity="0.8"/>
+</svg>

flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/buildLoadChanges.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#389FD6" fill-rule="evenodd" d="M14.0431479,8.44999981 L14.3048222,13.4430431 L12.574725,11.885269 C11.4741571,13.1817306 9.83248424,14.0044386 7.99865879,14.0044386 C5.03921121,14.0044386 2.58020312,11.8617896 2.08827651,9.04314243 L3.94798986,9.10858763 C4.43427312,10.8903005 6.0642585,12.2000519 8.00015362,12.2000519 C9.30169687,12.2000519 10.4649641,11.6080237 11.2353504,10.6785714 L9.05000019,8.71167959 L14.0431479,8.44999981 Z M7.99865879,2.00443857 C10.9184669,2.00443857 13.3511517,4.09007371 13.888219,6.85284133 L12.0226275,6.7880427 C11.5024638,5.05933714 9.89836709,3.8000774 8.00015362,3.8000774 C6.69883692,3.8000774 5.53574811,4.39189956 4.76535914,5.32107268 L6.95482203,7.29304326 L1.96167436,7.55472304 L1.70000005,2.56167973 L3.42768119,4.11762166 C4.52821742,2.82461451 6.1676575,2.00443857 7.99865879,2.00443857 Z" transform="rotate(3 8.002 8.004)"/>
+</svg>

flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/commit.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <polygon fill="#59A869" points="13.789 2.09 15.535 3.837 6.292 13.08 1.95 8.738 3.698 6.99 6.293 9.585"/>
+</svg>

flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/diff.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#389FD6" fill-rule="evenodd" transform="translate(1)">
+    <path d="M10.9000003,4.89999992 L14.0999999,4.89999992 L9.9000001,9.09999973 L5.70000029,4.89999992 L8.90000027,4.89999992 L8.90000027,0.899999917 L10.9000003,0.899999917 L10.9000003,4.89999992 Z" transform="rotate(90 9.9 5)"/>
+    <path d="M5.0999999,10.9000001 L8.29999971,10.9000001 L4.0999999,15.0999999 L-0.0999999046,10.9000001 L3.0999999,10.9000001 L3.0999999,6.9000001 L5.0999999,6.9000001 L5.0999999,10.9000001 Z" transform="matrix(0 1 1 0 -6.9 6.9)"/>
+  </g>
+</svg>

flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/favorite.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <polygon fill="#F4AF3D" fill-rule="evenodd" points="7.998 11.522 3.673 14.311 4.989 9.336 1 6.084 6.138 5.798 7.998 1 9.858 5.798 14.996 6.084 11.007 9.336 12.323 14.311"/>
+</svg>