Compare commits

..

225 Commits
0.45 ... 1.1

Author SHA1 Message Date
Karl Tauber
9612a81f2e release 1.1 2021-03-21 14:03:36 +01:00
Karl Tauber
2945a36cef added since 1.1 2021-03-21 13:53:57 +01:00
Karl Tauber
b84dc5bfcc JIDE and SwingX: README.md: added links to dependencies on maven central 2021-03-21 13:29:23 +01:00
Karl Tauber
60486fd880 JIDE: build using latest version of JIDE library com.formdev:jide-oss:3.7.11.1 2021-03-20 19:19:33 +01:00
Karl Tauber
891091cebc SwingX: fixed compiling module-info (broken since previous commit) 2021-03-19 17:06:23 +01:00
Karl Tauber
1493ddcf41 SwingX: the library on Maven Central no longer depends on org.swinglabs.swingx:swingx-all:1.6.5-1 to avoid problems when another SwingX library should be used 2021-03-19 16:23:29 +01:00
Karl Tauber
4299c50537 JIDE: the library on Maven Central no longer depends on com.jidesoft:jide-oss:3.6.18 to avoid problems when another JIDE library should be used (issue #270) 2021-03-19 16:22:24 +01:00
Karl Tauber
14577c396d JIDE: fixed hover/selection background colors of JideSplitButton and JideSplitToggleButton 2021-03-19 15:59:59 +01:00
Karl Tauber
e9b566241d JIDE: support JideSplitButton and JideSplitToggleButton 2021-03-19 15:39:32 +01:00
Karl Tauber
d39b08c035 FlatArrowButton: refactored arrow painting to FlatUIUtils.paintArrow() so that it can be easily used other components (e.g. JideSplitButton) 2021-03-19 01:21:19 +01:00
Karl Tauber
69ac683c8c Support running in JetBrains Projector (https://jetbrains.com/projector/) 2021-03-17 00:43:08 +01:00
Karl Tauber
eafd0b3d06 use lambdas for listeners (where possible) instead of extending Basic*UI.*Handler classes
some of those `Basic*UI.*Handler` classes may be deprecated in a future Java version (see https://github.com/openjdk/jdk/pull/1958)

this should also avoid loading of those `Basic*UI.*Handler` classes at runtime
2021-03-17 00:34:35 +01:00
Karl Tauber
310a4989dc JIDE: made used fonts "active" and restored fonts modified in LookAndFeelFactory.installJideExtension() 2021-03-16 23:23:40 +01:00
Karl Tauber
3d0df51839 JIDE: support JideLabel to fix wrong text colors in dark themes 2021-03-16 22:52:13 +01:00
Karl Tauber
ede02aaaa5 TabbedPane: use float arc for tab area button background 2021-03-16 22:20:46 +01:00
Karl Tauber
beff149004 JIDE: support JideButton and JideToggleButton 2021-03-16 22:15:32 +01:00
Karl Tauber
07db6e8fb0 Extras: FlatInspector: fixed NPE if component class is in default package 2021-03-16 13:46:25 +01:00
Karl Tauber
46852c0780 JIDE: invoke LookAndFeelFactory.installJideExtension() early in FlatJidePopupMenuUI to be sure that Jide extensions are installed 2021-03-16 13:26:36 +01:00
Karl Tauber
a5e41c573f JIDE: UIDefaultsDump: dump UI defaults added by LookAndFeelFactory.installJideExtension() 2021-03-16 11:38:49 +01:00
Karl Tauber
9a94395d30 JIDE: split FlatJideOssTest (moved JideTabbedPane to FlatJideOssContainerTest`) 2021-03-15 17:40:31 +01:00
Karl Tauber
04aa61c2bb Merge pull request #268 from title-pane-improvements
Title pane improvements (Windows 10 only)
2021-03-14 17:39:50 +01:00
Karl Tauber
035a13df54 Window decorations: support unified backgrounds for window title bar, menu bar and main content (issue #254) 2021-03-14 15:13:26 +01:00
Karl Tauber
e8a6f0ca3d Native window decorations: added flatlaf-windows-x86.dll and updated flatlaf-windows-x86_64.dll
built by GitHub Actions:
https://github.com/JFormDesigner/FlatLaf/actions/runs/650060630
2021-03-14 00:20:22 +01:00
Karl Tauber
1fc519b9de natives.yml: run "Native Libraries" also when natives.yml changed 2021-03-14 00:02:01 +01:00
Karl Tauber
2bcf38e2e3 natives.yml: run "Native Libraries" on any change in native project (e.g. when changing Gradle build script) 2021-03-13 23:59:30 +01:00
Karl Tauber
8eb44a68cb Native window decorations: support 32-bit JREs 2021-03-13 23:41:38 +01:00
Karl Tauber
30c7b442a8 Window decorations:
- support customizing of window title alignment: left aligned or centered (default is left without embedded menubar and centered with embedded menubar)
- improved centering of window title with embedded menubar (issue #252)
2021-03-13 17:08:47 +01:00
Karl Tauber
cee2211108 Demo: added "users" icon to right side of menu bar to demonstrate this feature 2021-03-13 11:14:51 +01:00
Karl Tauber
b7bcbccd45 Window decorations: support right aligned extra components in JFrame title pane with embedded menu bar 2021-03-13 11:10:50 +01:00
Karl Tauber
d2ccb97eba Native window decorations: use LoggingFacade 2021-03-12 23:18:13 +01:00
Karl Tauber
39d56f2603 Merge pull request #267 from native-window-decorations
Native window decorations for Windows 10 (using JNI)
2021-03-12 23:15:19 +01:00
Karl Tauber
83e904dd2d Merge pull request #262 from native-window-decorations-jna
Native window decorations for Windows 10 (using JNA)
2021-03-12 23:08:35 +01:00
Karl Tauber
110c787eba Merge pull request #265 from ingokegel:optional_logging
Make the module dependency on java.logging optional
2021-03-12 22:57:04 +01:00
Karl Tauber
7c7ff289de removed module java.logging from module-info.javas 2021-03-12 22:52:59 +01:00
Karl Tauber
617a35c51b LoggingFacade:
- make LoggingFacadeImpl classes package private
- added missing @Override
- minor formatting changes
2021-03-12 21:16:57 +01:00
Karl Tauber
73487ccf65 Native window decorations:
- enabled by default (via UI property `TitlePane.useWindowDecorations`)
- dropped system property `flatlaf.useNativeWindowDecorations` and replaced with `flatlaf.useWindowDecorations`
- old functionality of system property `flatlaf.useWindowDecorations` removed
2021-03-11 10:54:23 +01:00
Ingo Kegel
712bff9c99 Use System.Logger for logging with Java 9+ 2021-03-10 17:56:27 +01:00
Ingo Kegel
eedfcf86aa LoggingFacade: moved to com.formdev.flatlaf.util, added license header, fixed NPEs in logging calls and removed overloads of logSevere 2021-03-10 17:06:12 +01:00
Karl Tauber
f730848928 Native window decorations: added flatlaf-windows-x86_64.dll
built by GitHub Actions:
https://github.com/JFormDesigner/FlatLaf/actions/runs/636694710
2021-03-10 16:16:50 +01:00
Karl Tauber
61d0574c5c Native window decorations: added READMEs 2021-03-09 19:08:53 +01:00
Karl Tauber
2f01e01ec1 Native window decorations: delete temporary DLLs on next startup (same approach as used in JNA) 2021-03-07 00:10:15 +01:00
Karl Tauber
cbcf66df7f Native window decorations: fixed enabled items is system menu 2021-03-06 16:23:10 +01:00
Karl Tauber
cfaeea039b Native window decorations: fixed enabled items is system menu 2021-03-06 16:21:22 +01:00
Karl Tauber
a891d1eb54 Native window decorations: never build :flatlaf-natives-windows:jar because it is not used/needed 2021-03-06 15:26:18 +01:00
Karl Tauber
4372052ef0 Native window decorations: do not try to build native library (on Windows) if no C++ compiler is available 2021-03-06 15:18:23 +01:00
Karl Tauber
8734b062dc Native window decorations: avoid using C-runtime, which reduces the DLL size from 100kb to 8kb 2021-03-06 12:01:49 +01:00
Ingo Kegel
343451de65 Make the module dependency on java.logging optional
Currently, FlatLaf has the following module dependencies:

$ jdeps --list-deps --multi-release 9 flatlaf-1.0.jar
   java.base
   java.desktop
   java.logging

This commit makes the java.logging dependency optional and hides logging behind a facade that falls back to printing to stderr if the java.logging module is not available.

To test, create a reduced JRE with a command like

jdk-15/bin/jlink.exe --module-path jdk-15/jmods --add-modules java.desktop --add-modules java.instrument --output jre-15-desktop-only

(adding java.instrument, so the FlatLafDemo main class can be started from IntelliJ IDEA)
2021-03-05 16:44:08 +01:00
Karl Tauber
144d65c776 Native window decorations: initial implementation in C++ using JNI 2021-03-05 10:31:31 +01:00
Karl Tauber
a6815574f7 Native window decorations: renamed project flatlaf-native-jna to flatlaf-natives/flatlaf-natives-jna
removed module-info.java because this JAR is not released/published
2021-03-04 11:04:47 +01:00
Karl Tauber
e5a116a0d4 Extras: FlatInspector: removed println (fixes #263) 2021-02-25 16:54:05 +01:00
Karl Tauber
0beef6b108 README.md: new applications using FlatLaf:
- install4j
2021-02-25 00:00:30 +01:00
Karl Tauber
7341008449 Native window decorations: fixed missing top border line 2021-02-24 23:17:41 +01:00
Karl Tauber
49bd53194a Native window decorations: show window system menu when left-clicking on application icon, close window on left-double-click on app icon 2021-02-23 23:31:36 +01:00
Karl Tauber
baf4437efc Native window decorations: show window system menu when right-clicking on caption 2021-02-23 01:10:59 +01:00
Karl Tauber
b244f80f81 Native window decorations: support autohide taskbar 2021-02-22 22:57:43 +01:00
Karl Tauber
e41c91a42b Native window decorations: fixed exception when switching Laf after closing a dialog 2021-02-22 09:56:40 +01:00
Karl Tauber
b9a2e3ceac Native window decorations: initial implementation (using JNA; will be replaced with JNI later) 2021-02-21 17:51:19 +01:00
Karl Tauber
fa7dd3bdc4 GitHub Actions: upload all built libs 2021-02-21 17:18:59 +01:00
Karl Tauber
9a8c68b846 GitHub Actions: renamed master to main 2021-02-19 16:38:25 +01:00
Karl Tauber
698e33ddf4 IntelliJ Themes: fixed text color of CheckBoxMenuItem and RadioButtonMenuItem in all "Arc" themes (issue #259) 2021-02-19 11:33:15 +01:00
Karl Tauber
909258ba14 README.md: added "Getting started" and direct links to documentation 2021-02-14 12:32:56 +01:00
Karl Tauber
2ad6bd1d23 release 1.0 2021-02-13 13:42:04 +01:00
Karl Tauber
510ffd41d8 PopupFactory: fixed NullPointerException when PopupFactory.getPopup() is invoked with parameter owner set to null 2021-02-13 13:31:30 +01:00
Karl Tauber
4f00591c4e Table: fixed wrong grid line thickness in dragged column on HiDPI screens on Java 9+ (issue #236) 2021-02-12 11:32:12 +01:00
Karl Tauber
5b65ed87cd FileChooser: fixed display of date in details view if current user is selected in "Look in" combobox (Windows 10 only; issue #249) 2021-02-12 11:10:25 +01:00
Karl Tauber
b0121c422d GitHub Actions: added Gradle wrapper validation 2021-02-11 23:52:11 +01:00
Karl Tauber
a9e9fad222 Extras: FlatInspector: tooltip is no longer limited to window bounds 2021-02-11 18:23:01 +01:00
Karl Tauber
b5fc07acc7 TabbedPane: custom TabbedPane.selectedForeground color did not work when TabbedPane.foreground has also custom color (issue #257) 2021-02-11 12:04:36 +01:00
Karl Tauber
140ebfdb92 release 1.0-rc3 2021-02-06 23:31:53 +01:00
Karl Tauber
37d0179de1 GitHub Actions: upload demo (was removed in previous commit) 2021-02-06 23:27:39 +01:00
Karl Tauber
823d4b0fe2 dropped usage of bintray, jcenter and jfrog artifactory
deploy to Sonatype OSSRH

snapshots are now here:
https://oss.sonatype.org/content/repositories/snapshots/com/formdev/
2021-02-06 19:02:32 +01:00
Karl Tauber
dd1eacf4f0 update to Gradle 6.8.2
./gradlew wrapper --gradle-version=6.8.2
2021-02-06 11:35:35 +01:00
Karl Tauber
86c33dd686 fixed javadoc syntax error 2021-02-06 11:26:57 +01:00
Karl Tauber
c6757cc61b UI defaults inspector: filter by colors with alpha and derived colors 2021-02-06 01:32:32 +01:00
Karl Tauber
a38cf284dd UI defaults inspector: show color functions in value tooltips 2021-02-06 01:31:34 +01:00
Karl Tauber
575b8e3f7f UI defaults inspector: for derived colors, no longer change Item.value from Color to Color[] because this could cause problems if there is a UI value of type Color[] 2021-02-06 01:01:48 +01:00
Karl Tauber
bc443f47f1 Theme Editor: fixed NPE (caused by no longer implemented base files support) 2021-02-05 23:33:26 +01:00
Karl Tauber
b631bcc0db UIDefaultsLoader: check for endless recursion in parsing color functions (e.g. abc = darken($abc,10%)) 2021-02-05 23:30:48 +01:00
Karl Tauber
5ccd92ece6 CheckBox: fixed background of check boxes in JIDE CheckBoxTree (broken since commit dd8ab242fb) 2021-02-04 19:41:14 +01:00
Karl Tauber
2f3c8868a7 IntelliJ Themes: fixed table header background when dragging column in "Dark Flat" and "Light Flat" themes 2021-02-04 19:18:06 +01:00
Karl Tauber
6f7b5e8005 README.md: removed JCenter and replaced download links to bintray with Maven Central 2021-02-04 16:48:53 +01:00
Karl Tauber
10d1e4b798 UIDefaultsDump: dump color value in same format as used in FlatLaf properties files; also dump alpha as percentage 2021-02-04 15:24:50 +01:00
Karl Tauber
9d5934df14 Extras: FlatInspector: use HTML in tooltip 2021-02-04 15:19:33 +01:00
Karl Tauber
be507de6c1 Label and ToolTip: made inserting BASE_SIZE rule into HTML text more reliable 2021-02-04 15:10:27 +01:00
Karl Tauber
e5d3c08821 Fixed color of <address> tag in HTML text 2021-02-04 12:58:14 +01:00
Karl Tauber
027b4ab7da Label and ToolTip: fixed font sizes for <code>, <kbd>, <big>, <small> and <samp> tags in HTML text
ToolTip: update font size if `tiptext` property changes
2021-02-04 12:56:18 +01:00
Karl Tauber
fefea0d7ec IntelliJ Themes: updated themes to newest versions (used IJThemesUpdater) 2021-02-02 18:00:17 +01:00
Karl Tauber
33f30bfd19 README.md: new applications using FlatLaf:
- DbVisualizer
- MagicPlot
- Thermo-Calc
- Burp Suite
- BurpCustomizer
- IGMAS+
2021-02-01 21:58:18 +01:00
Karl Tauber
e9d4b9961a README.md: made "commercial" bold 2021-02-01 15:14:07 +01:00
Karl Tauber
b94248fe79 README.md: removed "new" badge from projects using FlatLaf 2021-02-01 14:58:44 +01:00
Karl Tauber
225975e0dd FlatTestFrame: added 5x and 6x scale factors 2021-02-01 13:57:36 +01:00
Karl Tauber
eac7492143 FlatAnimatedIconTest: made animation of switch smooth on high scale factors 2021-02-01 12:55:14 +01:00
Karl Tauber
b3c40bf448 release 1.0-rc2 2021-02-01 01:39:52 +01:00
Karl Tauber
02f7cd77f4 FlatBorder: fixed wrong round edge of focused components in themes without outer focus border (Flat Light/Dark) 2021-02-01 01:30:52 +01:00
Karl Tauber
7f8f3aa99b Button: undone most style changes done in previous commit related to focused and default buttons:
- 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)
2021-02-01 01:08:20 +01:00
Karl Tauber
0bcdc14909 - Button:
- In "Flat Light" theme, changed styles of focused and default buttons to
    avoid confusion with all other themes. Focused buttons now have a white
    background (was light blue) and a slightly wider border. The default button
    now has a light blue background (was white) and a thin border. In all other
    themes the default button also has colored 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.
2021-01-31 20:02:24 +01:00
Karl Tauber
526c25a02b FlatComponentStateTest: fixed insets 2021-01-31 18:51:28 +01:00
Karl Tauber
f48da9dab1 FlatComponentStateTest: added text field and combobox (for comparison) 2021-01-31 16:17:47 +01:00
Karl Tauber
2e8dfda12e FlatComponentStateTest: added help buttons 2021-01-31 00:55:29 +01:00
Karl Tauber
63da576d85 FlatComponentStateTest: added selected checkboxes and radiobuttons 2021-01-30 20:53:07 +01:00
Karl Tauber
0ab4206540 FlatComponentStateTest added 2021-01-30 18:43:11 +01:00
Karl Tauber
212ae90401 client property "JComponent.focusOwner" added to allow customizing detection of focused state (issue #185) 2021-01-30 17:54:47 +01:00
Karl Tauber
d4e5d0be45 javadoc fixes 2021-01-30 17:46:53 +01:00
Karl Tauber
3520a0f1fb TextComponents: border of focused non-editable text components had wrong color 2021-01-30 01:06:03 +01:00
Karl Tauber
036090a947 Button: fixed behavior of Enter key on focused button on Windows and Linux, which now clicks the focused button (instead of the default button) 2021-01-30 00:37:36 +01:00
Karl Tauber
dc570c683a UI defaults: added Java 8 and 9+ InputMap dumps of NimbusLookAndFeel, which are different on Linux (and macOS) than on Windows because they use GTK key bindings (see GTKKeybindings.installKeybindings(), invoked from NimbusLookAndFeel.getDefaults()) 2021-01-29 23:00:06 +01:00
Karl Tauber
9f85d34c91 JIDE: updated UI defaults dumps for commit 7d0f7e1c8e (support JidePopupMenu) 2021-01-29 22:06:01 +01:00
Karl Tauber
16bf1fb6c3 README.md: screenshots updated 2021-01-28 23:26:30 +01:00
Karl Tauber
47c4d508e0 Demo: updated screenshot mode 2021-01-28 23:26:16 +01:00
Karl Tauber
e5d9060623 UI defaults: added links to docs and note to properties files 2021-01-23 18:49:35 +01:00
Karl Tauber
fdf28fc385 javadoc and comment updates/fixes 2021-01-23 18:05:46 +01:00
Karl Tauber
9015a4d56b Window decorations: fixed top window border in dark themes when running in JetBrains Runtime (issue #244)
fixed/improved calculation of active border color
2021-01-23 16:59:53 +01:00
Karl Tauber
38301454a6 CHANGELOG.md: added recently merged PRs #245 2021-01-22 11:10:04 +01:00
Karl Tauber
9b3a22c4ca FlatComponents2Test: simplified layout and reduced frame size 2021-01-21 23:58:22 +01:00
Karl Tauber
548dbc3649 Merge pull request #245 from ingokegel/tree_wide_selection
Added a per-tree wide selection setting
2021-01-21 23:19:33 +01:00
Karl Tauber
3474129812 Tree:
- paint non-wide selection in FlatTreeUI.paintRow() instead of using reflection to change private field in DefaultTreeCellRenderer
- use DefaultTreeCellRenderer.getBackgroundSelectionColor() as selection color (if possible)
- added boolean client property JTree.paintSelection to disable selection painting in FlatTreeUI.paintRow()
- FlatComponents2Test:
  - added checkboxes for wideSelection and paintSelection client properties
  - added possibility to test various kinds of tree cell renderers
  - added JXTree, JIDE CheckBoxTree

(PR #245)
2021-01-21 17:38:20 +01:00
Karl Tauber
63193feebe JIDE: JidePopupMenu:
- added test to FlatJideOssTest
- updated README.md and CHANGELOG.md

(PR #246)
2021-01-21 00:14:42 +01:00
Karl Tauber
51f22bfe75 Merge pull request #246 from ingokegel/jide_popup_menu_ui
Added UI for JidePopupMenu
2021-01-21 00:05:32 +01:00
Ingo Kegel
7d0f7e1c8e Added UI for JidePopupMenu 2021-01-20 16:18:48 +01:00
Karl Tauber
dd8ab242fb 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 (better fix for #77) 2021-01-19 19:13:20 +01:00
Ingo Kegel
60f3428da7 Added a per-tree wide selection setting 2021-01-19 17:46:41 +01:00
Karl Tauber
c6fec0a131 release 1.0-rc1 2021-01-18 23:34:37 +01:00
Karl Tauber
fdc43fc0d3 Slider: improved thumb hover and pressed colors
Also changed auto-inverse threshold from 50% to 65% for increase and 35% for decrease, because this gives much better results for slider hover and pressed colors. This does not change other colors in core themes, but few colors in some IntelliJ themes (usually checkbox hover/pressed).
2021-01-18 23:20:25 +01:00
Karl Tauber
0b880aa335 TabbedPane: fixed scrolling tabs with touchpads and high-resolution mouse wheels 2021-01-18 18:34:21 +01:00
Karl Tauber
74f50ec992 IntelliJ Themes: fixed menu accelerator colors in Monocai theme (issue #243) 2021-01-18 12:15:12 +01:00
Karl Tauber
1bdf4532db UI defaults inspector: support wildcard matching in filter 2021-01-16 12:56:25 +01:00
Karl Tauber
f97783ddef Window decorations: RootPane.activeBorderColor and RootPane.inactiveBorderColor fixes:
- FlatDarkLaf.properties: changed darken() to lighten(), which does not change real colors due to autoInverse mechanism
- FlatLightLaf.properties: use also derived colors (to be consistent with FlatDarkLaf.properties and fix warning in UIDefaultsDump)
2021-01-16 01:01:36 +01:00
Karl Tauber
1024d6fc07 UIDefaultsDump: use DerivedColorKeys.properties to compute and dump derived colors and verify them 2021-01-16 00:39:36 +01:00
Karl Tauber
3ec59d0c58 UI defaults inspector:
- no longer show color values as decimal rgb
- use black for color value text if color is translucent
- fix derived color tooltip
- improved filter performance
2021-01-15 19:44:45 +01:00
Karl Tauber
c43249316c UI defaults inspector:
- show computed derived colors
- also show base colors and default colors
- indicate derived colors with magenta bar on right side in value column
2021-01-15 19:07:44 +01:00
Karl Tauber
ed5180ffd6 Theme Editor:
- save/restore selection when reloading file (if changed outside)
- select all text in find field when pressing Ctrl+F
- use lighter color for operators (e.g. '=')
2021-01-15 16:15:05 +01:00
Karl Tauber
e9ec769340 CHANGELOG.md: added recently merged PRs #237, #239 and #241 2021-01-15 16:00:11 +01:00
Karl T
5e16ff8dff Merge pull request #241 from ingokegel/macos_text_aa
The fix for text anti-aliasing in 50d36fe9 should only apply on macOS
2021-01-15 14:39:00 +01:00
Ingo Kegel
364b6631ea The fix for text anti-aliasing in 50d36fe9 should only apply on macOS 2021-01-15 14:31:58 +01:00
Karl T
48a18e53e3 Merge pull request #240 from ingokegel/table_header_column_borders
Made paintColumnBorders protected to help with implementing derived table header UIs
2021-01-15 14:15:27 +01:00
Karl T
bcc8282d73 Merge pull request #239 from ingokegel/macos_text_aa
Switched from sub-pixel to greyscale text anti-aliasing on macOS when running with a JetBrains JRE
2021-01-15 14:04:40 +01:00
Ingo Kegel
15017ed49c Made paintColumnBorders protected to help with implementing derived table header UIs
To implement FlatLaf UIs for CellStyleTableHeaderUI and SortableTableHeaderUI from the Jide Grids library, access to the paintColumnBorders method is required
2021-01-15 13:09:10 +01:00
Ingo Kegel
50d36fe91b Switched from sub-pixel to greyscale text anti-aliasing on macOS when running with a JetBrains JRE.
Sub-pixel anti-aliasing (VALUE_TEXT_ANTIALIAS_LCD_HRGB) causes font rendering with too much weight with a JetBrains JREs (both 8 and 11). This can be seen when comparing the text rendering of UI elements between IntelliJ IDEA and FlatLaf.

This commits aligns FlatLaf's behavior with IntelliJ IDEA which disables sub-pixel anti-aliasing on macOS for its IDE anti-aliasing setting and uses greyscale anti-aliasing by default (see com.intellij.ide.ui.AntialiasingType.canUseSubpixelAAForIDE).
2021-01-14 18:59:54 +01:00
Karl Tauber
23e67a2908 Slider: support per component custom thumb and track colors 2021-01-14 13:50:42 +01:00
Karl Tauber
0dab1b73cc JIDE: RangeSlider: fixed slider focused colors in IntelliJ themes (see commit 1fb0783808) 2021-01-14 13:36:01 +01:00
Karl T
3c086a92e2 Merge pull request #237 from ingokegel/macos_font
JetBrains Runtime 11 has support for displaying the .AppleSystemUIFont font.
2021-01-14 13:22:16 +01:00
Ingo Kegel
647d72514b JetBrains Runtime 11 has support for displaying the .AppleSystemUIFont font.
This font should be used for UI elements since macOS 10.15.
See https://youtrack.jetbrains.com/issue/JBR-1915 for more information.

Other JREs, including JetBrains Runtime 8 do not handle kerning for that font correctly.
2021-01-14 10:18:39 +01:00
Karl Tauber
15328b4fd7 ToggleButton: tab style buttons now respect explicitly set background color 2021-01-13 17:52:05 +01:00
Karl Tauber
b49a498f9c 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) 2021-01-13 17:22:09 +01:00
Karl Tauber
8d14d5f87c Button: disabled Button.defaultButtonFollowsFocus on Windows (as on other platforms, IntelliJ IDEA and other Lafs) 2021-01-13 10:32:15 +01:00
Karl Tauber
a6db352ecd 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
2021-01-13 10:11:29 +01:00
Karl Tauber
ccbb26c176 IntelliJ Themes: added hover and pressed feedback to Button, CheckBox, RadioButton and ToggleButton (issue #176) 2021-01-12 14:15:44 +01:00
Karl Tauber
8f6af73541 CheckBox and RadioButton:
- use `CheckBox.icon.selectedBackground` as base color for derived "selected" colors
- use derived colors for `CheckBox.icon[filled].selectedHoverBackground` and `CheckBox.icon[filled].selectedPressedBackground`
- removed unnecessary `CheckBox.icon.selectedFocusedBorderColor`from FlatDarkLaf.properties
- added missing keys to FlatLafUIKeys.txt

(preparation for #176)
2021-01-12 10:43:57 +01:00
Karl Tauber
a59f17fdb2 UIDefaultsKeysDump: extend existing keys file (instead of replacing it) to allow manual adding of optional keys, which are not defined in UI defaults 2021-01-11 14:00:14 +01:00
Karl Tauber
14222e40ad TabbedPane: fixed IndexOutOfBoundsException when using tooltip text on close buttons and closing last/rightmost tab (issue #235) 2021-01-10 18:28:30 +01:00
Karl Tauber
7d48bf06fe Button and ToggleButton: Threat Unicode surrogate character pair as single character and make button square (issue #234) 2021-01-09 23:46:56 +01:00
Karl Tauber
1d06a2c2e8 IntelliJ Themes: updated "Material Theme UI Lite" themes; added "Material Theme UI Lite / Moonlight" theme 2021-01-09 17:55:09 +01:00
Karl Tauber
cf141f0e55 IntelliJ Themes: updated "Dracula" and "Gradianto" themes 2021-01-09 17:35:13 +01:00
Karl Tauber
9113c31612 UI defaults inspector: support copy key/value to clipboard 2021-01-09 11:13:17 +01:00
Karl Tauber
00b4e0a6fd UI defaults inspector: support embedding into any window 2021-01-09 00:38:46 +01:00
Karl Tauber
e3cac95d37 UI defaults:
- moved some common properties from FlatLightLaf.properties and FlatDarkLaf.properties to FlatLaf.properties
- use color functions for more properties
2021-01-08 18:24:39 +01:00
Karl Tauber
64d850c583 build.gradle.kts: added more information to pom 2021-01-08 11:47:48 +01:00
Karl Tauber
2fe1b9e726 ScrollPane: smooth scrolling:
- scroll at least one pixel to avoid "hanging"
- limit scroll increment to visible width/height
- no longer use block increment because had width/height of view (IOW was too large and had no effect)

(issue #27)
2021-01-08 11:20:55 +01:00
Karl Tauber
1315d847b9 removed dummy pom.xml for GitHub dependency graph 2021-01-07 14:09:55 +01:00
Karl Tauber
b5954102b6 README.md: added maven-central badge 2021-01-05 15:09:52 +01:00
Karl Tauber
1c8ba0c538 added dummy root pom.xml for GitHub dependency graph 2021-01-05 11:58:02 +01:00
Karl Tauber
be18317a6d moved flatlaf-extras/pom.xml (for GitHub dependency graph) to another folder to check whether GitHub recognizes it there 2021-01-05 11:48:50 +01:00
Karl Tauber
88d2b8266e README.md: reordered chapters 2021-01-03 11:59:44 +01:00
Karl Tauber
949ca5ddff JIDE: auto-initialize JIDE extensions (issue #230) 2021-01-03 11:55:09 +01:00
Karl Tauber
3eb53b9648 Theme Editor: save/restore window size (basic implementation; ignoring maximized state and screen number) 2021-01-02 15:44:37 +01:00
Karl Tauber
e4a03ede1f added dummy pom.xml for GitHub dependency graph for flatlaf-extras 2021-01-02 14:05:10 +01:00
Karl Tauber
cb65dc0e9d added dummy pom.xml for GitHub dependency graph 2021-01-02 13:09:31 +01:00
Karl Tauber
8ec907050e Theme Editor:
- "Open Directory" action added
- remember recently opened directories
- remember recently selected file
2021-01-01 17:43:05 +01:00
Karl Tauber
15ba00a902 Theme Editor: use selected text in editor for searching when pressing Ctrl+F 2021-01-01 12:56:29 +01:00
Karl Tauber
89d0c301c2 Theme Editor: "replace" and "replace all" added; focus editor with F12 key 2020-12-31 23:22:45 +01:00
Karl Tauber
2f47466f3b Theme Editor:
- fixed broken (mouse-wheel) scrolling caused by the additional JPanel
- fixed broken slide-in animation of "find bar"
2020-12-31 22:29:09 +01:00
Karl Tauber
d70eca9774 Theme Editor: added "error strip" to right side; removed scroll pane border 2020-12-31 18:15:20 +01:00
Karl Tauber
95ce92fa18 Theme Editor: find previous/next with UP/DOWN keys 2020-12-31 17:34:16 +01:00
Karl Tauber
b3db52b2ed Theme Editor: mark occurrence while typing; disable previous/next occurrence buttons if searchFor is empty 2020-12-31 16:23:04 +01:00
Karl Tauber
c40912013d Theme Editor: use markAll() (instead of find()) to avoid that selection jumps to next occurrence when showing find bar or when changing options 2020-12-31 16:11:22 +01:00
Karl Tauber
1c08e98c1c Theme Editor: show/hide highlighted matches when showing/hiding "find bar" 2020-12-31 15:55:22 +01:00
Karl Tauber
3f202a7cdc Theme Editor: transfer focus to editor when hiding "find bar" 2020-12-31 15:24:32 +01:00
Karl Tauber
6f3aea8fc1 Theme Editor: basic "find bar" added 2020-12-31 15:08:14 +01:00
Karl Tauber
0896143838 Theme Editor: support navigating to next/previous editor with Ctrl+Tab/Ctrl+Shift+Tab 2020-12-30 14:03:41 +01:00
Karl Tauber
ea94899a28 Extras: added missing export of package com.formdev.flatlaf.extras.components to Java 9 module descriptor (issue #117) 2020-12-30 11:23:51 +01:00
Karl Tauber
d2109cef86 Theme Editor: update open tabs when .properties files were added or removed to directory (on window activation) 2020-12-29 23:12:23 +01:00
Karl Tauber
cda146366c Theme Editor: auto-reload .properties files on window activation, if modified outside 2020-12-29 18:30:52 +01:00
Karl Tauber
678b879a01 Theme Editor:
- open all .properties files in passed directory in tabs
- basic menu bar added (Save, Exit)
- auto-save files on window deactivation and app exit
2020-12-28 20:38:48 +01:00
Karl Tauber
4c885c5e7b CHANGELOG.md: added PR #229 2020-12-23 12:31:16 +01:00
Karl Tauber
d5002b1c33 Merge pull request #229
TextField Placeholder now honors the right inset
2020-12-23 12:18:33 +01:00
Karl Tauber
4f8b6d6b28 UIDefaultsLoader:
- changed "globals" to "wildcard replacements"
- strict checking for background/foreground keys
2020-12-23 11:14:26 +01:00
Karl Tauber
66dab41539 properties: added spaces around '=' for easier reading 2020-12-23 10:52:42 +01:00
Niklas
9e4940228d TextField now honours right component inset
If the placeholder can't be drawn fully, we clip it by adding an
ellipse.
2020-12-23 09:26:30 +01:00
Karl Tauber
cbb11ebb03 ComboBox, Spinner and SplitPaneDivider: support "pressed" feedback on arrow buttons 2020-12-23 00:02:58 +01:00
Karl Tauber
073a25f381 release 0.46 2020-12-20 18:42:23 +01:00
Karl Tauber
40592ab876 FlatUIUtils: fixed javadoc warnings 2020-12-20 18:34:13 +01:00
Karl Tauber
bbfe624b51 Merge pull request #222 into master
AnimatedIcon
2020-12-20 18:26:09 +01:00
Karl Tauber
a2af9e4c65 JIDE: RangeSlider: clicking on track now immediately moves the thumb to mouse location and starts dragging the thumb 2020-12-20 18:24:40 +01:00
Karl Tauber
0123a8895f JIDE: updated UI defaults dumps for commit ef065d31a0 (support TristateCheckBox) 2020-12-20 17:33:42 +01:00
Karl Tauber
53854a4d13 Slider: snap to ticks is now done while dragging the thumb 2020-12-20 17:32:01 +01:00
Karl Tauber
4fdd44858f Slider: clicking on track now immediately moves the thumb to mouse location and starts dragging the thumb 2020-12-20 13:32:10 +01:00
Karl Tauber
3c58879ce5 Slider: fixed painting of colored track if JSlider.inverted is true 2020-12-19 17:01:34 +01:00
Karl Tauber
a7c6a881b3 Extras: FlatTriStateCheckBox reworked 2020-12-19 16:13:12 +01:00
Karl Tauber
ef065d31a0 JIDE: support TristateCheckBox 2020-12-19 13:34:53 +01:00
Karl Tauber
d059d6b448 README.md: new projects using FlatLaf:
- jEnTunnel
- JPass
- Linotte
- MEKA
- Shutter Encoder
- ThunderFocus
- lectureStudio
2020-12-18 16:05:56 +01:00
Karl Tauber
2d0a6f1bec README.md: new projects using FlatLaf:
- JOSM
- Novel-Grabber
- Android Tool
2020-12-18 16:04:43 +01:00
Karl Tauber
a3cc5a1938 README.md: added descriptions to projects using FlatLaf 2020-12-18 14:34:40 +01:00
Karl Tauber
435068515a always reset our graphics rendering hints
(this is usually not necessary because each component gets its own instance of Graphics when painting, but resetting may avoid side effects if our paint methods are invoked directly)
2020-12-18 13:35:17 +01:00
Karl Tauber
956001dbd7 avoid painting text with our rendering hints enabled to avoid antialiased text in some components if text antialiasing is disabled in system (issue #227) 2020-12-18 12:22:27 +01:00
Karl Tauber
460f0d9dee UIScale: fixed NPE in getSystemScaleFactor(Graphics2D) when using Batik SVGGraphics2D (issue #226) 2020-12-15 11:25:00 +01:00
Karl Tauber
5155ec93c9 ToolTip: fixed drop shadow for wide tooltips (issue #224; regression since fixed issue #142) 2020-12-15 11:19:30 +01:00
Karl Tauber
8bb8883e22 IntelliJ Themes: added flag whether a theme is dark to FlatAllIJThemes.INFOS. (issue #221) 2020-12-12 18:54:42 +01:00
Karl Tauber
ffb7a6dfbb README.md:
- added demo download section
- added link to javadoc of extras components
2020-12-12 14:45:08 +01:00
Karl Tauber
176de6f245 README.md: simplified download sections of subprojects 2020-12-12 14:21:07 +01:00
Karl Tauber
11f9740dbf Extras: added support for JComponent.outline client property (issue #117) 2020-12-12 13:59:58 +01:00
Karl Tauber
42a91ba26c Extras: renamed SVG utility class from com.formdev.flatlaf.extras.SVGUtils to com.formdev.flatlaf.extras.FlatSVGUtils 2020-12-12 12:21:48 +01:00
Karl Tauber
234003e2b1 Extras: Renamed tri-state check box class from
`com.formdev.flatlaf.extras.TriStateCheckBox` to
`com.formdev.flatlaf.extras.components.FlatTriStateCheckBox`
2020-12-12 00:33:51 +01:00
Karl Tauber
534384438b Extras: added extension class for JTabbedPane (issue #117) 2020-12-11 23:44:52 +01:00
Karl Tauber
ab51f35d5d Extras: added extension classes for JEditorPane, JSpinner, JTextArea and JTextPane; added minimumWidth and roundRect properties (issue #117) 2020-12-11 18:05:58 +01:00
Karl Tauber
511a4044d7 Extras: added extension classes for JButton and JToggleButton (issue #117) 2020-12-11 17:18:35 +01:00
Karl Tauber
821efaff40 Extras: removed duplicate enums in text components (issue #117) 2020-12-11 14:01:42 +01:00
Karl Tauber
91bc994532 Extras: made enums in text components public (issue #117) 2020-12-11 13:39:51 +01:00
Karl Tauber
1323b46ac7 Extras: added extension class for JProgressBar (issue #117) 2020-12-11 13:28:55 +01:00
Karl Tauber
3a8b30ca8e Extras: removed extension interfaces and moved methods to components classes because:
- Javadoc for components that implement extension interfaces are useless because they do not include default methods from the extension interface
- GUI builders do not recognize default methods from the extension interface and it is not possible to edit extension properties in GUI builder
- the idea of adding the extension interface to own components can be also achieved by changing superclass of own component

(issue #117)
2020-12-11 13:24:14 +01:00
Karl Tauber
923d58519f Extras: added extension interfaces and classes for JComboBox, JFormattedTextField, JPasswordField, JScrollBar, JScrollPane and JTextField (issue #117) 2020-12-10 20:30:27 +01:00
Karl Tauber
eabb1f84f6 Table and TableHeader: fixed missing right vertical grid line if using table as row header in scroll pane (issues #152 and #46) 2020-12-09 23:04:04 +01:00
Karl Tauber
cfbe44b946 TableHeader: fixed position of column separators in right-to-left component orientation; do not paint anything if column count is zero 2020-12-09 00:33:01 +01:00
Karl Tauber
81c35eab46 SwingX: fixed striping background highlighting color (e.g. alternating table rows) in dark themes
Table: made grid lines slightly darker/lighter
2020-12-07 12:28:31 +01:00
Karl Tauber
a1c7c29113 FlatComponents2Test: added SwingX JXTable and JXTreeTable to test extended/customized tables 2020-12-07 12:21:34 +01:00
Karl Tauber
1293e2a074 AnimatedIcon added (for future animations) (issue #66) 2020-12-05 17:57:06 +01:00
295 changed files with 30773 additions and 6485 deletions

4
.gitattributes vendored
View File

@@ -15,8 +15,12 @@
# BINARY FILES: # BINARY FILES:
# Disable line ending normalize on checkin. # Disable line ending normalize on checkin.
*.dll binary
*.dylib binary
*.gif binary *.gif binary
*.jar binary *.jar binary
*.lib binary
*.png binary *.png binary
*.sketch binary *.sketch binary
*.so binary
*.zip binary *.zip binary

View File

@@ -33,6 +33,8 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
- name: Setup Java ${{ matrix.java }} - name: Setup Java ${{ matrix.java }}
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
@@ -60,12 +62,7 @@ jobs:
with: with:
name: FlatLaf-build-artifacts name: FlatLaf-build-artifacts
path: | path: |
flatlaf-core/build/libs flatlaf-*/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 !**/*-javadoc.jar
!**/*-sources.jar !**/*-sources.jar
@@ -75,7 +72,7 @@ jobs:
needs: build needs: build
if: | if: |
github.event_name == 'push' && github.event_name == 'push' &&
github.ref == 'refs/heads/master' && github.ref == 'refs/heads/main' &&
github.repository == 'JFormDesigner/FlatLaf' github.repository == 'JFormDesigner/FlatLaf'
steps: steps:
@@ -99,11 +96,11 @@ jobs:
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
restore-keys: ${{ runner.os }}-gradle restore-keys: ${{ runner.os }}-gradle
- name: Publish snapshot to oss.jfrog.org - name: Publish snapshot to oss.sonatype.org
run: ./gradlew artifactoryPublish run: ./gradlew publish -Dorg.gradle.internal.publish.checksums.insecure=true
env: env:
BINTRAY_USER: ${{ secrets.BINTRAY_USER }} OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
release: release:
@@ -135,8 +132,21 @@ jobs:
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
restore-keys: ${{ runner.os }}-gradle restore-keys: ${{ runner.os }}-gradle
- name: Release a new stable version to bintray - name: Release a new stable version to Maven Central
run: ./gradlew bintrayUpload -Drelease=true run: ./gradlew publish :flatlaf-demo:build -Drelease=true
env: env:
BINTRAY_USER: ${{ secrets.BINTRAY_USER }} OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
- name: Upload demo
uses: sebastianpopp/ftp-action@releases/v2
with:
host: ${{ secrets.FTP_SERVER }}
user: ${{ secrets.FTP_USERNAME }}
password: ${{ secrets.FTP_PASSWORD }}
forceSsl: true
localDir: "flatlaf-demo/build/libs"
remoteDir: "."
options: "--only-newer --no-recursion --verbose=1"

56
.github/workflows/natives.yml vendored Normal file
View File

@@ -0,0 +1,56 @@
# https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
name: Native Libraries
on:
push:
branches:
- '*'
tags:
- '[0-9]*'
paths:
- 'flatlaf-natives/flatlaf-natives-windows/**'
- '.github/workflows/natives.yml'
pull_request:
branches:
- '*'
paths:
- 'flatlaf-natives/flatlaf-natives-windows/**'
- '.github/workflows/natives.yml'
jobs:
Windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
- name: Setup Java 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- 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 :flatlaf-natives-windows:build
- name: Upload artifacts
uses: actions/upload-artifact@v2
with:
name: FlatLaf-natives-windows-build-artifacts
path: |
flatlaf-natives/flatlaf-natives-windows/build

2
.gitignore vendored
View File

@@ -9,3 +9,5 @@ out/
*.iml *.iml
*.ipr *.ipr
*.iws *.iws
.vs/
.vscode/

View File

@@ -1,6 +1,213 @@
FlatLaf Change Log FlatLaf Change Log
================== ==================
## 1.1
#### New features and improvements
- Windows 10 only:
- Native window decorations for Windows 10 enables dark frame/dialog title bar
and embedded menu bar with all JREs, while still having native Windows 10
border drop shadows, resize behavior, window snapping and system window
menu. (PR #267)
- Custom window decorations: Support right aligned components in `JFrame`
title bar with embedded menu bar (using `Box.createHorizontalGlue()`). (PR
#268)
- Custom window decorations: Improved centering of window title with embedded
menu bar. (PR #268; issue #252)
- Custom window decorations: Support unified backgrounds for window title bar,
menu bar and main content. If enabled with `UIManager.put(
"TitlePane.unifiedBackground", true );` then window title bar and menu bar
use same background color as main content. (PR #268; issue #254)
- JIDE Common Layer: Support `JideButton`, `JideLabel`, `JideSplitButton`,
`JideToggleButton` and `JideToggleSplitButton`.
- JIDE Common Layer: The library on Maven Central no longer depends on
`com.jidesoft:jide-oss:3.6.18` to avoid problems when another JIDE library
should be used. (issue #270)
- SwingX: The library on Maven Central no longer depends on
`org.swinglabs.swingx:swingx-all:1.6.5-1` to avoid problems when another
SwingX library should be used.
- Support running in [JetBrains Projector](https://jetbrains.com/projector/).
#### Fixed bugs
- IntelliJ Themes: Fixed text color of CheckBoxMenuItem and RadioButtonMenuItem
in all "Arc" themes. (issue #259)
## 1.0
#### New features and improvements
- Extras: UI Inspector: Tooltip is no longer limited to window bounds.
#### Fixed bugs
- TabbedPane: Custom `TabbedPane.selectedForeground` color did not work when
`TabbedPane.foreground` has also custom color. (issue #257)
- FileChooser: Fixed display of date in details view if current user is selected
in "Look in" combobox. (Windows 10 only; issue #249)
- Table: Fixed wrong grid line thickness in dragged column on HiDPI screens on
Java 9+. (issue #236)
- PopupFactory: Fixed `NullPointerException` when `PopupFactory.getPopup()` is
invoked with parameter `owner` set to `null`.
## 1.0-rc3
#### New features and improvements
- Extras:
- UI Inspector: Use HTML in tooltip. Display color value in same format as
used in FlatLaf properties files. Added color preview.
#### Fixed bugs
- Label and ToolTip: Fixed font sizes for `<code>`, `<kbd>`, `<big>`, `<small>`
and `<samp>` tags in HTML text.
- Fixed color of `<address>` tag in HTML text.
- IntelliJ Themes: Fixed table header background when dragging column in "Dark
Flat" and "Light Flat" themes.
- CheckBox: Fixed background of check boxes in JIDE `CheckBoxTree`. (regression
in 1.0-rc2)
## 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 ## 0.45
#### New features and improvements #### New features and improvements

161
README.md
View File

@@ -37,7 +37,7 @@ Requires Java 8 or newer.
Download Download
-------- --------
FlatLaf binaries are available on **JCenter** and **Maven Central**. FlatLaf binaries are available on **Maven Central**.
If you use Maven or Gradle, add a dependency with following coordinates to your If you use Maven or Gradle, add a dependency with following coordinates to your
build script: build script:
@@ -48,16 +48,16 @@ build script:
Otherwise download `flatlaf-<version>.jar` here: Otherwise download `flatlaf-<version>.jar` here:
[![Download](https://api.bintray.com/packages/jformdesigner/flatlaf/flatlaf/images/download.svg)](https://bintray.com/jformdesigner/flatlaf/flatlaf/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf)
### Snapshots ### Snapshots
FlatLaf snapshot binaries are available in FlatLaf snapshot binaries are available on
[JFrog Artifactory](https://oss.jfrog.org/artifactory/oss-snapshot-local/com/formdev/). [Sonatype OSSRH](https://oss.sonatype.org/content/repositories/snapshots/com/formdev/flatlaf/).
To access the latest snapshot, change the FlatLaf version(s) in the dependencies To access the latest snapshot, change the FlatLaf version in your dependencies
to `<version>-SNAPSHOT` (e.g. `0.27-SNAPSHOT`) and add the repository to `<version>-SNAPSHOT` (e.g. `0.27-SNAPSHOT`) and add the repository
`https://oss.jfrog.org/artifactory/oss-snapshot-local` to your build (see `https://oss.sonatype.org/content/repositories/snapshots/` to your build (see
[Maven](https://maven.apache.org/guides/mini/guide-multiple-repositories.html) [Maven](https://maven.apache.org/guides/mini/guide-multiple-repositories.html)
and and
[Gradle](https://docs.gradle.org/current/userguide/declaring_repositories.html#sec:declaring_custom_repository) [Gradle](https://docs.gradle.org/current/userguide/declaring_repositories.html#sec:declaring_custom_repository)
@@ -73,40 +73,31 @@ Addons
- [JIDE Common Layer](flatlaf-jide-oss) - [JIDE Common Layer](flatlaf-jide-oss)
Projects using FlatLaf Getting started
---------------------- ---------------
- [NetBeans](https://netbeans.apache.org/) 11.3 To enable FlatLaf, add following code to your main method before you create any
- [jclasslib bytecode viewer](https://github.com/ingokegel/jclasslib) 5.5 Swing component:
- [KeyStore Explorer](https://keystore-explorer.org/) 5.4.3
- [OWASP Zed Attack Proxy (ZAP)](https://www.zaproxy.org/) (in weekly releases) ~~~java
- ![New](images/new.svg) [jAlbum](https://jalbum.net/) 21 (commercial) FlatLightLaf.install();
- [XMLmind XML Editor](https://www.xmlmind.com/xmleditor/) 9.3 (commercial)
- [Total Validator](https://www.totalvalidator.com/) 15 (commercial) // create UI here...
- [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) Documentation
0.13.b024 -------------
- [Rest Suite](https://github.com/supanadit/restsuite)
- [ControllerBuddy](https://github.com/bwRavencl/ControllerBuddy) For more information and documentation visit
- [SpringRemote](https://github.com/HaleyWang/SpringRemote) [FlatLaf Home](https://www.formdev.com/flatlaf/):
- [mendelson AS2](https://sourceforge.net/projects/mec-as2/),
[AS4](https://sourceforge.net/projects/mendelson-as4/) and - [Themes](https://www.formdev.com/flatlaf/themes/)
[OFTP2](https://sourceforge.net/projects/mendelson-oftp2/) (open-source) and - [Customizing](https://www.formdev.com/flatlaf/customizing/)
[mendelson AS2](https://mendelson-e-c.com/as2/), - [How to Customize](https://www.formdev.com/flatlaf/how-to-customize/)
[AS4](https://mendelson-e-c.com/as4/) and - [Properties Files](https://www.formdev.com/flatlaf/properties-files/)
[OFTP2](https://mendelson-e-c.com/oftp2) (commercial) - [Client Properties](https://www.formdev.com/flatlaf/client-properties/)
- [MeteoInfo](https://github.com/meteoinfo/MeteoInfo) 2.2 - [System Properties](https://www.formdev.com/flatlaf/system-properties/)
- [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...
Buzz Buzz
@@ -116,8 +107,92 @@ Buzz
- [FlatLaf announcement on Reddit](https://www.reddit.com/r/java/comments/dl0hu3/flatlaf_flat_look_and_feel/) - [FlatLaf announcement on Reddit](https://www.reddit.com/r/java/comments/dl0hu3/flatlaf_flat_look_and_feel/)
Documentation Applications using FlatLaf
------------- --------------------------
For more information and documentation visit - [Apache NetBeans](https://netbeans.apache.org/) 11.3 - IDE for Java, PHP, HTML
[FlatLaf Home](https://www.formdev.com/flatlaf/) 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)
[install4j](https://www.ej-technologies.com/products/install4j/overview.html)
9.0 (**commercial**) - the powerful multi-platform Java installer builder
- ![New](images/new.svg) [DbVisualizer](https://www.dbvis.com/) 12.0
(**commercial**) - the universal database tool for developers, analysts and
DBAs
- ![New](images/new.svg) [MagicPlot](https://magicplot.com/) 3.0
(**commercial**) - Software for nonlinear fitting, plotting and data analysis
- ![New](images/new.svg)
[Thermo-Calc](https://thermocalc.com/products/thermo-calc/) 2021a
(**commercial**) - Thermodynamics and Properties Software
- [OWASP ZAP](https://www.zaproxy.org/) 2.10 - the worlds most widely used web
app scanner
- ![New](images/new.svg)
[Burp Suite Professional and Community Edition](https://portswigger.net/burp/pro)
2020.11.2 (**commercial**) - the leading software for web security testing
- ![New](images/new.svg)
[BurpCustomizer](https://github.com/CoreyD97/BurpCustomizer) - adds more
FlatLaf themes to Burp Suite
- [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
- [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**)
- ![New](images/new.svg) [IGMAS+](https://www.gfz-potsdam.de/igmas) -
Interactive Gravity and Magnetic Application System
- [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
- [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
- [Linotte](https://github.com/cpc6128/LangageLinotte) 3.1 - French programming
language created to learn programming
- [MEKA](https://github.com/Waikato/meka) 1.9.3 - multi-label classifiers and
evaluation procedures using the Weka machine learning framework
- [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
- [ThunderFocus](https://github.com/marcocipriani01/ThunderFocus) -
Arduino-based telescope focuser
- [Novel-Grabber](https://github.com/Flameish/Novel-Grabber) - download novels
from any webnovel and lightnovel site
- [lectureStudio](https://www.lecturestudio.org/) 4.3.1060 - digitize your
lectures with ease
- [Android Tool](https://github.com/fast-geek/Android-Tool) - makes popular adb
and fastboot commands easier to use
- and more...

View File

@@ -14,8 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
val releaseVersion = "0.45" val releaseVersion = "1.1"
val developmentVersion = "0.46-SNAPSHOT" val developmentVersion = "1.2-SNAPSHOT"
version = if( java.lang.Boolean.getBoolean( "release" ) ) releaseVersion else developmentVersion version = if( java.lang.Boolean.getBoolean( "release" ) ) releaseVersion else developmentVersion
@@ -23,7 +23,7 @@ allprojects {
version = rootProject.version version = rootProject.version
repositories { repositories {
jcenter() mavenCentral()
} }
} }
@@ -40,17 +40,6 @@ println( "Java ${System.getProperty( "java.version" )}" )
println() println()
extra["bintray.user"] = System.getenv( "BINTRAY_USER" ) ?: System.getProperty( "bintray.user" )
extra["bintray.key"] = System.getenv( "BINTRAY_KEY" ) ?: System.getProperty( "bintray.key" )
// if true, do not upload to bintray
extra["bintray.dryRun"] = false
// if true, uploaded artifacts are visible to all
// if false, only visible to owner when logged into bintray
extra["bintray.publish"] = false
allprojects { allprojects {
tasks { tasks {
withType<JavaCompile>().configureEach { withType<JavaCompile>().configureEach {
@@ -64,7 +53,7 @@ allprojects {
// manifest for all created JARs // manifest for all created JARs
manifest.attributes(mapOf( manifest.attributes(mapOf(
"Implementation-Vendor" to "FormDev Software GmbH", "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)) "Implementation-Version" to project.version))
// add META-INF/LICENSE to all created JARs // add META-INF/LICENSE to all created JARs

View File

@@ -20,15 +20,5 @@ plugins {
// required for kotlin-dsl or embedded-kotlin plugins // required for kotlin-dsl or embedded-kotlin plugins
repositories { repositories {
jcenter() mavenCentral()
}
dependencies {
// NOTE: keep plugin versions in sync with settings.gradle.kts
// "com.jfrog.bintray" plugin
implementation( "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4" )
// "com.jfrog.artifactory" plugin
implementation( "org.jfrog.buildinfo:build-info-extractor-gradle:4.13.0" )
} }

View File

@@ -27,6 +27,10 @@ if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
} }
} }
dependencies {
add( "java9Compile", sourceSets.main.get().output )
}
tasks { tasks {
named<JavaCompile>( "compileJava9Java" ) { named<JavaCompile>( "compileJava9Java" ) {
sourceCompatibility = "9" sourceCompatibility = "9"

View File

@@ -33,9 +33,17 @@ if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
sourceSets { sourceSets {
create( "module-info" ) { create( "module-info" ) {
java { java {
// include "src/main/java" here to get compile errors if classes are // include "src/main/java" and "src/main/java9" here to get compile errors if classes are
// used from other modules that are not specified in module dependencies // used from other modules that are not specified in module dependencies
setSrcDirs( listOf( "src/main/module-info", "src/main/java" ) ) setSrcDirs( listOf( "src/main/module-info", "src/main/java", "src/main/java9" ) )
// exclude Java 8 source file if an equally named Java 9+ source file exists
exclude {
if( it.isDirectory )
return@exclude false
val java9file = file( "${projectDir}/src/main/java9/${it.path}" )
java9file.exists() && java9file != it.file
}
} }
} }
} }
@@ -48,7 +56,8 @@ if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
dependsOn( extension.paths ) dependsOn( extension.paths )
options.compilerArgs.add( "--module-path" ) options.compilerArgs.add( "--module-path" )
options.compilerArgs.add( configurations.runtimeClasspath.get().asPath ) options.compilerArgs.add( configurations.runtimeClasspath.get().asPath
+ File.pathSeparator + configurations.compileClasspath.get().asPath )
} }
jar { jar {

View File

@@ -26,8 +26,7 @@ val extension = project.extensions.create<PublishExtension>( "flatlafPublish" )
plugins { plugins {
`maven-publish` `maven-publish`
id( "com.jfrog.bintray" ) signing
id( "com.jfrog.artifactory" )
} }
publishing { publishing {
@@ -63,54 +62,51 @@ publishing {
} }
scm { scm {
connection.set( "scm:git:git://github.com/JFormDesigner/FlatLaf.git" )
url.set( "https://github.com/JFormDesigner/FlatLaf" ) url.set( "https://github.com/JFormDesigner/FlatLaf" )
} }
issueManagement {
system.set( "GitHub" )
url.set( "https://github.com/JFormDesigner/FlatLaf/issues" )
}
}
}
}
repositories {
maven {
name = "OSSRH"
val releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
val snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
url = uri( if( java.lang.Boolean.getBoolean( "release" ) ) releasesRepoUrl else snapshotsRepoUrl )
credentials {
// get from gradle.properties
val ossrhUsername: String? by project
val ossrhPassword: String? by project
username = System.getenv( "OSSRH_USERNAME" ) ?: ossrhUsername
password = System.getenv( "OSSRH_PASSWORD" ) ?: ossrhPassword
} }
} }
} }
} }
bintray { signing {
user = rootProject.extra["bintray.user"] as String? // get from gradle.properties
key = rootProject.extra["bintray.key"] as String? val signingKey: String? by project
val signingPassword: String? by project
setPublications( "maven" ) val key = System.getenv( "SIGNING_KEY" ) ?: signingKey
val password = System.getenv( "SIGNING_PASSWORD" ) ?: signingPassword
with( pkg ) { useInMemoryPgpKeys( key, password )
repo = "flatlaf" sign( publishing.publications["maven"] )
afterEvaluate {
this@with.name = extension.artifactId
}
setLicenses( "Apache-2.0" )
vcsUrl = "https://github.com/JFormDesigner/FlatLaf"
with( version ) {
name = project.version.toString()
}
publish = rootProject.extra["bintray.publish"] as Boolean
dryRun = rootProject.extra["bintray.dryRun"] as Boolean
}
} }
artifactory { // disable signing of snapshots
setContextUrl( "https://oss.jfrog.org" ) tasks.withType<Sign>().configureEach {
onlyIf { java.lang.Boolean.getBoolean( "release" ) }
publish( closureOf<org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig> {
repository( delegateClosureOf<groovy.lang.GroovyObject> {
setProperty( "repoKey", "oss-snapshot-local" )
setProperty( "username", rootProject.extra["bintray.user"] as String? )
setProperty( "password", rootProject.extra["bintray.key"] as String? )
} )
defaults( delegateClosureOf<groovy.lang.GroovyObject> {
invokeMethod( "publications", "maven" )
setProperty( "publishArtifacts", true )
setProperty( "publishPom", true )
} )
} )
resolve( delegateClosureOf<org.jfrog.gradle.plugin.artifactory.dsl.ResolverConfig> {
setProperty( "repoKey", "jcenter" )
} )
} }

View File

@@ -27,6 +27,16 @@ java {
} }
tasks { tasks {
compileJava {
// generate JNI headers
options.headerOutputDirectory.set( buildDir.resolve( "generated/jni-headers" ) )
}
processResources {
// build native libraries
dependsOn( ":flatlaf-natives-windows:assemble" )
}
jar { jar {
archiveBaseName.set( "flatlaf" ) archiveBaseName.set( "flatlaf" )

View File

@@ -22,6 +22,8 @@ import javax.swing.JComponent;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
/** /**
* Defines/documents own client properties used in FlatLaf.
*
* @author Karl Tauber * @author Karl Tauber
*/ */
public interface FlatClientProperties public interface FlatClientProperties
@@ -130,6 +132,15 @@ public interface FlatClientProperties
*/ */
String MINIMUM_HEIGHT = "JComponent.minimumHeight"; 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. * Specifies the outline color of the component border.
* <p> * <p>
@@ -162,13 +173,23 @@ public interface FlatClientProperties
String OUTLINE_WARNING = "warning"; 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> * <p>
* <strong>Components</strong> {@link javax.swing.JComboBox}, {@link javax.swing.JSpinner}, * May be useful in special cases for custom components.
* {@link javax.swing.JTextField}, {@link javax.swing.JFormattedTextField} and {@link javax.swing.JPasswordField}<br> * <p>
* <strong>Value type</strong> {@link java.lang.Boolean} * 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 -------------------------------------------------------------- //---- Popup --------------------------------------------------------------
@@ -232,7 +253,7 @@ public interface FlatClientProperties
/** /**
* Specifies whether the scroll pane uses smooth scrolling. * Specifies whether the scroll pane uses smooth scrolling.
* <p> * <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} * <strong>Value type</strong> {@link java.lang.Boolean}
*/ */
String SCROLL_PANE_SMOOTH_SCROLLING = "JScrollPane.smoothScrolling"; String SCROLL_PANE_SMOOTH_SCROLLING = "JScrollPane.smoothScrolling";
@@ -264,7 +285,7 @@ public interface FlatClientProperties
String TABBED_PANE_HAS_FULL_BORDER = "JTabbedPane.hasFullBorder"; String TABBED_PANE_HAS_FULL_BORDER = "JTabbedPane.hasFullBorder";
/** /**
* Specifies whether the tab area should be hidded if it contains only one tab. * Specifies whether the tab area should be hidden if it contains only one tab.
* <p> * <p>
* <strong>Component</strong> {@link javax.swing.JTabbedPane}<br> * <strong>Component</strong> {@link javax.swing.JTabbedPane}<br>
* <strong>Value type</strong> {@link java.lang.Boolean} * <strong>Value type</strong> {@link java.lang.Boolean}
@@ -293,10 +314,12 @@ public interface FlatClientProperties
String TABBED_PANE_MAXIMUM_TAB_WIDTH = "JTabbedPane.maximumTabWidth"; String TABBED_PANE_MAXIMUM_TAB_WIDTH = "JTabbedPane.maximumTabWidth";
/** /**
* Specifies the height of a tab. * Specifies the minimum height of a tab.
* <p> * <p>
* <strong>Component</strong> {@link javax.swing.JTabbedPane}<br> * <strong>Component</strong> {@link javax.swing.JTabbedPane}<br>
* <strong>Value type</strong> {@link java.lang.Integer} * <strong>Value type</strong> {@link java.lang.Integer}
*
* @see #TABBED_PANE_TAB_INSETS
*/ */
String TABBED_PANE_TAB_HEIGHT = "JTabbedPane.tabHeight"; String TABBED_PANE_TAB_HEIGHT = "JTabbedPane.tabHeight";
@@ -306,6 +329,8 @@ public interface FlatClientProperties
* <strong>Component</strong> {@link javax.swing.JTabbedPane} * <strong>Component</strong> {@link javax.swing.JTabbedPane}
* or tab content components (see {@link javax.swing.JTabbedPane#setComponentAt(int, java.awt.Component)})<br> * or tab content components (see {@link javax.swing.JTabbedPane#setComponentAt(int, java.awt.Component)})<br>
* <strong>Value type</strong> {@link java.awt.Insets} * <strong>Value type</strong> {@link java.awt.Insets}
*
* @see #TABBED_PANE_TAB_HEIGHT
*/ */
String TABBED_PANE_TAB_INSETS = "JTabbedPane.tabInsets"; String TABBED_PANE_TAB_INSETS = "JTabbedPane.tabInsets";
@@ -349,7 +374,7 @@ public interface FlatClientProperties
* Specifies the callback that is invoked when a tab close button is clicked. * Specifies the callback that is invoked when a tab close button is clicked.
* The callback is responsible for closing the tab. * The callback is responsible for closing the tab.
* <p> * <p>
* Either use a {@link java.util.function.IntConsumer} that received the tab index as parameter: * Either use a {@link java.util.function.IntConsumer} that receives the tab index as parameter:
* <pre>{@code * <pre>{@code
* myTabbedPane.putClientProperty( "JTabbedPane.tabCloseCallback", * myTabbedPane.putClientProperty( "JTabbedPane.tabCloseCallback",
* (IntConsumer) tabIndex -> { * (IntConsumer) tabIndex -> {
@@ -357,7 +382,7 @@ public interface FlatClientProperties
* } ); * } );
* }</pre> * }</pre>
* Or use a {@link java.util.function.BiConsumer}&lt;javax.swing.JTabbedPane, Integer&gt; * Or use a {@link java.util.function.BiConsumer}&lt;javax.swing.JTabbedPane, Integer&gt;
* that received the tabbed pane and the tab index as parameters: * that receives the tabbed pane and the tab index as parameters:
* <pre>{@code * <pre>{@code
* myTabbedPane.putClientProperty( "JTabbedPane.tabCloseCallback", * myTabbedPane.putClientProperty( "JTabbedPane.tabCloseCallback",
* (BiConsumer<JTabbedPane, Integer>) (tabbedPane, tabIndex) -> { * (BiConsumer<JTabbedPane, Integer>) (tabbedPane, tabIndex) -> {
@@ -670,6 +695,25 @@ public interface FlatClientProperties
*/ */
String TAB_BUTTON_SELECTED_BACKGROUND = "JToggleButton.tab.selectedBackground"; 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 ----------------------------------------------------- //---- helper methods -----------------------------------------------------
/** /**

View File

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

View File

@@ -38,8 +38,6 @@ import java.util.Properties;
import java.util.ServiceLoader; import java.util.ServiceLoader;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.Icon; import javax.swing.Icon;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;
@@ -59,9 +57,10 @@ import javax.swing.plaf.UIResource;
import javax.swing.plaf.basic.BasicLookAndFeel; import javax.swing.plaf.basic.BasicLookAndFeel;
import javax.swing.text.StyleContext; import javax.swing.text.StyleContext;
import javax.swing.text.html.HTMLEditorKit; import javax.swing.text.html.HTMLEditorKit;
import com.formdev.flatlaf.ui.FlatNativeWindowBorder;
import com.formdev.flatlaf.ui.FlatPopupFactory; import com.formdev.flatlaf.ui.FlatPopupFactory;
import com.formdev.flatlaf.ui.JBRCustomDecorations;
import com.formdev.flatlaf.util.GrayFilter; import com.formdev.flatlaf.util.GrayFilter;
import com.formdev.flatlaf.util.LoggingFacade;
import com.formdev.flatlaf.util.MultiResolutionImageSupport; import com.formdev.flatlaf.util.MultiResolutionImageSupport;
import com.formdev.flatlaf.util.SystemInfo; import com.formdev.flatlaf.util.SystemInfo;
import com.formdev.flatlaf.util.UIScale; import com.formdev.flatlaf.util.UIScale;
@@ -74,7 +73,6 @@ import com.formdev.flatlaf.util.UIScale;
public abstract class FlatLaf public abstract class FlatLaf
extends BasicLookAndFeel extends BasicLookAndFeel
{ {
static final Logger LOG = Logger.getLogger( FlatLaf.class.getName() );
private static final String DESKTOPFONTHINTS = "awt.font.desktophints"; private static final String DESKTOPFONTHINTS = "awt.font.desktophints";
private static List<Object> customDefaultsSources; private static List<Object> customDefaultsSources;
@@ -91,9 +89,6 @@ public abstract class FlatLaf
private Consumer<UIDefaults> postInitialization; private Consumer<UIDefaults> postInitialization;
private Boolean oldFrameWindowDecorated;
private Boolean oldDialogWindowDecorated;
/** /**
* Sets the application look and feel to the given LaF * Sets the application look and feel to the given LaF
* using {@link UIManager#setLookAndFeel(javax.swing.LookAndFeel)}. * using {@link UIManager#setLookAndFeel(javax.swing.LookAndFeel)}.
@@ -103,7 +98,7 @@ public abstract class FlatLaf
UIManager.setLookAndFeel( newLookAndFeel ); UIManager.setLookAndFeel( newLookAndFeel );
return true; return true;
} catch( Exception ex ) { } catch( Exception ex ) {
LOG.log( Level.SEVERE, "FlatLaf: Failed to initialize look and feel '" + newLookAndFeel.getClass().getName() + "'.", ex ); LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to initialize look and feel '" + newLookAndFeel.getClass().getName() + "'.", ex );
return false; return false;
} }
} }
@@ -145,28 +140,28 @@ public abstract class FlatLaf
* Returns whether FlatLaf supports custom window decorations. * Returns whether FlatLaf supports custom window decorations.
* This depends on the operating system and on the used Java runtime. * This depends on the operating system and on the used Java runtime.
* <p> * <p>
* To use custom window decorations in your application, enable them with * This method returns {@code true} on Windows 10 (see exception below), {@code false} otherwise.
* following code (before creating any frames or dialogs). Then custom window
* decorations are only enabled if this method returns {@code true}.
* <pre>
* JFrame.setDefaultLookAndFeelDecorated( true );
* JDialog.setDefaultLookAndFeelDecorated( true );
* </pre>
* <p> * <p>
* Returns {@code true} on Windows 10, {@code false} otherwise. * Returns also {@code false} on Windows 10 if:
* <p> * <ul>
* Return also {@code false} if running on Windows 10 in * <li>FlatLaf native window border support is available (requires Windows 10)</li>
* <li>running in
* <a href="https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime">JetBrains Runtime 11 (or later)</a> * <a href="https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime">JetBrains Runtime 11 (or later)</a>
* (<a href="https://github.com/JetBrains/JetBrainsRuntime">source code on github</a>) * (<a href="https://github.com/JetBrains/JetBrainsRuntime">source code on github</a>)
* and JBR supports custom window decorations. In this case, JBR custom decorations * and JBR supports custom window decorations
* are enabled if {@link JFrame#isDefaultLookAndFeelDecorated()} or * </li>
* {@link JDialog#isDefaultLookAndFeelDecorated()} return {@code true}. * </ul>
* In this cases, custom decorations are enabled by the root pane.
* Usage of {@link JFrame#setDefaultLookAndFeelDecorated(boolean)} or
* {@link JDialog#setDefaultLookAndFeelDecorated(boolean)} is not necessary.
*/ */
@Override @Override
public boolean getSupportsWindowDecorations() { public boolean getSupportsWindowDecorations() {
if( SystemInfo.isJetBrainsJVM_11_orLater && if( SystemInfo.isProjector )
SystemInfo.isWindows_10_orLater && return false;
JBRCustomDecorations.isSupported() )
if( SystemInfo.isWindows_10_orLater &&
FlatNativeWindowBorder.isSupported() )
return false; return false;
return SystemInfo.isWindows_10_orLater; return SystemInfo.isWindows_10_orLater;
@@ -262,19 +257,9 @@ public abstract class FlatLaf
Color linkColor = defaults.getColor( "Component.linkColor" ); Color linkColor = defaults.getColor( "Component.linkColor" );
if( linkColor != null ) { if( linkColor != null ) {
new HTMLEditorKit().getStyleSheet().addRule( new HTMLEditorKit().getStyleSheet().addRule(
String.format( "a { color: #%06x; }", linkColor.getRGB() & 0xffffff ) ); String.format( "a, address { color: #%06x; }", linkColor.getRGB() & 0xffffff ) );
} }
}; };
// enable/disable window decorations, but only if system property is either
// "true" or "false"; in other cases it is not changed
Boolean useWindowDecorations = FlatSystemProperties.getBooleanStrict( FlatSystemProperties.USE_WINDOW_DECORATIONS, null );
if( useWindowDecorations != null ) {
oldFrameWindowDecorated = JFrame.isDefaultLookAndFeelDecorated();
oldDialogWindowDecorated = JDialog.isDefaultLookAndFeelDecorated();
JFrame.setDefaultLookAndFeelDecorated( useWindowDecorations );
JDialog.setDefaultLookAndFeelDecorated( useWindowDecorations );
}
} }
@Override @Override
@@ -304,17 +289,9 @@ public abstract class FlatLaf
} }
// restore default link color // restore default link color
new HTMLEditorKit().getStyleSheet().addRule( "a { color: blue; }" ); new HTMLEditorKit().getStyleSheet().addRule( "a, address { color: blue; }" );
postInitialization = null; postInitialization = null;
// restore enable/disable window decorations
if( oldFrameWindowDecorated != null ) {
JFrame.setDefaultLookAndFeelDecorated( oldFrameWindowDecorated );
JDialog.setDefaultLookAndFeelDecorated( oldDialogWindowDecorated );
oldFrameWindowDecorated = null;
oldDialogWindowDecorated = null;
}
super.uninitialize(); super.uninitialize();
} }
@@ -341,7 +318,7 @@ public abstract class FlatLaf
} else } else
aquaLaf = (BasicLookAndFeel) Class.forName( aquaLafClassName ).newInstance(); aquaLaf = (BasicLookAndFeel) Class.forName( aquaLafClassName ).newInstance();
} catch( Exception ex ) { } catch( Exception ex ) {
LOG.log( Level.SEVERE, "FlatLaf: Failed to initialize Aqua look and feel '" + aquaLafClassName + "'.", ex ); LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to initialize Aqua look and feel '" + aquaLafClassName + "'.", ex );
throw new IllegalStateException(); throw new IllegalStateException();
} }
@@ -467,8 +444,13 @@ public abstract class FlatLaf
} else if( SystemInfo.isMacOS ) { } else if( SystemInfo.isMacOS ) {
String fontName; String fontName;
if( SystemInfo.isMacOS_10_15_Catalina_orLater ) { if( SystemInfo.isMacOS_10_15_Catalina_orLater ) {
if (SystemInfo.isJetBrainsJVM_11_orLater) {
// See https://youtrack.jetbrains.com/issue/JBR-1915
fontName = ".AppleSystemUIFont";
} else {
// use Helvetica Neue font // use Helvetica Neue font
fontName = "Helvetica Neue"; fontName = "Helvetica Neue";
}
} else if( SystemInfo.isMacOS_10_11_ElCapitan_orLater ) { } else if( SystemInfo.isMacOS_10_11_ElCapitan_orLater ) {
// use San Francisco Text font // use San Francisco Text font
fontName = ".SF NS Text"; fontName = ".SF NS Text";
@@ -517,6 +499,13 @@ public abstract class FlatLaf
return (font instanceof FontUIResource) ? (FontUIResource) font : new FontUIResource( font ); return (font instanceof FontUIResource) ? (FontUIResource) font : new FontUIResource( font );
} }
/**
* @since 1.1
*/
public static ActiveValue createActiveFontValue( float scaleFactor ) {
return new ActiveFont( scaleFactor );
}
/** /**
* Adds the default color palette for action icons and object icons to the given UIDefaults. * Adds the default color palette for action icons and object icons to the given UIDefaults.
* <p> * <p>
@@ -541,7 +530,12 @@ public abstract class FlatLaf
} }
private void putAATextInfo( UIDefaults defaults ) { 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 ); Object desktopHints = Toolkit.getDefaultToolkit().getDesktopProperty( DESKTOPFONTHINTS );
if( desktopHints instanceof Map ) { if( desktopHints instanceof Map ) {
@SuppressWarnings( "unchecked" ) @SuppressWarnings( "unchecked" )
@@ -567,7 +561,7 @@ public abstract class FlatLaf
.invoke( null, true ); .invoke( null, true );
defaults.put( key, value ); defaults.put( key, value );
} catch( Exception ex ) { } catch( Exception ex ) {
Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex ); LoggingFacade.INSTANCE.logSevere( null, ex );
throw new RuntimeException( ex ); throw new RuntimeException( ex );
} }
} }
@@ -674,7 +668,7 @@ public abstract class FlatLaf
// update UI // update UI
updateUI(); updateUI();
} catch( UnsupportedLookAndFeelException ex ) { } catch( UnsupportedLookAndFeelException ex ) {
LOG.log( Level.SEVERE, "FlatLaf: Failed to reinitialize look and feel '" + lookAndFeel.getClass().getName() + "'.", ex ); LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to reinitialize look and feel '" + lookAndFeel.getClass().getName() + "'.", ex );
} }
} ); } );
} }

View File

@@ -16,9 +16,6 @@
package com.formdev.flatlaf; package com.formdev.flatlaf;
import javax.swing.JDialog;
import javax.swing.JFrame;
/** /**
* Defines/documents own system properties used in FlatLaf. * Defines/documents own system properties used in FlatLaf.
* *
@@ -58,11 +55,15 @@ public interface FlatSystemProperties
String USE_UBUNTU_FONT = "flatlaf.useUbuntuFont"; String USE_UBUNTU_FONT = "flatlaf.useUbuntuFont";
/** /**
* Specifies whether custom look and feel window decorations should be used * Specifies whether FlatLaf native window decorations should be used
* when creating {@code JFrame} or {@code JDialog}. * when creating {@code JFrame} or {@code JDialog}.
* <p> * <p>
* If this system property is set, FlatLaf invokes {@link JFrame#setDefaultLookAndFeelDecorated(boolean)} * Setting this to {@code true} forces using FlatLaf native window decorations
* and {@link JDialog#setDefaultLookAndFeelDecorated(boolean)} on LaF initialization. * even if they are not enabled by the application.
* <p>
* Setting this to {@code false} disables using FlatLaf native window decorations.
* <p>
* (requires Window 10)
* <p> * <p>
* <strong>Allowed Values</strong> {@code false} and {@code true}<br> * <strong>Allowed Values</strong> {@code false} and {@code true}<br>
* <strong>Default</strong> none * <strong>Default</strong> none
@@ -79,14 +80,20 @@ public interface FlatSystemProperties
* Setting this to {@code true} forces using JetBrains Runtime custom window decorations * Setting this to {@code true} forces using JetBrains Runtime custom window decorations
* even if they are not enabled by the application. * even if they are not enabled by the application.
* <p> * <p>
* Setting this to {@code false} disables using JetBrains Runtime custom window decorations.
* <p>
* (requires Window 10)
* <p>
* <strong>Allowed Values</strong> {@code false} and {@code true}<br> * <strong>Allowed Values</strong> {@code false} and {@code true}<br>
* <strong>Default</strong> {@code true} * <strong>Default</strong> none
*/ */
String USE_JETBRAINS_CUSTOM_DECORATIONS = "flatlaf.useJetBrainsCustomDecorations"; String USE_JETBRAINS_CUSTOM_DECORATIONS = "flatlaf.useJetBrainsCustomDecorations";
/** /**
* Specifies whether menubar is embedded into custom window decorations. * Specifies whether menubar is embedded into custom window decorations.
* <p> * <p>
* (requires Window 10)
* <p>
* <strong>Allowed Values</strong> {@code false} and {@code true}<br> * <strong>Allowed Values</strong> {@code false} and {@code true}<br>
* <strong>Default</strong> {@code true} * <strong>Default</strong> {@code true}
*/ */

View File

@@ -16,6 +16,7 @@
package com.formdev.flatlaf; package com.formdev.flatlaf;
import java.awt.Color;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
@@ -29,11 +30,11 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.logging.Level;
import javax.swing.UIDefaults; import javax.swing.UIDefaults;
import javax.swing.plaf.ColorUIResource; import javax.swing.plaf.ColorUIResource;
import com.formdev.flatlaf.json.Json; import com.formdev.flatlaf.json.Json;
import com.formdev.flatlaf.json.ParseException; import com.formdev.flatlaf.json.ParseException;
import com.formdev.flatlaf.util.LoggingFacade;
import com.formdev.flatlaf.util.StringUtils; import com.formdev.flatlaf.util.StringUtils;
/** /**
@@ -56,6 +57,8 @@ public class IntelliJTheme
public final boolean dark; public final boolean dark;
public final String author; public final String author;
private final boolean isMaterialUILite;
private final Map<String, String> colors; private final Map<String, String> colors;
private final Map<String, Object> ui; private final Map<String, Object> ui;
private final Map<String, Object> icons; private final Map<String, Object> icons;
@@ -73,7 +76,7 @@ public class IntelliJTheme
try { try {
return FlatLaf.install( createLaf( in ) ); return FlatLaf.install( createLaf( in ) );
} catch( Exception ex ) { } catch( Exception ex ) {
FlatLaf.LOG.log( Level.SEVERE, "FlatLaf: Failed to load IntelliJ theme", ex ); LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to load IntelliJ theme", ex );
return false; return false;
} }
} }
@@ -119,6 +122,8 @@ public class IntelliJTheme
dark = Boolean.parseBoolean( (String) json.get( "dark" ) ); dark = Boolean.parseBoolean( (String) json.get( "dark" ) );
author = (String) json.get( "author" ); author = (String) json.get( "author" );
isMaterialUILite = author.equals( "Mallowigi" );
colors = (Map<String, String>) json.get( "colors" ); colors = (Map<String, String>) json.get( "colors" );
ui = (Map<String, Object>) json.get( "ui" ); ui = (Map<String, Object>) json.get( "ui" );
icons = (Map<String, Object>) json.get( "icons" ); icons = (Map<String, Object>) json.get( "icons" );
@@ -156,6 +161,11 @@ public class IntelliJTheme
defaults.put( "Button.disabledBackground", panelBackground ); defaults.put( "Button.disabledBackground", panelBackground );
defaults.put( "ToggleButton.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 // 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 helpButtonBackground = defaults.get( "Button.startBackground" );
Object helpButtonBorderColor = defaults.get( "Button.startBorderColor" ); Object helpButtonBorderColor = defaults.get( "Button.startBorderColor" );
@@ -205,6 +215,12 @@ public class IntelliJTheme
if( !uiKeys.contains( "ToggleButton.foreground" ) && uiKeys.contains( "Button.foreground" ) ) if( !uiKeys.contains( "ToggleButton.foreground" ) && uiKeys.contains( "Button.foreground" ) )
defaults.put( "ToggleButton.foreground", defaults.get( "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 // limit tree row height
int rowHeight = defaults.getInt( "Tree.rowHeight" ); int rowHeight = defaults.getInt( "Tree.rowHeight" );
if( rowHeight > 22 ) if( rowHeight > 22 )
@@ -225,10 +241,17 @@ public class IntelliJTheme
// remove theme specific UI defaults and remember only those for current theme // remove theme specific UI defaults and remember only those for current theme
Map<Object, Object> themeSpecificDefaults = new HashMap<>(); Map<Object, Object> themeSpecificDefaults = new HashMap<>();
String currentThemePrefix = '[' + name.replace( ' ', '_' ) + ']'; String currentThemePrefix = '[' + name.replace( ' ', '_' ) + ']';
String currentAuthorPrefix = "[author-" + author.replace( ' ', '_' ) + ']';
String allThemesPrefix = "[*]";
String[] prefixes = { currentThemePrefix, currentAuthorPrefix, allThemesPrefix };
for( String key : themeSpecificKeys ) { for( String key : themeSpecificKeys ) {
Object value = defaults.remove( key ); Object value = defaults.remove( key );
if( key.startsWith( currentThemePrefix ) ) for( String prefix : prefixes ) {
themeSpecificDefaults.put( key.substring( currentThemePrefix.length() ), value ); if( key.startsWith( prefix ) ) {
themeSpecificDefaults.put( key.substring( prefix.length() ), value );
break;
}
}
} }
return themeSpecificDefaults; return themeSpecificDefaults;
@@ -269,7 +292,6 @@ public class IntelliJTheme
uiKeys.add( key ); uiKeys.add( key );
// fix ComboBox size and Spinner border in all Material UI Lite themes // 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" )) ) if( isMaterialUILite && (key.equals( "ComboBox.padding" ) || key.equals( "Spinner.border" )) )
return; // ignore return; // ignore
@@ -302,7 +324,7 @@ public class IntelliJTheme
try { try {
uiValue = UIDefaultsLoader.parseValue( key, valueStr ); uiValue = UIDefaultsLoader.parseValue( key, valueStr );
} catch( RuntimeException ex ) { } catch( RuntimeException ex ) {
UIDefaultsLoader.logParseError( Level.CONFIG, key, valueStr, ex ); UIDefaultsLoader.logParseError( key, valueStr, ex, false );
return; // ignore invalid value return; // ignore invalid value
} }
} }
@@ -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". * this two components are specified in "icons > ColorPalette".
* FlatLaf uses vector icons and expects colors for the two components in UI defaults. * FlatLaf uses vector icons and expects colors for the two components in UI defaults.
*/ */
@@ -453,27 +475,43 @@ public class IntelliJTheme
} }
} }
// remove hover and pressed colors // update hover, pressed and focused colors
if( checkboxModified ) { if( checkboxModified ) {
// for non-filled checkbox/radiobutton used in dark themes
defaults.remove( "CheckBox.icon.focusWidth" ); defaults.remove( "CheckBox.icon.focusWidth" );
defaults.remove( "CheckBox.icon.hoverBorderColor" ); defaults.put( "CheckBox.icon.hoverBorderColor", defaults.get( "CheckBox.icon.focusedBorderColor" ) );
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" );
// for filled checkbox/radiobutton used in light themes
defaults.remove( "CheckBox.icon[filled].focusWidth" ); defaults.remove( "CheckBox.icon[filled].focusWidth" );
defaults.remove( "CheckBox.icon[filled].hoverBorderColor" ); defaults.put( "CheckBox.icon[filled].hoverBorderColor", defaults.get( "CheckBox.icon[filled].focusedBorderColor" ) );
defaults.remove( "CheckBox.icon[filled].focusedBackground" ); defaults.put( "CheckBox.icon[filled].selectedFocusedBackground", defaults.get( "CheckBox.icon[filled].selectedBackground" ) );
defaults.remove( "CheckBox.icon[filled].hoverBackground" );
defaults.remove( "CheckBox.icon[filled].pressedBackground" ); if( dark ) {
defaults.remove( "CheckBox.icon[filled].selectedFocusedBackground" ); // IDEA Darcula checkBoxFocused.svg, checkBoxSelectedFocused.svg,
defaults.remove( "CheckBox.icon[filled].selectedHoverBackground" ); // radioFocused.svg and radioSelectedFocused.svg
defaults.remove( "CheckBox.icon[filled].selectedPressedBackground" ); // 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). */ /** Rename UI default keys (key --> value). */
private static Map<String, String> uiKeyMapping = new HashMap<>(); private static Map<String, String> uiKeyMapping = new HashMap<>();
@@ -507,6 +545,7 @@ public class IntelliJTheme
uiKeyCopying.put( "CheckBoxMenuItem.margin", "MenuItem.margin" ); uiKeyCopying.put( "CheckBoxMenuItem.margin", "MenuItem.margin" );
uiKeyCopying.put( "RadioButtonMenuItem.margin", "MenuItem.margin" ); uiKeyCopying.put( "RadioButtonMenuItem.margin", "MenuItem.margin" );
uiKeyMapping.put( "PopupMenu.border", "PopupMenu.borderInsets" ); uiKeyMapping.put( "PopupMenu.border", "PopupMenu.borderInsets" );
uiKeyCopying.put( "MenuItem.underlineSelectionColor", "TabbedPane.underlineColor" );
// IDEA uses List.selectionBackground also for menu selection // IDEA uses List.selectionBackground also for menu selection
uiKeyCopying.put( "Menu.selectionBackground", "List.selectionBackground" ); uiKeyCopying.put( "Menu.selectionBackground", "List.selectionBackground" );

View File

@@ -28,7 +28,8 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.logging.Level;
import com.formdev.flatlaf.util.LoggingFacade;
import com.formdev.flatlaf.util.StringUtils; import com.formdev.flatlaf.util.StringUtils;
import com.formdev.flatlaf.util.SystemInfo; import com.formdev.flatlaf.util.SystemInfo;
import com.formdev.flatlaf.util.UIScale; import com.formdev.flatlaf.util.UIScale;
@@ -172,7 +173,7 @@ class LinuxFontPolicy
if( "1".equals( strs.get( 5 ) ) ) if( "1".equals( strs.get( 5 ) ) )
style |= Font.ITALIC; style |= Font.ITALIC;
} catch( RuntimeException ex ) { } catch( RuntimeException ex ) {
FlatLaf.LOG.log( Level.CONFIG, "FlatLaf: Failed to parse 'font=" + generalFont + "'.", ex ); LoggingFacade.INSTANCE.logConfig( "FlatLaf: Failed to parse 'font=" + generalFont + "'.", ex );
} }
} }
@@ -186,7 +187,7 @@ class LinuxFontPolicy
if( dpi < 50 ) if( dpi < 50 )
dpi = 50; dpi = 50;
} catch( NumberFormatException ex ) { } catch( NumberFormatException ex ) {
FlatLaf.LOG.log( Level.CONFIG, "FlatLaf: Failed to parse 'forceFontDPI=" + forceFontDPI + "'.", ex ); LoggingFacade.INSTANCE.logConfig( "FlatLaf: Failed to parse 'forceFontDPI=" + forceFontDPI + "'.", ex );
} }
} }
@@ -225,7 +226,7 @@ class LinuxFontPolicy
while( (line = reader.readLine()) != null ) while( (line = reader.readLine()) != null )
lines.add( line ); lines.add( line );
} catch( IOException ex ) { } catch( IOException ex ) {
FlatLaf.LOG.log( Level.CONFIG, "FlatLaf: Failed to read '" + filename + "'.", ex ); LoggingFacade.INSTANCE.logConfig( "FlatLaf: Failed to read '" + filename + "'.", ex );
} }
return lines; return lines;
} }

View File

@@ -33,7 +33,6 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Properties; import java.util.Properties;
import java.util.function.Function; import java.util.function.Function;
import java.util.logging.Level;
import javax.swing.UIDefaults; import javax.swing.UIDefaults;
import javax.swing.UIManager; import javax.swing.UIManager;
import javax.swing.UIDefaults.ActiveValue; import javax.swing.UIDefaults.ActiveValue;
@@ -48,6 +47,7 @@ import com.formdev.flatlaf.util.ColorFunctions.ColorFunction;
import com.formdev.flatlaf.util.DerivedColor; import com.formdev.flatlaf.util.DerivedColor;
import com.formdev.flatlaf.util.GrayFilter; import com.formdev.flatlaf.util.GrayFilter;
import com.formdev.flatlaf.util.HSLColor; import com.formdev.flatlaf.util.HSLColor;
import com.formdev.flatlaf.util.LoggingFacade;
import com.formdev.flatlaf.util.StringUtils; import com.formdev.flatlaf.util.StringUtils;
import com.formdev.flatlaf.util.SystemInfo; import com.formdev.flatlaf.util.SystemInfo;
import com.formdev.flatlaf.util.UIScale; import com.formdev.flatlaf.util.UIScale;
@@ -70,7 +70,9 @@ class UIDefaultsLoader
private static final String VARIABLE_PREFIX = "@"; private static final String VARIABLE_PREFIX = "@";
private static final String PROPERTY_PREFIX = "$"; private static final String PROPERTY_PREFIX = "$";
private static final String OPTIONAL_PREFIX = "?"; private static final String OPTIONAL_PREFIX = "?";
private static final String GLOBAL_PREFIX = "*."; private static final String WILDCARD_PREFIX = "*.";
private static int parseColorDepth;
static void loadDefaultsFromProperties( Class<?> lookAndFeelClass, List<FlatDefaultsAddon> addons, static void loadDefaultsFromProperties( Class<?> lookAndFeelClass, List<FlatDefaultsAddon> addons,
Properties additionalDefaults, boolean dark, UIDefaults defaults ) Properties additionalDefaults, boolean dark, UIDefaults defaults )
@@ -119,7 +121,7 @@ class UIDefaultsLoader
addonClassLoaders.add( addonClassLoader ); addonClassLoaders.add( addonClassLoader );
} }
// load custom properties files (usually provides by applications) // load custom properties files (usually provided by applications)
List<Object> customDefaultsSources = FlatLaf.getCustomDefaultsSources(); List<Object> customDefaultsSources = FlatLaf.getCustomDefaultsSources();
int size = (customDefaultsSources != null) ? customDefaultsSources.size() : 0; int size = (customDefaultsSources != null) ? customDefaultsSources.size() : 0;
for( int i = 0; i < size; i++ ) { for( int i = 0; i < size; i++ ) {
@@ -198,19 +200,19 @@ class UIDefaultsLoader
} }
} }
// get (and remove) globals, which override all other defaults that end with same suffix // get (and remove) wildcard replacements, which override all other defaults that end with same suffix
HashMap<String, String> globals = new HashMap<>(); HashMap<String, String> wildcards = new HashMap<>();
Iterator<Entry<Object, Object>> it = properties.entrySet().iterator(); Iterator<Entry<Object, Object>> it = properties.entrySet().iterator();
while( it.hasNext() ) { while( it.hasNext() ) {
Entry<Object, Object> e = it.next(); Entry<Object, Object> e = it.next();
String key = (String) e.getKey(); String key = (String) e.getKey();
if( key.startsWith( GLOBAL_PREFIX ) ) { if( key.startsWith( WILDCARD_PREFIX ) ) {
globals.put( key.substring( GLOBAL_PREFIX.length() ), (String) e.getValue() ); wildcards.put( key.substring( WILDCARD_PREFIX.length() ), (String) e.getValue() );
it.remove(); it.remove();
} }
} }
// override UI defaults with globals // override UI defaults with wildcard replacements
for( Object key : defaults.keySet() ) { for( Object key : defaults.keySet() ) {
int dot; int dot;
if( !(key instanceof String) || if( !(key instanceof String) ||
@@ -218,10 +220,10 @@ class UIDefaultsLoader
(dot = ((String)key).lastIndexOf( '.' )) < 0 ) (dot = ((String)key).lastIndexOf( '.' )) < 0 )
continue; continue;
String globalKey = ((String)key).substring( dot + 1 ); String wildcardKey = ((String)key).substring( dot + 1 );
String globalValue = globals.get( globalKey ); String wildcardValue = wildcards.get( wildcardKey );
if( globalValue != null ) if( wildcardValue != null )
properties.put( key, globalValue ); properties.put( key, wildcardValue );
} }
Function<String, String> propertiesGetter = key -> { Function<String, String> propertiesGetter = key -> {
@@ -241,16 +243,20 @@ class UIDefaultsLoader
try { try {
defaults.put( key, parseValue( key, value, null, resolver, addonClassLoaders ) ); defaults.put( key, parseValue( key, value, null, resolver, addonClassLoaders ) );
} catch( RuntimeException ex ) { } catch( RuntimeException ex ) {
logParseError( Level.SEVERE, key, value, ex ); logParseError( key, value, ex, true );
} }
} }
} catch( IOException ex ) { } catch( IOException ex ) {
FlatLaf.LOG.log( Level.SEVERE, "FlatLaf: Failed to load properties files.", ex ); LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to load properties files.", ex );
} }
} }
static void logParseError( Level level, String key, String value, RuntimeException ex ) { static void logParseError( String key, String value, RuntimeException ex, boolean severe ) {
FlatLaf.LOG.log( level, "FlatLaf: Failed to parse: '" + key + '=' + value + '\'', ex ); String message = "FlatLaf: Failed to parse: '" + key + '=' + value + '\'';
if( severe )
LoggingFacade.INSTANCE.logSevere( message, ex );
else
LoggingFacade.INSTANCE.logConfig( message, ex );
} }
static String resolveValue( String value, Function<String, String> propertiesGetter ) { static String resolveValue( String value, Function<String, String> propertiesGetter ) {
@@ -341,7 +347,12 @@ class UIDefaultsLoader
// determine value type from key // determine value type from key
if( valueType == ValueType.UNKNOWN ) { 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; valueType = ValueType.COLOR;
else if( key.endsWith( ".border" ) || key.endsWith( "Border" ) ) else if( key.endsWith( ".border" ) || key.endsWith( "Border" ) )
valueType = ValueType.BORDER; valueType = ValueType.BORDER;
@@ -356,8 +367,6 @@ class UIDefaultsLoader
valueType = ValueType.INTEGER; valueType = ValueType.INTEGER;
else if( key.endsWith( "Char" ) ) else if( key.endsWith( "Char" ) )
valueType = ValueType.CHARACTER; valueType = ValueType.CHARACTER;
else if( key.endsWith( "UI" ) )
valueType = ValueType.STRING;
else if( key.endsWith( "grayFilter" ) ) else if( key.endsWith( "grayFilter" ) )
valueType = ValueType.GRAYFILTER; valueType = ValueType.GRAYFILTER;
} }
@@ -435,7 +444,7 @@ class UIDefaultsLoader
try { try {
return findClass( value, addonClassLoaders ).newInstance(); return findClass( value, addonClassLoaders ).newInstance();
} catch( InstantiationException | IllegalAccessException | ClassNotFoundException ex ) { } catch( InstantiationException | IllegalAccessException | ClassNotFoundException ex ) {
FlatLaf.LOG.log( Level.SEVERE, "FlatLaf: Failed to instantiate '" + value + "'.", ex ); LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to instantiate '" + value + "'.", ex );
return null; return null;
} }
}; };
@@ -446,7 +455,7 @@ class UIDefaultsLoader
try { try {
return findClass( value, addonClassLoaders ); return findClass( value, addonClassLoaders );
} catch( ClassNotFoundException ex ) { } catch( ClassNotFoundException ex ) {
FlatLaf.LOG.log( Level.SEVERE, "FlatLaf: Failed to find class '" + value + "'.", ex ); LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to find class '" + value + "'.", ex );
return null; return null;
} }
}; };
@@ -577,6 +586,11 @@ class UIDefaultsLoader
if( params.isEmpty() ) if( params.isEmpty() )
throw new IllegalArgumentException( "missing parameters in function '" + value + "'" ); throw new IllegalArgumentException( "missing parameters in function '" + value + "'" );
if( parseColorDepth > 100 )
throw new IllegalArgumentException( "endless recursion in color function '" + value + "'" );
parseColorDepth++;
try {
switch( function ) { switch( function ) {
case "rgb": return parseColorRgbOrRgba( false, params, resolver, reportError ); case "rgb": return parseColorRgbOrRgba( false, params, resolver, reportError );
case "rgba": return parseColorRgbOrRgba( true, params, resolver, reportError ); case "rgba": return parseColorRgbOrRgba( true, params, resolver, reportError );
@@ -591,6 +605,9 @@ class UIDefaultsLoader
case "fade": return parseColorFade( params, resolver, reportError ); case "fade": return parseColorFade( params, resolver, reportError );
case "spin": return parseColorSpin( params, resolver, reportError ); case "spin": return parseColorSpin( params, resolver, reportError );
} }
} finally {
parseColorDepth--;
}
throw new IllegalArgumentException( "unknown color function '" + value + "'" ); throw new IllegalArgumentException( "unknown color function '" + value + "'" );
} }
@@ -915,7 +932,7 @@ class UIDefaultsLoader
Object value = UIManager.get( uiKey ); Object value = UIManager.get( uiKey );
if( value == null && !optional ) if( value == null && !optional )
FlatLaf.LOG.log( Level.SEVERE, "FlatLaf: '" + uiKey + "' not found in UI defaults." ); LoggingFacade.INSTANCE.logSevere( "FlatLaf: '" + uiKey + "' not found in UI defaults.", null );
return value; return value;
} }
} }

View File

@@ -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 );
}
}

View File

@@ -49,15 +49,16 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
* @uiDefault CheckBox.icon.disabledBorderColor Color * @uiDefault CheckBox.icon.disabledBorderColor Color
* @uiDefault CheckBox.icon.disabledBackground Color * @uiDefault CheckBox.icon.disabledBackground Color
* @uiDefault CheckBox.icon.disabledCheckmarkColor 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.focusedBackground Color optional
* @uiDefault CheckBox.icon.selectedFocusedBorderColor Color optional * @uiDefault CheckBox.icon.selectedFocusedBorderColor Color optional; CheckBox.icon.focusedBorderColor is used if not specified
* @uiDefault CheckBox.icon.selectedFocusedBackground Color optional * @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.hoverBorderColor Color optional
* @uiDefault CheckBox.icon.hoverBackground 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.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 * @uiDefault CheckBox.arc int
* *
* @author Karl Tauber * @author Karl Tauber
@@ -145,7 +146,14 @@ public class FlatCheckBoxIcon
paintBorder( c, g ); paintBorder( c, g );
// paint background // paint background
g.setColor( FlatUIUtils.deriveColor( getBackground( c, selected ), background ) ); 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 ); paintBackground( c, g );
// paint checkmark // paint checkmark

View File

@@ -31,6 +31,8 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
* *
* @uiDefault Component.focusWidth int * @uiDefault Component.focusWidth int
* @uiDefault Component.focusColor Color * @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.borderColor Color
* @uiDefault HelpButton.disabledBorderColor Color * @uiDefault HelpButton.disabledBorderColor Color
* @uiDefault HelpButton.focusedBorderColor Color * @uiDefault HelpButton.focusedBorderColor Color
@@ -50,6 +52,8 @@ public class FlatHelpButtonIcon
{ {
protected final int focusWidth = UIManager.getInt( "Component.focusWidth" ); protected final int focusWidth = UIManager.getInt( "Component.focusWidth" );
protected final Color focusColor = UIManager.getColor( "Component.focusColor" ); 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 borderColor = UIManager.getColor( "HelpButton.borderColor" );
protected final Color disabledBorderColor = UIManager.getColor( "HelpButton.disabledBorderColor" ); protected final Color disabledBorderColor = UIManager.getColor( "HelpButton.disabledBorderColor" );
@@ -84,12 +88,18 @@ public class FlatHelpButtonIcon
boolean enabled = c.isEnabled(); boolean enabled = c.isEnabled();
boolean focused = FlatUIUtils.isPermanentFocusOwner( c ); 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 ) ) { if( focused && FlatButtonUI.isFocusPainted( c ) ) {
g2.setColor( focusColor ); 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 // paint border
g2.setColor( FlatButtonUI.buttonStateColor( c, g2.setColor( FlatButtonUI.buttonStateColor( c,
borderColor, borderColor,
@@ -97,7 +107,19 @@ public class FlatHelpButtonIcon
focusedBorderColor, focusedBorderColor,
hoverBorderColor, hoverBorderColor,
null ) ); 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 // paint background
g2.setColor( FlatUIUtils.deriveColor( FlatButtonUI.buttonStateColor( c, g2.setColor( FlatUIUtils.deriveColor( FlatButtonUI.buttonStateColor( c,
@@ -106,7 +128,7 @@ public class FlatHelpButtonIcon
focusedBackground, focusedBackground,
hoverBackground, hoverBackground,
pressedBackground ), background ) ); 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 // paint question mark
Path2D q = new Path2D.Float(); Path2D q = new Path2D.Float();

View File

@@ -17,16 +17,13 @@
package com.formdev.flatlaf.ui; package com.formdev.flatlaf.ui;
import static com.formdev.flatlaf.util.UIScale.scale; import static com.formdev.flatlaf.util.UIScale.scale;
import java.awt.BasicStroke;
import java.awt.Color; import java.awt.Color;
import java.awt.Container; import java.awt.Container;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Shape;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.geom.Path2D;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.plaf.UIResource; import javax.swing.plaf.UIResource;
import javax.swing.plaf.basic.BasicArrowButton; import javax.swing.plaf.basic.BasicArrowButton;
@@ -57,18 +54,6 @@ public class FlatArrowButton
private boolean hover; private boolean hover;
private boolean pressed; 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 )
{
this( direction, type, foreground, disabledForeground, hoverForeground, hoverBackground, null, pressedBackground );
}
public FlatArrowButton( int direction, String type, Color foreground, Color disabledForeground, public FlatArrowButton( int direction, String type, Color foreground, Color disabledForeground,
Color hoverForeground, Color hoverBackground, Color pressedForeground, Color pressedBackground ) Color hoverForeground, Color hoverBackground, Color pressedForeground, Color pressedBackground )
{ {
@@ -85,7 +70,9 @@ public class FlatArrowButton
setOpaque( false ); setOpaque( false );
setBorder( null ); setBorder( null );
if( hoverForeground != null || hoverBackground != null || pressedBackground != null ) { if( hoverForeground != null || hoverBackground != null ||
pressedForeground != null || pressedBackground != null )
{
addMouseListener( new MouseAdapter() { addMouseListener( new MouseAdapter() {
@Override @Override
public void mouseEntered( MouseEvent e ) { public void mouseEntered( MouseEvent e ) {
@@ -151,7 +138,7 @@ public class FlatArrowButton
} }
protected Color deriveForeground( Color foreground ) { protected Color deriveForeground( Color foreground ) {
return foreground; return FlatUIUtils.deriveColor( foreground, this.foreground );
} }
@Override @Override
@@ -166,8 +153,7 @@ public class FlatArrowButton
@Override @Override
public void paint( Graphics g ) { public void paint( Graphics g ) {
Graphics2D g2 = (Graphics2D)g; Object[] oldRenderingHints = FlatUIUtils.setRenderingHints( g );
FlatUIUtils.setRenderingHints( g2 );
// paint hover or pressed background // paint hover or pressed background
if( isEnabled() ) { if( isEnabled() ) {
@@ -179,7 +165,7 @@ public class FlatArrowButton
if( background != null ) { if( background != null ) {
g.setColor( deriveBackground( background ) ); g.setColor( deriveBackground( background ) );
paintBackground( g2 ); paintBackground( (Graphics2D) g );
} }
} }
@@ -191,7 +177,9 @@ public class FlatArrowButton
? hoverForeground ? hoverForeground
: foreground)) : foreground))
: disabledForeground ) ); : disabledForeground ) );
paintArrow( g2 ); paintArrow( (Graphics2D) g );
FlatUIUtils.resetRenderingHints( g, oldRenderingHints );
} }
protected void paintBackground( Graphics2D g ) { protected void paintBackground( Graphics2D g ) {
@@ -199,73 +187,14 @@ public class FlatArrowButton
} }
protected void paintArrow( Graphics2D g ) { protected void paintArrow( Graphics2D g ) {
int direction = getDirection();
boolean vert = (direction == NORTH || direction == SOUTH); boolean vert = (direction == NORTH || direction == SOUTH);
int x = 0;
// compute width/height
int w = scale( arrowWidth + (chevron ? 0 : 1) );
int h = scale( (arrowWidth / 2) + (chevron ? 0 : 1) );
// rotate width/height
int rw = vert ? w : h;
int rh = vert ? h : w;
// chevron lines end 1px outside of width/height
if( chevron ) {
// add 1px to width/height for position calculation only
rw++;
rh++;
}
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 // move arrow for round borders
Container parent = getParent(); Container parent = getParent();
if( vert && parent instanceof JComponent && FlatUIUtils.hasRoundBorder( (JComponent) parent ) ) if( vert && parent instanceof JComponent && FlatUIUtils.hasRoundBorder( (JComponent) parent ) )
x -= scale( parent.getComponentOrientation().isLeftToRight() ? 1 : -1 ); x -= scale( parent.getComponentOrientation().isLeftToRight() ? 1 : -1 );
// paint arrow FlatUIUtils.paintArrow( g, x, 0, getWidth(), getHeight(), getDirection(), chevron, arrowWidth, xOffset, yOffset );
g.translate( x, y );
/*debug
debugPaint( g, vert, rw, rh );
debug*/
Shape arrowShape = createArrowShape( direction, chevron, w, h );
if( chevron ) {
g.setStroke( new BasicStroke( scale( 1f ) ) );
g.draw( arrowShape );
} else {
// triangle
g.fill( arrowShape );
} }
g.translate( -x, -y );
}
public static Shape createArrowShape( int direction, boolean chevron, float w, float h ) {
switch( direction ) {
case NORTH: return FlatUIUtils.createPath( !chevron, 0,h, (w / 2f),0, w,h );
case SOUTH: return FlatUIUtils.createPath( !chevron, 0,0, (w / 2f),h, w,0 );
case WEST: return FlatUIUtils.createPath( !chevron, h,0, 0,(w / 2f), h,w );
case EAST: return FlatUIUtils.createPath( !chevron, 0,0, h,(w / 2f), 0,w );
default: return new Path2D.Float();
}
}
/*debug
private void debugPaint( Graphics g, boolean vert, int w, int h ) {
Color oldColor = g.getColor();
g.setColor( Color.red );
g.drawRect( 0, 0, w - 1, h - 1 );
int xy1 = -2;
int xy2 = h + 1;
for( int i = 0; i < 20; i++ ) {
g.drawRect( vert ? 0 : xy1, vert ? xy1 : 0, 0, 0 );
g.drawRect( vert ? 0 : xy2, vert ? xy2 : 0, 0, 0 );
xy1 -= 2;
xy2 += 2;
}
g.setColor( oldColor );
}
debug*/
} }

View File

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

View File

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

View File

@@ -251,7 +251,10 @@ public class FlatButtonUI
Icon icon = ((AbstractButton)c).getIcon(); Icon icon = ((AbstractButton)c).getIcon();
String text = ((AbstractButton)c).getText(); String text = ((AbstractButton)c).getText();
return (icon != null && (text == null || text.isEmpty())) || 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 ) ))));
} }
static final int TYPE_OTHER = -1; static final int TYPE_OTHER = -1;
@@ -407,8 +410,13 @@ public class FlatButtonUI
if( model.isRollover() ) if( model.isRollover() )
return toolbarHoverBackground; return toolbarHoverBackground;
// use background of toolbar // use component background if explicitly set
return c.getParent().getBackground(); Color bg = c.getBackground();
if( isCustomBackground( bg ) )
return bg;
// do not paint background
return null;
} }
boolean def = isDefaultButton( c ); boolean def = isDefaultButton( c );

View File

@@ -34,9 +34,10 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.FocusEvent; import java.awt.event.FocusEvent;
import java.awt.event.FocusListener; import java.awt.event.FocusListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener; import java.awt.event.MouseListener;
import java.awt.geom.Rectangle2D; import java.awt.geom.Rectangle2D;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import javax.swing.AbstractAction; import javax.swing.AbstractAction;
@@ -97,6 +98,7 @@ import com.formdev.flatlaf.util.UIScale;
* @uiDefault ComboBox.buttonArrowColor Color * @uiDefault ComboBox.buttonArrowColor Color
* @uiDefault ComboBox.buttonDisabledArrowColor Color * @uiDefault ComboBox.buttonDisabledArrowColor Color
* @uiDefault ComboBox.buttonHoverArrowColor Color * @uiDefault ComboBox.buttonHoverArrowColor Color
* @uiDefault ComboBox.buttonPressedArrowColor Color
* *
* @author Karl Tauber * @author Karl Tauber
*/ */
@@ -120,9 +122,11 @@ public class FlatComboBoxUI
protected Color buttonArrowColor; protected Color buttonArrowColor;
protected Color buttonDisabledArrowColor; protected Color buttonDisabledArrowColor;
protected Color buttonHoverArrowColor; protected Color buttonHoverArrowColor;
protected Color buttonPressedArrowColor;
private MouseListener hoverListener; private MouseListener hoverListener;
protected boolean hover; protected boolean hover;
protected boolean pressed;
private WeakReference<Component> lastRendererComponent; private WeakReference<Component> lastRendererComponent;
@@ -134,13 +138,36 @@ public class FlatComboBoxUI
protected void installListeners() { protected void installListeners() {
super.installListeners(); super.installListeners();
hoverListener = new FlatUIUtils.HoverListener( null, h -> { hoverListener = new MouseAdapter() {
if( !comboBox.isEditable() ) { @Override
hover = h; public void mouseEntered( MouseEvent e ) {
if( arrowButton != null ) 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(); arrowButton.repaint();
} }
} ); };
comboBox.addMouseListener( hoverListener ); comboBox.addMouseListener( hoverListener );
} }
@@ -175,6 +202,7 @@ public class FlatComboBoxUI
buttonArrowColor = UIManager.getColor( "ComboBox.buttonArrowColor" ); buttonArrowColor = UIManager.getColor( "ComboBox.buttonArrowColor" );
buttonDisabledArrowColor = UIManager.getColor( "ComboBox.buttonDisabledArrowColor" ); buttonDisabledArrowColor = UIManager.getColor( "ComboBox.buttonDisabledArrowColor" );
buttonHoverArrowColor = UIManager.getColor( "ComboBox.buttonHoverArrowColor" ); buttonHoverArrowColor = UIManager.getColor( "ComboBox.buttonHoverArrowColor" );
buttonPressedArrowColor = UIManager.getColor( "ComboBox.buttonPressedArrowColor" );
// set maximumRowCount // set maximumRowCount
int maximumRowCount = UIManager.getInt( "ComboBox.maximumRowCount" ); int maximumRowCount = UIManager.getInt( "ComboBox.maximumRowCount" );
@@ -203,6 +231,7 @@ public class FlatComboBoxUI
buttonArrowColor = null; buttonArrowColor = null;
buttonDisabledArrowColor = null; buttonDisabledArrowColor = null;
buttonHoverArrowColor = null; buttonHoverArrowColor = null;
buttonPressedArrowColor = null;
MigLayoutVisualPadding.uninstall( comboBox ); MigLayoutVisualPadding.uninstall( comboBox );
} }
@@ -244,10 +273,9 @@ public class FlatComboBoxUI
@Override @Override
protected PropertyChangeListener createPropertyChangeListener() { protected PropertyChangeListener createPropertyChangeListener() {
return new BasicComboBoxUI.PropertyChangeHandler() { PropertyChangeListener superListener = super.createPropertyChangeListener();
@Override return e -> {
public void propertyChange( PropertyChangeEvent e ) { superListener.propertyChange( e );
super.propertyChange( e );
Object source = e.getSource(); Object source = e.getSource();
String propertyName = e.getPropertyName(); String propertyName = e.getPropertyName();
@@ -267,7 +295,6 @@ public class FlatComboBoxUI
comboBox.repaint(); comboBox.repaint();
else if( FlatClientProperties.MINIMUM_WIDTH.equals( propertyName ) ) else if( FlatClientProperties.MINIMUM_WIDTH.equals( propertyName ) )
comboBox.revalidate(); comboBox.revalidate();
}
}; };
} }
@@ -352,7 +379,7 @@ public class FlatComboBoxUI
FlatUIUtils.paintParentBackground( g, c ); FlatUIUtils.paintParentBackground( g, c );
Graphics2D g2 = (Graphics2D) g; Graphics2D g2 = (Graphics2D) g;
FlatUIUtils.setRenderingHints( g2 ); Object[] oldRenderingHints = FlatUIUtils.setRenderingHints( g2 );
int width = c.getWidth(); int width = c.getWidth();
int height = c.getHeight(); int height = c.getHeight();
@@ -386,6 +413,9 @@ public class FlatComboBoxUI
g2.fill( new Rectangle2D.Float( lx, focusWidth, lw, height - 1 - (focusWidth * 2)) ); 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 ); paint( g, c );
} }
@@ -513,19 +543,26 @@ public class FlatComboBoxUI
extends FlatArrowButton extends FlatArrowButton
{ {
protected FlatComboBoxButton() { 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, 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 @Override
protected boolean isHover() { protected boolean isHover() {
return super.isHover() || (!comboBox.isEditable() ? hover : false); return super.isHover() || (!comboBox.isEditable() ? hover : false);
} }
@Override
protected boolean isPressed() {
return super.isPressed() || (!comboBox.isEditable() ? pressed : false);
}
} }
//---- class FlatComboPopup ----------------------------------------------- //---- class FlatComboPopup -----------------------------------------------
@@ -608,14 +645,12 @@ public class FlatComboBoxUI
@Override @Override
protected PropertyChangeListener createPropertyChangeListener() { protected PropertyChangeListener createPropertyChangeListener() {
return new BasicComboPopup.PropertyChangeHandler() { PropertyChangeListener superListener = super.createPropertyChangeListener();
@Override return e -> {
public void propertyChange( PropertyChangeEvent e ) { superListener.propertyChange( e );
super.propertyChange( e );
if( e.getPropertyName() == "renderer" ) if( e.getPropertyName() == "renderer" )
list.setCellRenderer( new PopupListCellRenderer() ); list.setCellRenderer( new PopupListCellRenderer() );
}
}; };
} }

View File

@@ -31,13 +31,17 @@ import javax.swing.JComboBox;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JFileChooser; import javax.swing.JFileChooser;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.JToggleButton; import javax.swing.JToggleButton;
import javax.swing.UIManager; import javax.swing.UIManager;
import javax.swing.filechooser.FileView; import javax.swing.filechooser.FileView;
import javax.swing.plaf.ComponentUI; import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.metal.MetalFileChooserUI; import javax.swing.plaf.metal.MetalFileChooserUI;
import javax.swing.table.TableCellRenderer;
import com.formdev.flatlaf.FlatClientProperties; import com.formdev.flatlaf.FlatClientProperties;
import com.formdev.flatlaf.util.ScaledImageIcon; import com.formdev.flatlaf.util.ScaledImageIcon;
import com.formdev.flatlaf.util.SystemInfo;
import com.formdev.flatlaf.util.UIScale; import com.formdev.flatlaf.util.UIScale;
/** /**
@@ -190,6 +194,62 @@ public class FlatFileChooserUI
} }
} }
@Override
protected JPanel createDetailsView( JFileChooser fc ) {
JPanel p = super.createDetailsView( fc );
if( !SystemInfo.isWindows )
return p;
// find scroll pane
JScrollPane scrollPane = null;
for( Component c : p.getComponents() ) {
if( c instanceof JScrollPane ) {
scrollPane = (JScrollPane) c;
break;
}
}
if( scrollPane == null )
return p;
// get scroll view, which should be a table
Component view = scrollPane.getViewport().getView();
if( !(view instanceof JTable) )
return p;
JTable table = (JTable) view;
// on Windows 10, the date may contain left-to-right (0x200e) and right-to-left (0x200f)
// mark characters (see https://en.wikipedia.org/wiki/Left-to-right_mark)
// when the "current user" item is selected in the "look in" combobox
// --> remove them
TableCellRenderer defaultRenderer = table.getDefaultRenderer( Object.class );
table.setDefaultRenderer( Object.class, new TableCellRenderer() {
@Override
public Component getTableCellRendererComponent( JTable table, Object value, boolean isSelected,
boolean hasFocus, int row, int column )
{
// remove left-to-right and right-to-left mark characters
if( value instanceof String && ((String)value).startsWith( "\u200e" ) ) {
String str = (String) value;
char[] buf = new char[str.length()];
int j = 0;
for( int i = 0; i < buf.length; i++ ) {
char ch = str.charAt( i );
if( ch != '\u200e' && ch != '\u200f' )
buf[j++] = ch;
}
value = new String( buf, 0, j );
}
return defaultRenderer.getTableCellRendererComponent( table, value, isSelected, hasFocus, row, column );
}
} );
return p;
}
@Override @Override
public Dimension getPreferredSize( JComponent c ) { public Dimension getPreferredSize( JComponent c ) {
return UIScale.scale( super.getPreferredSize( c ) ); return UIScale.scale( super.getPreferredSize( c ) );

View File

@@ -22,6 +22,9 @@ import java.awt.Graphics;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import javax.swing.Icon; import javax.swing.Icon;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JLabel; import javax.swing.JLabel;
@@ -96,23 +99,37 @@ public class FlatLabelUI
} }
/** /**
* Checks whether text contains HTML headings and adds a special CSS rule to * Checks whether text contains HTML tags that use "absolute-size" keywords
* re-calculate heading font sizes based on current component font size. * (e.g. "x-large") for font-size in default style sheet
* (see javax/swing/text/html/default.css).
* If yes, adds a special CSS rule (BASE_SIZE) to the HTML text, which
* re-calculates font sizes based on current component font size.
*/ */
static void updateHTMLRenderer( JComponent c, String text, boolean always ) { static void updateHTMLRenderer( JComponent c, String text, boolean always ) {
if( BasicHTML.isHTMLString( text ) && if( BasicHTML.isHTMLString( text ) &&
c.getClientProperty( "html.disable" ) != Boolean.TRUE && c.getClientProperty( "html.disable" ) != Boolean.TRUE &&
text.contains( "<h" ) && needsFontBaseSize( text ) )
(text.contains( "<h1" ) || text.contains( "<h2" ) || text.contains( "<h3" ) ||
text.contains( "<h4" ) || text.contains( "<h5" ) || text.contains( "<h6" )) )
{ {
int headIndex = text.indexOf( "<head>" ); // BASE_SIZE rule is parsed in javax.swing.text.html.StyleSheet.addRule()
String style = "<style>BASE_SIZE " + c.getFont().getSize() + "</style>"; String style = "<style>BASE_SIZE " + c.getFont().getSize() + "</style>";
if( headIndex < 0 )
style = "<head>" + style + "</head>";
int insertIndex = headIndex >= 0 ? (headIndex + "<head>".length()) : "<html>".length(); String lowerText = text.toLowerCase();
int headIndex;
int styleIndex;
int insertIndex;
if( (headIndex = lowerText.indexOf( "<head>" )) >= 0 ) {
// there is a <head> tag --> insert after <head> tag
insertIndex = headIndex + "<head>".length();
} else if( (styleIndex = lowerText.indexOf( "<style>" )) >= 0 ) {
// there is a <style> tag --> insert before <style> tag
insertIndex = styleIndex;
} else {
// no <head> or <style> tag --> insert <head> tag after <html> tag
style = "<head>" + style + "</head>";
insertIndex = "<html>".length();
}
text = text.substring( 0, insertIndex ) text = text.substring( 0, insertIndex )
+ style + style
+ text.substring( insertIndex ); + text.substring( insertIndex );
@@ -122,6 +139,44 @@ public class FlatLabelUI
BasicHTML.updateRenderer( c, text ); BasicHTML.updateRenderer( c, text );
} }
private static Set<String> tagsUseFontSizeSet;
private static boolean needsFontBaseSize( String text ) {
if( tagsUseFontSizeSet == null ) {
// tags that use font-size in javax/swing/text/html/default.css
tagsUseFontSizeSet = new HashSet<>( Arrays.asList(
"h1", "h2", "h3", "h4", "h5", "h6", "code", "kbd", "big", "small", "samp" ) );
}
// search for tags in HTML text
int textLength = text.length();
for( int i = 6; i < textLength - 1; i++ ) {
if( text.charAt( i ) == '<' ) {
switch( text.charAt( i + 1 ) ) {
// first letters of tags in tagsUseFontSizeSet
case 'b': case 'B':
case 'c': case 'C':
case 'h': case 'H':
case 'k': case 'K':
case 's': case 'S':
int tagBegin = i + 1;
for( i += 2; i < textLength; i++ ) {
if( !Character.isLetterOrDigit( text.charAt( i ) ) ) {
String tag = text.substring( tagBegin, i ).toLowerCase();
if( tagsUseFontSizeSet.contains( tag ) )
return true;
break;
}
}
break;
}
}
}
return false;
}
static Graphics createGraphicsHTMLTextYCorrection( Graphics g, JComponent c ) { static Graphics createGraphicsHTMLTextYCorrection( Graphics g, JComponent c ) {
return (c.getClientProperty( BasicHTML.propertyKey ) != null) return (c.getClientProperty( BasicHTML.propertyKey ) != null)
? HiDPIUtils.createGraphicsTextYCorrection( (Graphics2D) g ) ? HiDPIUtils.createGraphicsTextYCorrection( (Graphics2D) g )

View File

@@ -16,17 +16,22 @@
package com.formdev.flatlaf.ui; package com.formdev.flatlaf.ui;
import java.awt.Graphics;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import javax.swing.AbstractAction; import javax.swing.AbstractAction;
import javax.swing.ActionMap; import javax.swing.ActionMap;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JMenu; import javax.swing.JMenu;
import javax.swing.JMenuBar; import javax.swing.JMenuBar;
import javax.swing.JRootPane;
import javax.swing.LookAndFeel;
import javax.swing.MenuElement; import javax.swing.MenuElement;
import javax.swing.MenuSelectionManager; import javax.swing.MenuSelectionManager;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.plaf.ActionMapUIResource; import javax.swing.plaf.ActionMapUIResource;
import javax.swing.plaf.ComponentUI; import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.UIResource;
import javax.swing.plaf.basic.BasicMenuBarUI; import javax.swing.plaf.basic.BasicMenuBarUI;
import com.formdev.flatlaf.FlatLaf; import com.formdev.flatlaf.FlatLaf;
import com.formdev.flatlaf.util.SystemInfo; import com.formdev.flatlaf.util.SystemInfo;
@@ -40,12 +45,15 @@ import com.formdev.flatlaf.util.SystemInfo;
* @uiDefault MenuBar.background Color * @uiDefault MenuBar.background Color
* @uiDefault MenuBar.foreground Color * @uiDefault MenuBar.foreground Color
* @uiDefault MenuBar.border Border * @uiDefault MenuBar.border Border
* @uiDefault TitlePane.unifiedBackground boolean
* *
* @author Karl Tauber * @author Karl Tauber
*/ */
public class FlatMenuBarUI public class FlatMenuBarUI
extends BasicMenuBarUI extends BasicMenuBarUI
{ {
protected boolean unifiedBackground;
public static ComponentUI createUI( JComponent c ) { public static ComponentUI createUI( JComponent c ) {
return new FlatMenuBarUI(); return new FlatMenuBarUI();
} }
@@ -55,6 +63,15 @@ public class FlatMenuBarUI
* Do not add any functionality here. * Do not add any functionality here.
*/ */
@Override
protected void installDefaults() {
super.installDefaults();
LookAndFeel.installProperty( menuBar, "opaque", false );
unifiedBackground = UIManager.getBoolean( "TitlePane.unifiedBackground" );
}
@Override @Override
protected void installKeyboardActions() { protected void installKeyboardActions() {
super.installKeyboardActions(); super.installKeyboardActions();
@@ -67,6 +84,35 @@ public class FlatMenuBarUI
map.put( "takeFocus", new TakeFocus() ); map.put( "takeFocus", new TakeFocus() );
} }
@Override
public void update( Graphics g, JComponent c ) {
// do not fill background if menubar is embedded into title pane
if( isFillBackground( c ) ) {
g.setColor( c.getBackground() );
g.fillRect( 0, 0, c.getWidth(), c.getHeight() );
}
paint( g, c );
}
protected boolean isFillBackground( JComponent c ) {
// paint background in opaque or having custom background color
if( c.isOpaque() || !(c.getBackground() instanceof UIResource) )
return true;
// do not paint background for unified title pane
if( unifiedBackground )
return false;
// paint background in full screen mode
JRootPane rootPane = SwingUtilities.getRootPane( c );
if( rootPane == null || FlatUIUtils.isFullScreen( rootPane ) )
return true;
// do not paint background if menu bar is embedded into title pane
return rootPane.getJMenuBar() != c || !FlatRootPaneUI.isMenuBarEmbedded( rootPane );
}
//---- class TakeFocus ---------------------------------------------------- //---- class TakeFocus ----------------------------------------------------
/** /**

View File

@@ -57,6 +57,7 @@ import com.formdev.flatlaf.util.SystemInfo;
* @uiDefault MenuItem.underlineSelectionCheckBackground Color * @uiDefault MenuItem.underlineSelectionCheckBackground Color
* @uiDefault MenuItem.underlineSelectionColor Color * @uiDefault MenuItem.underlineSelectionColor Color
* @uiDefault MenuItem.underlineSelectionHeight int * @uiDefault MenuItem.underlineSelectionHeight int
* @uiDefault MenuItem.selectionBackground Color
* *
* @author Karl Tauber * @author Karl Tauber
*/ */
@@ -82,6 +83,8 @@ public class FlatMenuItemRenderer
protected final Color underlineSelectionColor = UIManager.getColor( "MenuItem.underlineSelectionColor" ); protected final Color underlineSelectionColor = UIManager.getColor( "MenuItem.underlineSelectionColor" );
protected final int underlineSelectionHeight = UIManager.getInt( "MenuItem.underlineSelectionHeight" ); protected final int underlineSelectionHeight = UIManager.getInt( "MenuItem.underlineSelectionHeight" );
protected final Color selectionBackground = UIManager.getColor( "MenuItem.selectionBackground" );
protected FlatMenuItemRenderer( JMenuItem menuItem, Icon checkIcon, Icon arrowIcon, protected FlatMenuItemRenderer( JMenuItem menuItem, Icon checkIcon, Icon arrowIcon,
Font acceleratorFont, String acceleratorDelimiter ) Font acceleratorFont, String acceleratorDelimiter )
{ {
@@ -303,7 +306,7 @@ debug*/
// then use filled icon background to indicate selection (instead of using checkIcon) // then use filled icon background to indicate selection (instead of using checkIcon)
if( menuItem.isSelected() && checkIcon != null && icon != checkIcon ) { if( menuItem.isSelected() && checkIcon != null && icon != checkIcon ) {
Rectangle r = FlatUIUtils.addInsets( iconRect, scale( checkMargins ) ); Rectangle r = FlatUIUtils.addInsets( iconRect, scale( checkMargins ) );
g.setColor( deriveBackground( checkBackground ) ); g.setColor( FlatUIUtils.deriveColor( checkBackground, selectionBackground ) );
g.fillRect( r.x, r.y, r.width, r.height ); g.fillRect( r.x, r.y, r.width, r.height );
} }

View File

@@ -0,0 +1,313 @@
/*
* Copyright 2021 FormDev Software GmbH
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.formdev.flatlaf.ui;
import java.awt.Color;
import java.awt.Rectangle;
import java.awt.Window;
import java.beans.PropertyChangeListener;
import java.util.List;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JRootPane;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.event.ChangeListener;
import com.formdev.flatlaf.FlatLaf;
import com.formdev.flatlaf.FlatSystemProperties;
import com.formdev.flatlaf.ui.JBRCustomDecorations.JBRWindowTopBorder;
import com.formdev.flatlaf.util.SystemInfo;
/**
* Support for custom window decorations with native window border.
*
* @author Karl Tauber
* @since 1.1
*/
public class FlatNativeWindowBorder
{
// check this field before using class JBRCustomDecorations to avoid unnecessary loading of that class
private static final boolean canUseJBRCustomDecorations
= SystemInfo.isJetBrainsJVM_11_orLater && SystemInfo.isWindows_10_orLater;
private static Boolean supported;
private static Provider nativeProvider;
public static boolean isSupported() {
if( canUseJBRCustomDecorations )
return JBRCustomDecorations.isSupported();
initialize();
return supported;
}
static Object install( JRootPane rootPane ) {
if( canUseJBRCustomDecorations )
return JBRCustomDecorations.install( rootPane );
if( !isSupported() )
return null;
// Check whether root pane already has a window, which is the case when switching LaF.
// Also check whether the window is displayable, which is required to install
// FlatLaf native window border.
// If the window is not displayable, then it was probably closed/disposed but not yet removed
// from the list of windows that AWT maintains and returns with Window.getWindows().
// It could be also be a window that is currently hidden, but may be shown later.
Window window = SwingUtilities.windowForComponent( rootPane );
if( window != null && window.isDisplayable() ) {
install( window, FlatSystemProperties.USE_WINDOW_DECORATIONS );
return null;
}
// Install FlatLaf native window border, which must be done late,
// when the native window is already created, because it needs access to the window.
// "ancestor" property change event is fired from JComponent.addNotify() and removeNotify().
PropertyChangeListener ancestorListener = e -> {
Object newValue = e.getNewValue();
if( newValue instanceof Window )
install( (Window) newValue, FlatSystemProperties.USE_WINDOW_DECORATIONS );
else if( newValue == null && e.getOldValue() instanceof Window )
uninstall( (Window) e.getOldValue() );
};
rootPane.addPropertyChangeListener( "ancestor", ancestorListener );
return ancestorListener;
}
static void install( Window window, String systemPropertyKey ) {
if( hasCustomDecoration( window ) )
return;
// do not enable native window border if LaF provides decorations
if( UIManager.getLookAndFeel().getSupportsWindowDecorations() )
return;
if( window instanceof JFrame ) {
JFrame frame = (JFrame) window;
// do not enable native window border if JFrame should use system window decorations
// and if not forced to use FlatLaf/JBR native window decorations
if( !JFrame.isDefaultLookAndFeelDecorated() &&
!UIManager.getBoolean( "TitlePane.useWindowDecorations" ) &&
!FlatSystemProperties.getBoolean( systemPropertyKey, false ) )
return;
// do not enable native window border if frame is undecorated
if( frame.isUndecorated() )
return;
// enable native window border for window
setHasCustomDecoration( frame, true );
// enable Swing window decoration
frame.getRootPane().setWindowDecorationStyle( JRootPane.FRAME );
} else if( window instanceof JDialog ) {
JDialog dialog = (JDialog) window;
// do not enable native window border if JDialog should use system window decorations
// and if not forced to use FlatLaf/JBR native window decorations
if( !JDialog.isDefaultLookAndFeelDecorated() &&
!UIManager.getBoolean( "TitlePane.useWindowDecorations" ) &&
!FlatSystemProperties.getBoolean( systemPropertyKey, false ) )
return;
// do not enable native window border if dialog is undecorated
if( dialog.isUndecorated() )
return;
// enable native window border for window
setHasCustomDecoration( dialog, true );
// enable Swing window decoration
dialog.getRootPane().setWindowDecorationStyle( JRootPane.PLAIN_DIALOG );
}
}
static void uninstall( JRootPane rootPane, Object data ) {
if( canUseJBRCustomDecorations ) {
JBRCustomDecorations.uninstall( rootPane, data );
return;
}
// remove listener
if( data instanceof PropertyChangeListener )
rootPane.removePropertyChangeListener( "ancestor", (PropertyChangeListener) data );
// uninstall native window border, except when switching to another FlatLaf theme
Window window = SwingUtilities.windowForComponent( rootPane );
if( window != null )
uninstall( window );
}
private static void uninstall( Window window ) {
if( !hasCustomDecoration( window ) )
return;
// do not uninstall when switching to another FlatLaf theme
if( UIManager.getLookAndFeel() instanceof FlatLaf )
return;
// disable native window border for window
setHasCustomDecoration( window, false );
if( window instanceof JFrame ) {
JFrame frame = (JFrame) window;
// disable Swing window decoration
frame.getRootPane().setWindowDecorationStyle( JRootPane.NONE );
} else if( window instanceof JDialog ) {
JDialog dialog = (JDialog) window;
// disable Swing window decoration
dialog.getRootPane().setWindowDecorationStyle( JRootPane.NONE );
}
}
public static boolean hasCustomDecoration( Window window ) {
if( canUseJBRCustomDecorations )
return JBRCustomDecorations.hasCustomDecoration( window );
if( !isSupported() )
return false;
return nativeProvider.hasCustomDecoration( window );
}
public static void setHasCustomDecoration( Window window, boolean hasCustomDecoration ) {
if( canUseJBRCustomDecorations ) {
JBRCustomDecorations.setHasCustomDecoration( window, hasCustomDecoration );
return;
}
if( !isSupported() )
return;
nativeProvider.setHasCustomDecoration( window, hasCustomDecoration );
}
static void setTitleBarHeightAndHitTestSpots( Window window, int titleBarHeight,
List<Rectangle> hitTestSpots, Rectangle appIconBounds )
{
if( canUseJBRCustomDecorations ) {
JBRCustomDecorations.setTitleBarHeightAndHitTestSpots( window, titleBarHeight, hitTestSpots );
return;
}
if( !isSupported() )
return;
nativeProvider.setTitleBarHeight( window, titleBarHeight );
nativeProvider.setTitleBarHitTestSpots( window, hitTestSpots );
nativeProvider.setTitleBarAppIconBounds( window, appIconBounds );
}
private static void initialize() {
if( supported != null )
return;
supported = false;
// requires Windows 10
if( !SystemInfo.isWindows_10_orLater )
return;
// do not use when running in JetBrains Projector
if( SystemInfo.isProjector )
return;
// check whether disabled via system property
if( !FlatSystemProperties.getBoolean( FlatSystemProperties.USE_WINDOW_DECORATIONS, true ) )
return;
try {
/*
Class<?> cls = Class.forName( "com.formdev.flatlaf.natives.jna.windows.FlatWindowsNativeWindowBorder" );
Method m = cls.getMethod( "getInstance" );
nativeProvider = (Provider) m.invoke( null );
*/
nativeProvider = FlatWindowsNativeWindowBorder.getInstance();
supported = (nativeProvider != null);
} catch( Exception ex ) {
// ignore
}
}
//---- interface Provider -------------------------------------------------
public interface Provider
{
boolean hasCustomDecoration( Window window );
void setHasCustomDecoration( Window window, boolean hasCustomDecoration );
void setTitleBarHeight( Window window, int titleBarHeight );
void setTitleBarHitTestSpots( Window window, List<Rectangle> hitTestSpots );
void setTitleBarAppIconBounds( Window window, Rectangle appIconBounds );
boolean isColorizationColorAffectsBorders();
Color getColorizationColor();
int getColorizationColorBalance();
void addChangeListener( ChangeListener l );
void removeChangeListener( ChangeListener l );
}
//---- class WindowTopBorder -------------------------------------------
static class WindowTopBorder
extends JBRCustomDecorations.JBRWindowTopBorder
{
private static WindowTopBorder instance;
static JBRWindowTopBorder getInstance() {
if( canUseJBRCustomDecorations )
return JBRWindowTopBorder.getInstance();
if( instance == null )
instance = new WindowTopBorder();
return instance;
}
@Override
void installListeners() {
nativeProvider.addChangeListener( e -> {
update();
// repaint top borders of all windows
for( Window window : Window.getWindows() ) {
if( window.isDisplayable() )
window.repaint( 0, 0, window.getWidth(), 1 );
}
} );
}
@Override
boolean isColorizationColorAffectsBorders() {
return nativeProvider.isColorizationColorAffectsBorders();
}
@Override
Color getColorizationColor() {
return nativeProvider.getColorizationColor();
}
@Override
int getColorizationColorBalance() {
return nativeProvider.getColorizationColorBalance();
}
}
}

View File

@@ -62,7 +62,7 @@ public class FlatPopupFactory
public Popup getPopup( Component owner, Component contents, int x, int y ) public Popup getPopup( Component owner, Component contents, int x, int y )
throws IllegalArgumentException throws IllegalArgumentException
{ {
Point pt = fixToolTipLocation( owner, contents, x, y ); Point pt = fixToolTipLocation( contents, x, y );
if( pt != null ) { if( pt != null ) {
x = pt.x; x = pt.x;
y = pt.y; y = pt.y;
@@ -70,7 +70,7 @@ public class FlatPopupFactory
boolean forceHeavyWeight = isOptionEnabled( owner, contents, FlatClientProperties.POPUP_FORCE_HEAVY_WEIGHT, "Popup.forceHeavyWeight" ); boolean forceHeavyWeight = isOptionEnabled( owner, contents, FlatClientProperties.POPUP_FORCE_HEAVY_WEIGHT, "Popup.forceHeavyWeight" );
if( !isOptionEnabled( owner, contents, FlatClientProperties.POPUP_DROP_SHADOW_PAINTED, "Popup.dropShadowPainted" ) ) if( !isOptionEnabled( owner, contents, FlatClientProperties.POPUP_DROP_SHADOW_PAINTED, "Popup.dropShadowPainted" ) || SystemInfo.isProjector )
return new NonFlashingPopup( getPopupForScreenOfOwner( owner, contents, x, y, forceHeavyWeight ), contents ); return new NonFlashingPopup( getPopupForScreenOfOwner( owner, contents, x, y, forceHeavyWeight ), contents );
// macOS and Linux adds drop shadow to heavy weight popups // macOS and Linux adds drop shadow to heavy weight popups
@@ -111,6 +111,7 @@ public class FlatPopupFactory
// check whether heavy weight popup window is on same screen as owner component // check whether heavy weight popup window is on same screen as owner component
if( popupWindow == null || if( popupWindow == null ||
owner == null ||
popupWindow.getGraphicsConfiguration() == owner.getGraphicsConfiguration() ) popupWindow.getGraphicsConfiguration() == owner.getGraphicsConfiguration() )
return popup; return popup;
@@ -211,7 +212,7 @@ public class FlatPopupFactory
* This method checks whether the current mouse location is within tooltip bounds * This method checks whether the current mouse location is within tooltip bounds
* and corrects the y-location so that the tooltip is placed above the mouse location. * 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 ) { private Point fixToolTipLocation( Component contents, int x, int y ) {
if( !(contents instanceof JToolTip) || !wasInvokedFromToolTipManager() ) if( !(contents instanceof JToolTip) || !wasInvokedFromToolTipManager() )
return null; return null;
@@ -271,16 +272,17 @@ public class FlatPopupFactory
// increase tooltip size if necessary because it may be too small on HiDPI screens // increase tooltip size if necessary because it may be too small on HiDPI screens
// https://bugs.openjdk.java.net/browse/JDK-8213535 // https://bugs.openjdk.java.net/browse/JDK-8213535
if( contents instanceof JToolTip ) { if( contents instanceof JToolTip && popupWindow == null ) {
Container parent = contents.getParent(); Container parent = contents.getParent();
if( parent instanceof JPanel ) { if( parent instanceof JPanel ) {
Dimension prefSize = parent.getPreferredSize(); Dimension prefSize = parent.getPreferredSize();
if( !prefSize.equals( parent.getSize() ) ) { if( !prefSize.equals( parent.getSize() ) ) {
Container panel = SwingUtilities.getAncestorOfClass( Panel.class, parent ); Container mediumWeightPanel = SwingUtilities.getAncestorOfClass( Panel.class, parent );
if( panel != null ) Container c = (mediumWeightPanel != null)
panel.setSize( prefSize ); // for medium weight popup ? mediumWeightPanel // medium weight popup
else : parent; // light weight popup
parent.setSize( prefSize ); // for light weight popup c.setSize( prefSize );
c.validate();
} }
} }
} }
@@ -449,10 +451,10 @@ public class FlatPopupFactory
mediumWeightShown = true; mediumWeightShown = true;
Window window = SwingUtilities.windowForComponent( owner ); if( owner == null )
if( window == null )
return; return;
Window window = SwingUtilities.windowForComponent( owner );
if( !(window instanceof RootPaneContainer) ) if( !(window instanceof RootPaneContainer) )
return; return;

View File

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

View File

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

View File

@@ -40,6 +40,7 @@ import javax.swing.UIManager;
import javax.swing.border.Border; import javax.swing.border.Border;
import javax.swing.plaf.BorderUIResource; import javax.swing.plaf.BorderUIResource;
import javax.swing.plaf.ComponentUI; import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.RootPaneUI;
import javax.swing.plaf.UIResource; import javax.swing.plaf.UIResource;
import javax.swing.plaf.basic.BasicRootPaneUI; import javax.swing.plaf.basic.BasicRootPaneUI;
import com.formdev.flatlaf.FlatClientProperties; import com.formdev.flatlaf.FlatClientProperties;
@@ -70,16 +71,13 @@ import com.formdev.flatlaf.util.UIScale;
public class FlatRootPaneUI public class FlatRootPaneUI
extends BasicRootPaneUI extends BasicRootPaneUI
{ {
// check this field before using class JBRCustomDecorations to avoid unnecessary loading of that class
static final boolean canUseJBRCustomDecorations
= SystemInfo.isJetBrainsJVM_11_orLater && SystemInfo.isWindows_10_orLater;
protected final Color borderColor = UIManager.getColor( "TitlePane.borderColor" ); protected final Color borderColor = UIManager.getColor( "TitlePane.borderColor" );
protected JRootPane rootPane; protected JRootPane rootPane;
protected FlatTitlePane titlePane; protected FlatTitlePane titlePane;
protected FlatWindowResizer windowResizer; protected FlatWindowResizer windowResizer;
private Object nativeWindowBorderData;
private LayoutManager oldLayout; private LayoutManager oldLayout;
public static ComponentUI createUI( JComponent c ) { public static ComponentUI createUI( JComponent c ) {
@@ -97,8 +95,7 @@ public class FlatRootPaneUI
else else
installBorder(); installBorder();
if( canUseJBRCustomDecorations ) nativeWindowBorderData = FlatNativeWindowBorder.install( rootPane );
JBRCustomDecorations.install( rootPane );
} }
protected void installBorder() { protected void installBorder() {
@@ -113,6 +110,8 @@ public class FlatRootPaneUI
public void uninstallUI( JComponent c ) { public void uninstallUI( JComponent c ) {
super.uninstallUI( c ); super.uninstallUI( c );
FlatNativeWindowBorder.uninstall( rootPane, nativeWindowBorderData );
uninstallClientDecorations(); uninstallClientDecorations();
rootPane = null; rootPane = null;
} }
@@ -139,10 +138,10 @@ public class FlatRootPaneUI
} }
protected void installClientDecorations() { protected void installClientDecorations() {
boolean isJBRSupported = canUseJBRCustomDecorations && JBRCustomDecorations.isSupported(); boolean isNativeWindowBorderSupported = FlatNativeWindowBorder.isSupported();
// install border // install border
if( rootPane.getWindowDecorationStyle() != JRootPane.NONE && !isJBRSupported ) if( rootPane.getWindowDecorationStyle() != JRootPane.NONE && !isNativeWindowBorderSupported )
LookAndFeel.installBorder( rootPane, "RootPane.border" ); LookAndFeel.installBorder( rootPane, "RootPane.border" );
else else
LookAndFeel.uninstallBorder( rootPane ); LookAndFeel.uninstallBorder( rootPane );
@@ -155,7 +154,7 @@ public class FlatRootPaneUI
rootPane.setLayout( createRootLayout() ); rootPane.setLayout( createRootLayout() );
// install window resizer // install window resizer
if( !isJBRSupported ) if( !isNativeWindowBorderSupported )
windowResizer = createWindowResizer(); windowResizer = createWindowResizer();
} }
@@ -229,6 +228,13 @@ public class FlatRootPaneUI
} }
} }
protected static boolean isMenuBarEmbedded( JRootPane rootPane ) {
RootPaneUI ui = rootPane.getUI();
return ui instanceof FlatRootPaneUI &&
((FlatRootPaneUI)ui).titlePane != null &&
((FlatRootPaneUI)ui).titlePane.isMenuBarEmbedded();
}
//---- class FlatRootLayout ----------------------------------------------- //---- class FlatRootLayout -----------------------------------------------
protected class FlatRootLayout protected class FlatRootLayout
@@ -299,15 +305,16 @@ public class FlatRootPaneUI
rootPane.getGlassPane().setBounds( x, y, width, height ); rootPane.getGlassPane().setBounds( x, y, width, height );
int nextY = 0; int nextY = 0;
if( !isFullScreen && titlePane != null ) { if( titlePane != null ) {
Dimension prefSize = titlePane.getPreferredSize(); int prefHeight = !isFullScreen ? titlePane.getPreferredSize().height : 0;
titlePane.setBounds( 0, 0, width, prefSize.height ); titlePane.setBounds( 0, 0, width, prefHeight );
nextY += prefSize.height; nextY += prefHeight;
} }
JMenuBar menuBar = rootPane.getJMenuBar(); JMenuBar menuBar = rootPane.getJMenuBar();
if( menuBar != null && menuBar.isVisible() ) { if( menuBar != null && menuBar.isVisible() ) {
if( !isFullScreen && titlePane != null && titlePane.isMenuBarEmbedded() ) { boolean embedded = !isFullScreen && titlePane != null && titlePane.isMenuBarEmbedded();
if( embedded ) {
titlePane.validate(); titlePane.validate();
menuBar.setBounds( titlePane.getMenuBarBounds() ); menuBar.setBounds( titlePane.getMenuBarBounds() );
} else { } else {
@@ -344,6 +351,9 @@ public class FlatRootPaneUI
//---- class FlatWindowBorder --------------------------------------------- //---- class FlatWindowBorder ---------------------------------------------
/**
* Window border used for non-native window decorations.
*/
public static class FlatWindowBorder public static class FlatWindowBorder
extends BorderUIResource.EmptyBorderUIResource extends BorderUIResource.EmptyBorderUIResource
{ {
@@ -358,7 +368,7 @@ public class FlatRootPaneUI
@Override @Override
public Insets getBorderInsets( Component c, Insets insets ) { public Insets getBorderInsets( Component c, Insets insets ) {
if( isWindowMaximized( c ) || FlatUIUtils.isFullScreen( c ) ) { if( isWindowMaximized( c ) || FlatUIUtils.isFullScreen( c ) ) {
// hide border if window is maximized // hide border if window is maximized or full screen
insets.top = insets.left = insets.bottom = insets.right = 0; insets.top = insets.left = insets.bottom = insets.right = 0;
return insets; return insets;
} else } else

View File

@@ -19,12 +19,10 @@ package com.formdev.flatlaf.ui;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Insets; import java.awt.Insets;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import java.util.Objects; import java.util.Objects;
import javax.swing.InputMap; import javax.swing.InputMap;
@@ -169,10 +167,9 @@ public class FlatScrollBarUI
@Override @Override
protected PropertyChangeListener createPropertyChangeListener() { protected PropertyChangeListener createPropertyChangeListener() {
return new BasicScrollBarUI.PropertyChangeHandler() { PropertyChangeListener superListener = super.createPropertyChangeListener();
@Override return e -> {
public void propertyChange( PropertyChangeEvent e ) { superListener.propertyChange( e );
super.propertyChange( e );
switch( e.getPropertyName() ) { switch( e.getPropertyName() ) {
case FlatClientProperties.SCROLL_BAR_SHOW_BUTTONS: case FlatClientProperties.SCROLL_BAR_SHOW_BUTTONS:
@@ -193,7 +190,6 @@ public class FlatScrollBarUI
SwingUtilities.replaceUIInputMap( scrollbar, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, inputMap ); SwingUtilities.replaceUIInputMap( scrollbar, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, inputMap );
break; break;
} }
}
}; };
} }
@@ -221,8 +217,9 @@ public class FlatScrollBarUI
@Override @Override
public void paint( Graphics g, JComponent c ) { public void paint( Graphics g, JComponent c ) {
FlatUIUtils.setRenderingHints( (Graphics2D) g ); Object[] oldRenderingHints = FlatUIUtils.setRenderingHints( g );
super.paint( g, c ); super.paint( g, c );
FlatUIUtils.resetRenderingHints( g, oldRenderingHints );
} }
@Override @Override
@@ -357,13 +354,14 @@ public class FlatScrollBarUI
{ {
protected FlatScrollBarButton( int direction ) { protected FlatScrollBarButton( int direction ) {
this( direction, arrowType, buttonArrowColor, buttonDisabledArrowColor, this( direction, arrowType, buttonArrowColor, buttonDisabledArrowColor,
null, hoverButtonBackground, pressedButtonBackground ); null, hoverButtonBackground, null, pressedButtonBackground );
} }
protected FlatScrollBarButton( int direction, String type, Color foreground, Color disabledForeground, 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 ); setArrowWidth( FlatArrowButton.DEFAULT_ARROW_WIDTH - 2 );
setFocusable( false ); setFocusable( false );

View File

@@ -14,12 +14,6 @@
* limitations under the License. * 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; package com.formdev.flatlaf.ui;
import java.awt.Component; import java.awt.Component;
@@ -111,9 +105,8 @@ public class FlatScrollPaneUI
@Override @Override
protected MouseWheelListener createMouseWheelListener() { protected MouseWheelListener createMouseWheelListener() {
return new BasicScrollPaneUI.MouseWheelHandler() { MouseWheelListener superListener = super.createMouseWheelListener();
@Override return e -> {
public void mouseWheelMoved( MouseWheelEvent e ) {
if( isSmoothScrollingEnabled() && if( isSmoothScrollingEnabled() &&
scrollpane.isWheelScrollingEnabled() && scrollpane.isWheelScrollingEnabled() &&
e.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL && e.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL &&
@@ -122,8 +115,7 @@ public class FlatScrollPaneUI
{ {
mouseWheelMovedSmooth( e ); mouseWheelMovedSmooth( e );
} else } else
super.mouseWheelMoved( e ); superListener.mouseWheelMoved( e );
}
}; };
} }
@@ -138,8 +130,6 @@ public class FlatScrollPaneUI
return UIManager.getBoolean( "ScrollPane.smoothScrolling" ); return UIManager.getBoolean( "ScrollPane.smoothScrolling" );
} }
private static final double EPSILON = 1e-5d;
private void mouseWheelMovedSmooth( MouseWheelEvent e ) { private void mouseWheelMovedSmooth( MouseWheelEvent e ) {
// return if there is no viewport // return if there is no viewport
JViewport viewport = scrollpane.getViewport(); JViewport viewport = scrollpane.getViewport();
@@ -160,24 +150,22 @@ public class FlatScrollPaneUI
// get precise wheel rotation // get precise wheel rotation
double rotation = e.getPreciseWheelRotation(); double rotation = e.getPreciseWheelRotation();
// get unit and block increment // get unit increment
int unitIncrement; int unitIncrement;
int blockIncrement;
int orientation = scrollbar.getOrientation(); int orientation = scrollbar.getOrientation();
Component view = viewport.getView(); Component view = viewport.getView();
if( view instanceof Scrollable ) { if( view instanceof Scrollable ) {
Scrollable scrollable = (Scrollable) view; Scrollable scrollable = (Scrollable) view;
// Use (0, 0) view position to obtain constant unit increment of first item // Use (0, 0) view position to obtain a constant unit increment of first item.
// (which might otherwise be variable on smaller-than-unit scrolling). // Unit increment may be different for each item.
Rectangle visibleRect = new Rectangle( viewport.getViewSize() ); Rectangle visibleRect = new Rectangle( viewport.getViewSize() );
unitIncrement = scrollable.getScrollableUnitIncrement( visibleRect, orientation, 1 ); unitIncrement = scrollable.getScrollableUnitIncrement( visibleRect, orientation, 1 );
blockIncrement = scrollable.getScrollableBlockIncrement( visibleRect, orientation, 1 );
if( unitIncrement > 0 ) { if( unitIncrement > 0 ) {
// For the case that the first item (e.g. in a list) is larger // 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 // than the other items (e.g. themes list in FlatLaf Demo),
// and use the smaller one. // get the unit increment of the second item and use the smaller one.
if( orientation == SwingConstants.VERTICAL ) { if( orientation == SwingConstants.VERTICAL ) {
visibleRect.y += unitIncrement; visibleRect.y += unitIncrement;
visibleRect.height -= unitIncrement; visibleRect.height -= unitIncrement;
@@ -192,61 +180,66 @@ public class FlatScrollPaneUI
} else { } else {
int direction = rotation < 0 ? -1 : 1; int direction = rotation < 0 ? -1 : 1;
unitIncrement = scrollbar.getUnitIncrement( direction ); unitIncrement = scrollbar.getUnitIncrement( direction );
blockIncrement = scrollbar.getBlockIncrement( direction );
} }
// limit scroll amount (number of units to scroll) for small viewports // get viewport width/height (the visible width/height)
// (e.g. vertical scrolling in file chooser)
int scrollAmount = e.getScrollAmount();
int viewportWH = (orientation == SwingConstants.VERTICAL) int viewportWH = (orientation == SwingConstants.VERTICAL)
? viewport.getHeight() ? viewport.getHeight()
: viewport.getWidth(); : 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 // compute relative delta
double delta = rotation * scrollAmount * unitIncrement; double delta = rotation * scrollIncrement;
boolean adjustDelta = Math.abs( rotation ) < (1.0 + EPSILON); int idelta = (int) Math.round( delta );
double adjustedDelta = adjustDelta
? Math.max( -blockIncrement, Math.min( delta, blockIncrement ) ) // scroll at least one pixel to avoid "hanging"
: delta; // - 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 // compute new value
int value = scrollbar.getValue(); int value = scrollbar.getValue();
double minDelta = scrollbar.getMinimum() - value; int minValue = scrollbar.getMinimum();
double maxDelta = scrollbar.getMaximum() - scrollbar.getModel().getExtent() - value; int maxValue = scrollbar.getMaximum() - scrollbar.getModel().getExtent();
double boundedDelta = Math.max( minDelta, Math.min( adjustedDelta, maxDelta ) ); int newValue = Math.max( minValue, Math.min( value + idelta, maxValue ) );
int newValue = value + (int) Math.round( boundedDelta );
// set new value // set new value
if( newValue != value ) if( newValue != value )
scrollbar.setValue( newValue ); scrollbar.setValue( newValue );
/*debug /*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.getWheelRotation(),
e.getPreciseWheelRotation(), e.getPreciseWheelRotation(),
unitIncrement, unitIncrement,
blockIncrement, e.getScrollAmount(),
scrollIncrement,
viewportWH,
delta, delta,
adjustDelta, idelta,
adjustedDelta,
value, value,
scrollbar.getMinimum(), newValue,
scrollbar.getMaximum(), minValue,
minDelta, maxValue ) );
maxDelta,
boundedDelta,
newValue ) );
*/ */
} }
@Override @Override
protected PropertyChangeListener createPropertyChangeListener() { protected PropertyChangeListener createPropertyChangeListener() {
return new BasicScrollPaneUI.PropertyChangeHandler() { PropertyChangeListener superListener = super.createPropertyChangeListener();
@Override return e -> {
public void propertyChange( PropertyChangeEvent e ) { superListener.propertyChange( e );
super.propertyChange( e );
switch( e.getPropertyName() ) { switch( e.getPropertyName() ) {
case FlatClientProperties.SCROLL_BAR_SHOW_BUTTONS: case FlatClientProperties.SCROLL_BAR_SHOW_BUTTONS:
@@ -278,7 +271,6 @@ public class FlatScrollPaneUI
} }
break; break;
} }
}
}; };
} }

View File

@@ -91,9 +91,14 @@ public class FlatSliderUI
protected Color disabledThumbColor; protected Color disabledThumbColor;
protected Color disabledThumbBorderColor; protected Color disabledThumbBorderColor;
private Color defaultBackground;
private Color defaultForeground;
protected boolean thumbHover; protected boolean thumbHover;
protected boolean thumbPressed; protected boolean thumbPressed;
private Object[] oldRenderingHints;
public static ComponentUI createUI( JComponent c ) { public static ComponentUI createUI( JComponent c ) {
return new FlatSliderUI(); return new FlatSliderUI();
} }
@@ -129,6 +134,9 @@ public class FlatSliderUI
disabledTrackColor = UIManager.getColor( "Slider.disabledTrackColor" ); disabledTrackColor = UIManager.getColor( "Slider.disabledTrackColor" );
disabledThumbColor = UIManager.getColor( "Slider.disabledThumbColor" ); disabledThumbColor = UIManager.getColor( "Slider.disabledThumbColor" );
disabledThumbBorderColor = FlatUIUtils.getUIColor( "Slider.disabledThumbBorderColor", "Component.disabledBorderColor" ); disabledThumbBorderColor = FlatUIUtils.getUIColor( "Slider.disabledThumbBorderColor", "Component.disabledBorderColor" );
defaultBackground = UIManager.getColor( "Slider.background" );
defaultForeground = UIManager.getColor( "Slider.foreground" );
} }
@Override @Override
@@ -147,6 +155,9 @@ public class FlatSliderUI
disabledTrackColor = null; disabledTrackColor = null;
disabledThumbColor = null; disabledThumbColor = null;
disabledThumbBorderColor = null; disabledThumbBorderColor = null;
defaultBackground = null;
defaultForeground = null;
} }
@Override @Override
@@ -211,7 +222,7 @@ public class FlatSliderUI
@Override @Override
public void paint( Graphics g, JComponent c ) { public void paint( Graphics g, JComponent c ) {
FlatUIUtils.setRenderingHints( (Graphics2D) g ); oldRenderingHints = FlatUIUtils.setRenderingHints( g );
/*debug /*debug
g.setColor( Color.gray ); g.setColor( Color.gray );
@@ -224,9 +235,23 @@ public class FlatSliderUI
g.drawRect( trackRect.x, trackRect.y, trackRect.width - 1, trackRect.height - 1 ); g.drawRect( trackRect.x, trackRect.y, trackRect.width - 1, trackRect.height - 1 );
g.setColor( Color.red ); g.setColor( Color.red );
g.drawRect( thumbRect.x, thumbRect.y, thumbRect.width - 1, thumbRect.height - 1 ); 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*/ debug*/
super.paint( g, c ); super.paint( g, c );
FlatUIUtils.resetRenderingHints( g, oldRenderingHints );
oldRenderingHints = null;
}
@Override
public void paintLabels( Graphics g ) {
FlatUIUtils.runWithoutRenderingHints( g, oldRenderingHints, () -> {
super.paintLabels( g );
} );
} }
@Override @Override
@@ -267,25 +292,34 @@ debug*/
} }
if( coloredTrack != null ) { if( coloredTrack != null ) {
g.setColor( trackValueColor ); if( slider.getInverted() ) {
RoundRectangle2D temp = track;
track = coloredTrack;
coloredTrack = temp;
}
g.setColor( getTrackValueColor() );
((Graphics2D)g).fill( coloredTrack ); ((Graphics2D)g).fill( coloredTrack );
} }
g.setColor( enabled ? trackColor : disabledTrackColor ); g.setColor( enabled ? getTrackColor() : disabledTrackColor );
((Graphics2D)g).fill( track ); ((Graphics2D)g).fill( track );
} }
@Override @Override
public void paintThumb( Graphics g ) { public void paintThumb( Graphics g ) {
Color thumbColor = getThumbColor();
Color color = stateColor( slider, thumbHover, thumbPressed, Color color = stateColor( slider, thumbHover, thumbPressed,
thumbColor, disabledThumbColor, null, hoverThumbColor, pressedThumbColor ); thumbColor, disabledThumbColor, null, hoverThumbColor, pressedThumbColor );
color = FlatUIUtils.deriveColor( color, thumbColor ); color = FlatUIUtils.deriveColor( color, thumbColor );
Color borderColor = (thumbBorderColor != null) Color foreground = slider.getForeground();
Color borderColor = (thumbBorderColor != null && foreground == defaultForeground)
? stateColor( slider, false, false, thumbBorderColor, disabledThumbBorderColor, focusedThumbBorderColor, null, null ) ? stateColor( slider, false, false, thumbBorderColor, disabledThumbBorderColor, focusedThumbBorderColor, null, null )
: null; : null;
Color focusedColor = FlatUIUtils.deriveColor( this.focusedColor, focusBaseColor ); Color focusedColor = FlatUIUtils.deriveColor( this.focusedColor,
(foreground != defaultForeground) ? foreground : focusBaseColor );
paintThumb( g, slider, thumbRect, isRoundThumb(), color, borderColor, focusedColor, focusWidth ); paintThumb( g, slider, thumbRect, isRoundThumb(), color, borderColor, focusedColor, focusWidth );
} }
@@ -414,6 +448,21 @@ debug*/
return path; 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, public static Color stateColor( JSlider slider, boolean hover, boolean pressed,
Color enabledColor, Color disabledColor, Color focusedColor, Color hoverColor, Color pressedColor ) Color enabledColor, Color disabledColor, Color focusedColor, Color hoverColor, Color pressedColor )
{ {
@@ -484,7 +533,47 @@ debug*/
@Override @Override
public void mousePressed( MouseEvent e ) { public void mousePressed( MouseEvent e ) {
setThumbPressed( isOverThumb( e ) ); setThumbPressed( isOverThumb( e ) );
if( !slider.isEnabled() )
return;
// use "old" behavior when clicking on track
if( UIManager.getBoolean( "Slider.scrollOnTrackClick" ) ) {
super.mousePressed( e ); 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 @Override
@@ -493,6 +582,20 @@ debug*/
super.mouseReleased( e ); 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 ) { protected void setThumbHover( boolean hover ) {
if( hover != thumbHover ) { if( hover != thumbHover ) {
thumbHover = hover; thumbHover = hover;

View File

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

View File

@@ -20,7 +20,6 @@ import java.awt.Color;
import java.awt.Container; import java.awt.Container;
import java.awt.Cursor; import java.awt.Cursor;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Insets; import java.awt.Insets;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
@@ -53,6 +52,7 @@ import com.formdev.flatlaf.util.UIScale;
* @uiDefault SplitPane.continuousLayout boolean * @uiDefault SplitPane.continuousLayout boolean
* @uiDefault SplitPaneDivider.oneTouchArrowColor Color * @uiDefault SplitPaneDivider.oneTouchArrowColor Color
* @uiDefault SplitPaneDivider.oneTouchHoverArrowColor Color * @uiDefault SplitPaneDivider.oneTouchHoverArrowColor Color
* @uiDefault SplitPaneDivider.oneTouchPressedArrowColor Color
* @uiDefault SplitPaneDivider.style String grip (default) or plain * @uiDefault SplitPaneDivider.style String grip (default) or plain
* @uiDefault SplitPaneDivider.gripColor Color * @uiDefault SplitPaneDivider.gripColor Color
* @uiDefault SplitPaneDivider.gripDotCount int * @uiDefault SplitPaneDivider.gripDotCount int
@@ -68,6 +68,7 @@ public class FlatSplitPaneUI
private Boolean continuousLayout; private Boolean continuousLayout;
protected Color oneTouchArrowColor; protected Color oneTouchArrowColor;
protected Color oneTouchHoverArrowColor; protected Color oneTouchHoverArrowColor;
protected Color oneTouchPressedArrowColor;
public static ComponentUI createUI( JComponent c ) { public static ComponentUI createUI( JComponent c ) {
return new FlatSplitPaneUI(); return new FlatSplitPaneUI();
@@ -81,12 +82,22 @@ public class FlatSplitPaneUI
// used in there on LaF switching // used in there on LaF switching
oneTouchArrowColor = UIManager.getColor( "SplitPaneDivider.oneTouchArrowColor" ); oneTouchArrowColor = UIManager.getColor( "SplitPaneDivider.oneTouchArrowColor" );
oneTouchHoverArrowColor = UIManager.getColor( "SplitPaneDivider.oneTouchHoverArrowColor" ); oneTouchHoverArrowColor = UIManager.getColor( "SplitPaneDivider.oneTouchHoverArrowColor" );
oneTouchPressedArrowColor = UIManager.getColor( "SplitPaneDivider.oneTouchPressedArrowColor" );
super.installDefaults(); super.installDefaults();
continuousLayout = (Boolean) UIManager.get( "SplitPane.continuousLayout" ); continuousLayout = (Boolean) UIManager.get( "SplitPane.continuousLayout" );
} }
@Override
protected void uninstallDefaults() {
super.uninstallDefaults();
oneTouchArrowColor = null;
oneTouchHoverArrowColor = null;
oneTouchPressedArrowColor = null;
}
@Override @Override
public boolean isContinuousLayout() { public boolean isContinuousLayout() {
return super.isContinuousLayout() || (continuousLayout != null && Boolean.TRUE.equals( continuousLayout )); return super.isContinuousLayout() || (continuousLayout != null && Boolean.TRUE.equals( continuousLayout ));
@@ -148,10 +159,12 @@ public class FlatSplitPaneUI
if( "plain".equals( style ) ) if( "plain".equals( style ) )
return; return;
FlatUIUtils.setRenderingHints( (Graphics2D) g ); Object[] oldRenderingHints = FlatUIUtils.setRenderingHints( g );
g.setColor( gripColor ); g.setColor( gripColor );
paintGrip( g, 0, 0, getWidth(), getHeight() ); paintGrip( g, 0, 0, getWidth(), getHeight() );
FlatUIUtils.resetRenderingHints( g, oldRenderingHints );
} }
protected void paintGrip( Graphics g, int x, int y, int width, int height ) { protected void paintGrip( Graphics g, int x, int y, int width, int height ) {
@@ -184,7 +197,8 @@ public class FlatSplitPaneUI
protected final boolean left; protected final boolean left;
protected FlatOneTouchButton( boolean left ) { protected FlatOneTouchButton( boolean left ) {
super( SwingConstants.NORTH, arrowType, oneTouchArrowColor, null, oneTouchHoverArrowColor, null ); super( SwingConstants.NORTH, arrowType, oneTouchArrowColor, null,
oneTouchHoverArrowColor, null, oneTouchPressedArrowColor, null );
setCursor( Cursor.getPredefinedCursor( Cursor.DEFAULT_CURSOR ) ); setCursor( Cursor.getPredefinedCursor( Cursor.DEFAULT_CURSOR ) );
ToolTipManager.sharedInstance().registerComponent( this ); ToolTipManager.sharedInstance().registerComponent( this );

View File

@@ -221,11 +221,15 @@ public class FlatTabbedPaneUI
private Container leadingComponent; private Container leadingComponent;
private Container trailingComponent; private Container trailingComponent;
private Dimension scrollBackwardButtonPrefSize;
private Handler handler; private Handler handler;
private boolean blockRollover; private boolean blockRollover;
private boolean rolloverTabClose; private boolean rolloverTabClose;
private boolean pressedTabClose; private boolean pressedTabClose;
private Object[] oldRenderingHints;
public static ComponentUI createUI( JComponent c ) { public static ComponentUI createUI( JComponent c ) {
return new FlatTabbedPaneUI(); return new FlatTabbedPaneUI();
} }
@@ -791,9 +795,12 @@ public class FlatTabbedPaneUI
@Override @Override
public void update( Graphics g, JComponent c ) { public void update( Graphics g, JComponent c ) {
FlatUIUtils.setRenderingHints( (Graphics2D) g ); oldRenderingHints = FlatUIUtils.setRenderingHints( g );
super.update( g, c ); super.update( g, c );
FlatUIUtils.resetRenderingHints( g, oldRenderingHints );
oldRenderingHints = null;
} }
@Override @Override
@@ -874,6 +881,7 @@ public class FlatTabbedPaneUI
{ {
g.setFont( font ); g.setFont( font );
FlatUIUtils.runWithoutRenderingHints( g, oldRenderingHints, () -> {
// html // html
View view = getTextViewForTab( tabIndex ); View view = getTextViewForTab( tabIndex );
if( view != null ) { if( view != null ) {
@@ -885,7 +893,7 @@ public class FlatTabbedPaneUI
Color color; Color color;
if( tabPane.isEnabled() && tabPane.isEnabledAt( tabIndex ) ) { if( tabPane.isEnabled() && tabPane.isEnabledAt( tabIndex ) ) {
color = tabPane.getForegroundAt( tabIndex ); color = tabPane.getForegroundAt( tabIndex );
if( isSelected && (color instanceof UIResource) && selectedForeground != null ) if( isSelected && selectedForeground != null && color == tabPane.getForeground() )
color = selectedForeground; color = selectedForeground;
} else } else
color = disabledForeground; color = disabledForeground;
@@ -895,6 +903,7 @@ public class FlatTabbedPaneUI
g.setColor( color ); g.setColor( color );
FlatUIUtils.drawStringUnderlineCharAt( tabPane, g, title, mnemIndex, FlatUIUtils.drawStringUnderlineCharAt( tabPane, g, title, mnemIndex,
textRect.x, textRect.y + metrics.getAscent() ); textRect.x, textRect.y + metrics.getAscent() );
} );
} }
@Override @Override
@@ -1550,7 +1559,7 @@ public class FlatTabbedPaneUI
FlatUIUtils.paintComponentBackground( g, left, top, FlatUIUtils.paintComponentBackground( g, left, top,
getWidth() - left - right, getWidth() - left - right,
getHeight() - top - bottom, getHeight() - top - bottom,
0, scale( buttonArc ) ); 0, scale( (float) buttonArc ) );
} }
} }
@@ -1863,23 +1872,70 @@ public class FlatTabbedPaneUI
lastMouseY = e.getY(); lastMouseY = e.getY();
double preciseWheelRotation = e.getPreciseWheelRotation(); double preciseWheelRotation = e.getPreciseWheelRotation();
boolean isPreciseWheel = (preciseWheelRotation != 0 && preciseWheelRotation != e.getWheelRotation());
int amount = (int) (maxTabHeight * preciseWheelRotation); int amount = (int) (maxTabHeight * preciseWheelRotation);
// scroll at least one pixel to avoid "hanging"
if( amount == 0 ) {
if( preciseWheelRotation > 0 )
amount = 1;
else if( preciseWheelRotation < 0 )
amount = -1;
}
// compute new view position // compute new view position
Point viewPosition = (targetViewPosition != null) Point viewPosition = (targetViewPosition != null)
? targetViewPosition ? targetViewPosition
: tabViewport.getViewPosition(); : tabViewport.getViewPosition();
Dimension viewSize = tabViewport.getViewSize(); Dimension viewSize = tabViewport.getViewSize();
boolean horizontal = isHorizontalTabPlacement();
int x = viewPosition.x; int x = viewPosition.x;
int y = viewPosition.y; int y = viewPosition.y;
int tabPlacement = tabPane.getTabPlacement(); if( horizontal )
if( tabPlacement == TOP || tabPlacement == BOTTOM ) {
x += isLeftToRight() ? amount : -amount; x += isLeftToRight() ? amount : -amount;
x = Math.min( Math.max( x, 0 ), viewSize.width - tabViewport.getWidth() ); else
} else {
y += amount; y += amount;
y = Math.min( Math.max( y, 0 ), viewSize.height - tabViewport.getHeight() );
// In case of having scroll buttons on both sides and hiding disabled buttons,
// the viewport is moved when the scroll backward button becomes visible
// or is hidden. For non-precise wheel scrolling (e.g. mouse wheel on Windows),
// this is no problem because the scroll amount is at least a tab-height.
// For precise wheel scrolling (e.g. touchpad on Mac), this is a problem
// because it is possible to scroll by a fraction of a tab-height.
if( isPreciseWheel &&
getScrollButtonsPlacement() == BOTH &&
getScrollButtonsPolicy() == AS_NEEDED_SINGLE &&
(isLeftToRight() || !horizontal) || // scroll buttons are hidden in right-to-left
scrollBackwardButtonPrefSize != null )
{
// special cases for scrolling with touchpad or high-resolution wheel:
// 1. if view is at 0/0 and scrolling right/down, then the scroll backward button
// becomes visible, which moves the viewport right/down by the width/height of
// the button --> add button width/height to new view position so that
// tabs seems to stay in place at screen
// 2. if scrolling left/up to the beginning, then the scroll backward button
// becomes hidden, which moves the viewport left/up by the width/height of
// the button --> set new view position to 0/0 so that
// tabs seems to stay in place at screen
if( horizontal ) {
//
if( viewPosition.x == 0 && x > 0 )
x += scrollBackwardButtonPrefSize.width;
else if( amount < 0 && x <= scrollBackwardButtonPrefSize.width )
x = 0;
} else {
if( viewPosition.y == 0 && y > 0 )
y += scrollBackwardButtonPrefSize.height;
else if( amount < 0 && y <= scrollBackwardButtonPrefSize.height )
y = 0;
} }
}
// limit new view position
if( horizontal )
x = Math.min( Math.max( x, 0 ), viewSize.width - tabViewport.getWidth() );
else
y = Math.min( Math.max( y, 0 ), viewSize.height - tabViewport.getHeight() );
// check whether view position has changed // check whether view position has changed
Point newViewPosition = new Point( x, y ); Point newViewPosition = new Point( x, y );
@@ -1887,9 +1943,7 @@ public class FlatTabbedPaneUI
return; return;
// update view position // update view position
if( preciseWheelRotation != 0 && if( isPreciseWheel ) {
preciseWheelRotation != e.getWheelRotation() )
{
// do not use animation for precise scrolling (e.g. with trackpad) // do not use animation for precise scrolling (e.g. with trackpad)
// stop running animation (if any) // stop running animation (if any)
@@ -2102,8 +2156,10 @@ public class FlatTabbedPaneUI
public void mouseReleased( MouseEvent e ) { public void mouseReleased( MouseEvent e ) {
if( isPressedTabClose() ) { if( isPressedTabClose() ) {
updateRollover( e ); updateRollover( e );
if( pressedTabIndex >= 0 && pressedTabIndex == getRolloverTab() ) if( pressedTabIndex >= 0 && pressedTabIndex == getRolloverTab() ) {
restoreTabToolTip();
closeTab( pressedTabIndex ); closeTab( pressedTabIndex );
}
} else } else
mouseDelegate.mouseReleased( e ); mouseDelegate.mouseReleased( e );
@@ -2181,6 +2237,7 @@ public class FlatTabbedPaneUI
if( lastTipTabIndex < 0 ) if( lastTipTabIndex < 0 )
return; return;
if( lastTipTabIndex < tabPane.getTabCount() )
tabPane.setToolTipTextAt( lastTipTabIndex, lastTip ); tabPane.setToolTipTextAt( lastTipTabIndex, lastTip );
lastTip = null; lastTip = null;
lastTipTabIndex = -1; lastTipTabIndex = -1;
@@ -2886,6 +2943,8 @@ public class FlatTabbedPaneUI
moreTabsButton.setVisible( moreTabsButtonVisible ); moreTabsButton.setVisible( moreTabsButtonVisible );
backwardButton.setVisible( backwardButtonVisible ); backwardButton.setVisible( backwardButtonVisible );
forwardButton.setVisible( forwardButtonVisible ); forwardButton.setVisible( forwardButtonVisible );
scrollBackwardButtonPrefSize = backwardButton.getPreferredSize();
} }
} }
} }

View File

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

View File

@@ -17,6 +17,7 @@
package com.formdev.flatlaf.ui; package com.formdev.flatlaf.ui;
import java.awt.Color; import java.awt.Color;
import java.awt.Container;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.EventQueue; import java.awt.EventQueue;
import java.awt.Graphics; import java.awt.Graphics;
@@ -24,15 +25,17 @@ import java.awt.Graphics2D;
import java.awt.event.FocusEvent; import java.awt.event.FocusEvent;
import java.awt.event.FocusListener; import java.awt.event.FocusListener;
import java.awt.geom.Rectangle2D; import java.awt.geom.Rectangle2D;
import javax.swing.JCheckBox;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JTable; import javax.swing.JScrollPane;
import javax.swing.JViewport;
import javax.swing.LookAndFeel; import javax.swing.LookAndFeel;
import javax.swing.SwingUtilities;
import javax.swing.UIManager; import javax.swing.UIManager;
import javax.swing.plaf.ComponentUI; import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicTableUI; import javax.swing.plaf.basic.BasicTableUI;
import javax.swing.table.TableCellRenderer; import javax.swing.table.JTableHeader;
import com.formdev.flatlaf.util.Graphics2DProxy; import com.formdev.flatlaf.util.Graphics2DProxy;
import com.formdev.flatlaf.util.SystemInfo;
import com.formdev.flatlaf.util.UIScale; import com.formdev.flatlaf.util.UIScale;
/** /**
@@ -134,12 +137,6 @@ public class FlatTableUI
oldIntercellSpacing = table.getIntercellSpacing(); oldIntercellSpacing = table.getIntercellSpacing();
table.setIntercellSpacing( intercellSpacing ); 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 @Override
@@ -215,23 +212,21 @@ public class FlatTableUI
boolean verticalLines = table.getShowVerticalLines(); boolean verticalLines = table.getShowVerticalLines();
if( horizontalLines || verticalLines ) { if( horizontalLines || verticalLines ) {
// fix grid painting issues in BasicTableUI // fix grid painting issues in BasicTableUI
// - do not paint last vertical grid line if auto-resize mode is not off // - do not paint last vertical grid line if line is on right edge of scroll pane
// - in right-to-left component orientation, do not paint last vertical grid line
// in any auto-resize mode; can not paint on left side of table because
// cells are painted over left line
// - fix unstable grid line thickness when scaled at 125%, 150%, 175%, 225%, ... // - fix unstable grid line thickness when scaled at 125%, 150%, 175%, 225%, ...
// which paints either 1px or 2px lines depending on location // which paints either 1px or 2px lines depending on location
// - on Java 9+, fix wrong grid line thickness in dragged column
boolean hideLastVerticalLine = boolean hideLastVerticalLine = hideLastVerticalLine();
table.getAutoResizeMode() != JTable.AUTO_RESIZE_OFF ||
!table.getComponentOrientation().isLeftToRight();
int tableWidth = table.getWidth(); int tableWidth = table.getWidth();
JTableHeader header = table.getTableHeader();
boolean isDragging = (header != null && header.getDraggedColumn() != null);
double systemScaleFactor = UIScale.getSystemScaleFactor( (Graphics2D) g ); double systemScaleFactor = UIScale.getSystemScaleFactor( (Graphics2D) g );
double lineThickness = (1. / systemScaleFactor) * (int) systemScaleFactor; double lineThickness = (1. / systemScaleFactor) * (int) systemScaleFactor;
// Java 8 uses drawLine() to paint grid lines // Java 8 uses drawLine() to paint grid lines
// Java 9+ uses fillRect() to paint grid lines // Java 9+ uses fillRect() to paint grid lines (except for dragged column)
g = new Graphics2DProxy( (Graphics2D) g ) { g = new Graphics2DProxy( (Graphics2D) g ) {
@Override @Override
public void drawLine( int x1, int y1, int x2, int y2 ) { public void drawLine( int x1, int y1, int x2, int y2 ) {
@@ -241,6 +236,22 @@ public class FlatTableUI
wasInvokedFromPaintGrid() ) wasInvokedFromPaintGrid() )
return; return;
// on Java 9+, fix wrong grid line thickness in dragged column
if( isDragging &&
SystemInfo.isJava_9_orLater &&
((horizontalLines && y1 == y2) || (verticalLines && x1 == x2)) &&
wasInvokedFromPaintDraggedArea() )
{
if( y1 == y2 ) {
// horizontal grid line
super.fill( new Rectangle2D.Double( x1, y1, x2 - x1 + 1, lineThickness ) );
} else if( x1 == x2 ) {
// vertical grid line
super.fill( new Rectangle2D.Double( x1, y1, lineThickness, y2 - y1 + 1 ) );
}
return;
}
super.drawLine( x1, y1, x2, y2 ); super.drawLine( x1, y1, x2, y2 );
} }
@@ -268,12 +279,24 @@ public class FlatTableUI
} }
private boolean wasInvokedFromPaintGrid() { private boolean wasInvokedFromPaintGrid() {
return wasInvokedFromMethod( "paintGrid" );
}
private boolean wasInvokedFromPaintDraggedArea() {
return wasInvokedFromMethod( "paintDraggedArea" );
}
private boolean wasInvokedFromMethod( String methodName ) {
StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace(); StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
for( int i = 0; i < 10 || i < stackTrace.length; i++ ) { for( int i = 0; i < 10 || i < stackTrace.length; i++ ) {
if( "javax.swing.plaf.basic.BasicTableUI".equals( stackTrace[i].getClassName() ) && if( "javax.swing.plaf.basic.BasicTableUI".equals( stackTrace[i].getClassName() ) ) {
"paintGrid".equals( stackTrace[i].getMethodName() ) ) String methodName2 = stackTrace[i].getMethodName();
if( "paintCell".equals( methodName2 ) )
return false;
if( methodName.equals( methodName2 ) )
return true; return true;
} }
}
return false; return false;
} }
}; };
@@ -281,4 +304,26 @@ public class FlatTableUI
super.paint( g, c ); 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);
}
} }

View File

@@ -39,6 +39,7 @@ import javax.swing.text.Caret;
import javax.swing.text.JTextComponent; import javax.swing.text.JTextComponent;
import com.formdev.flatlaf.FlatClientProperties; import com.formdev.flatlaf.FlatClientProperties;
import com.formdev.flatlaf.util.HiDPIUtils; import com.formdev.flatlaf.util.HiDPIUtils;
import com.formdev.flatlaf.util.JavaCompatibility;
/** /**
* Provides the Flat LaF UI delegate for {@link javax.swing.JTextField}. * Provides the Flat LaF UI delegate for {@link javax.swing.JTextField}.
@@ -213,7 +214,9 @@ public class FlatTextFieldUI
// paint placeholder // paint placeholder
g.setColor( placeholderForeground ); 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 @Override

View File

@@ -47,6 +47,7 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleContext;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.Box;
import javax.swing.BoxLayout; import javax.swing.BoxLayout;
import javax.swing.Icon; import javax.swing.Icon;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;
@@ -63,7 +64,7 @@ import javax.swing.border.AbstractBorder;
import javax.swing.border.Border; import javax.swing.border.Border;
import com.formdev.flatlaf.FlatClientProperties; import com.formdev.flatlaf.FlatClientProperties;
import com.formdev.flatlaf.FlatSystemProperties; import com.formdev.flatlaf.FlatSystemProperties;
import com.formdev.flatlaf.ui.JBRCustomDecorations.JBRWindowTopBorder; import com.formdev.flatlaf.ui.FlatNativeWindowBorder.WindowTopBorder;
import com.formdev.flatlaf.util.ScaledImageIcon; import com.formdev.flatlaf.util.ScaledImageIcon;
import com.formdev.flatlaf.util.SystemInfo; import com.formdev.flatlaf.util.SystemInfo;
import com.formdev.flatlaf.util.UIScale; import com.formdev.flatlaf.util.UIScale;
@@ -77,12 +78,15 @@ import com.formdev.flatlaf.util.UIScale;
* @uiDefault TitlePane.inactiveForeground Color * @uiDefault TitlePane.inactiveForeground Color
* @uiDefault TitlePane.embeddedForeground Color * @uiDefault TitlePane.embeddedForeground Color
* @uiDefault TitlePane.borderColor Color optional * @uiDefault TitlePane.borderColor Color optional
* @uiDefault TitlePane.unifiedBackground boolean
* @uiDefault TitlePane.iconSize Dimension * @uiDefault TitlePane.iconSize Dimension
* @uiDefault TitlePane.iconMargins Insets * @uiDefault TitlePane.iconMargins Insets
* @uiDefault TitlePane.titleMargins Insets * @uiDefault TitlePane.titleMargins Insets
* @uiDefault TitlePane.menuBarMargins Insets
* @uiDefault TitlePane.menuBarEmbedded boolean * @uiDefault TitlePane.menuBarEmbedded boolean
* @uiDefault TitlePane.buttonMaximizedHeight int * @uiDefault TitlePane.buttonMaximizedHeight int
* @uiDefault TitlePane.centerTitle boolean
* @uiDefault TitlePane.centerTitleIfMenuBarEmbedded boolean
* @uiDefault TitlePane.menuBarTitleGap int
* @uiDefault TitlePane.closeIcon Icon * @uiDefault TitlePane.closeIcon Icon
* @uiDefault TitlePane.iconifyIcon Icon * @uiDefault TitlePane.iconifyIcon Icon
* @uiDefault TitlePane.maximizeIcon Icon * @uiDefault TitlePane.maximizeIcon Icon
@@ -100,9 +104,12 @@ public class FlatTitlePane
protected final Color embeddedForeground = UIManager.getColor( "TitlePane.embeddedForeground" ); protected final Color embeddedForeground = UIManager.getColor( "TitlePane.embeddedForeground" );
protected final Color borderColor = UIManager.getColor( "TitlePane.borderColor" ); protected final Color borderColor = UIManager.getColor( "TitlePane.borderColor" );
protected final Insets menuBarMargins = UIManager.getInsets( "TitlePane.menuBarMargins" ); protected final boolean unifiedBackground = UIManager.getBoolean( "TitlePane.unifiedBackground" );
protected final Dimension iconSize = UIManager.getDimension( "TitlePane.iconSize" ); protected final Dimension iconSize = UIManager.getDimension( "TitlePane.iconSize" );
protected final int buttonMaximizedHeight = UIManager.getInt( "TitlePane.buttonMaximizedHeight" ); protected final int buttonMaximizedHeight = UIManager.getInt( "TitlePane.buttonMaximizedHeight" );
protected final boolean centerTitle = UIManager.getBoolean( "TitlePane.centerTitle" );
protected final boolean centerTitleIfMenuBarEmbedded = FlatUIUtils.getUIBoolean( "TitlePane.centerTitleIfMenuBarEmbedded", true );
protected final int menuBarTitleGap = FlatUIUtils.getUIInt( "TitlePane.menuBarTitleGap", 20 );
protected final JRootPane rootPane; protected final JRootPane rootPane;
@@ -147,9 +154,15 @@ public class FlatTitlePane
protected void addSubComponents() { protected void addSubComponents() {
leftPanel = new JPanel(); leftPanel = new JPanel();
iconLabel = new JLabel(); iconLabel = new JLabel();
titleLabel = new JLabel(); titleLabel = new JLabel() {
@Override
public void updateUI() {
setUI( new FlatTitleLabelUI() );
}
};
iconLabel.setBorder( new FlatEmptyBorder( UIManager.getInsets( "TitlePane.iconMargins" ) ) ); iconLabel.setBorder( new FlatEmptyBorder( UIManager.getInsets( "TitlePane.iconMargins" ) ) );
titleLabel.setBorder( new FlatEmptyBorder( UIManager.getInsets( "TitlePane.titleMargins" ) ) ); titleLabel.setBorder( new FlatEmptyBorder( UIManager.getInsets( "TitlePane.titleMargins" ) ) );
titleLabel.setHorizontalAlignment( SwingConstants.CENTER );
leftPanel.setLayout( new BoxLayout( leftPanel, BoxLayout.LINE_AXIS ) ); leftPanel.setLayout( new BoxLayout( leftPanel, BoxLayout.LINE_AXIS ) );
leftPanel.setOpaque( false ); leftPanel.setOpaque( false );
@@ -159,9 +172,7 @@ public class FlatTitlePane
@Override @Override
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
JMenuBar menuBar = rootPane.getJMenuBar(); JMenuBar menuBar = rootPane.getJMenuBar();
return (menuBar != null && menuBar.isVisible() && isMenuBarEmbedded()) return hasVisibleEmbeddedMenuBar( menuBar ) ? menuBar.getPreferredSize() : new Dimension();
? FlatUIUtils.addInsets( menuBar.getPreferredSize(), UIScale.scale( menuBarMargins ) )
: new Dimension();
} }
}; };
leftPanel.add( menuBarPlaceholder ); leftPanel.add( menuBarPlaceholder );
@@ -184,6 +195,18 @@ public class FlatTitlePane
if( !getComponentOrientation().isLeftToRight() ) if( !getComponentOrientation().isLeftToRight() )
leftPanel.setLocation( leftPanel.getX() + (oldWidth - newWidth), leftPanel.getY() ); leftPanel.setLocation( leftPanel.getX() + (oldWidth - newWidth), leftPanel.getY() );
} }
// If menu bar is embedded and contains a horizontal glue component,
// then move the title label to the same location as the glue component.
// This allows placing any component on the trailing side of the title pane.
JMenuBar menuBar = rootPane.getJMenuBar();
if( hasVisibleEmbeddedMenuBar( menuBar ) ) {
Component horizontalGlue = findHorizontalGlue( menuBar );
if( horizontalGlue != null ) {
Point glueLocation = SwingUtilities.convertPoint( horizontalGlue, 0, 0, titleLabel );
titleLabel.setLocation( titleLabel.getX() + glueLocation.x, titleLabel.getY() );
}
}
} }
} ); } );
@@ -240,7 +263,7 @@ public class FlatTitlePane
} }
protected void activeChanged( boolean active ) { protected void activeChanged( boolean active ) {
boolean hasEmbeddedMenuBar = rootPane.getJMenuBar() != null && rootPane.getJMenuBar().isVisible() && isMenuBarEmbedded(); boolean hasEmbeddedMenuBar = hasVisibleEmbeddedMenuBar( rootPane.getJMenuBar() );
Color background = FlatUIUtils.nonUIResource( active ? activeBackground : inactiveBackground ); Color background = FlatUIUtils.nonUIResource( active ? activeBackground : inactiveBackground );
Color foreground = FlatUIUtils.nonUIResource( active ? activeForeground : inactiveForeground ); Color foreground = FlatUIUtils.nonUIResource( active ? activeForeground : inactiveForeground );
Color titleForeground = (hasEmbeddedMenuBar && active) ? FlatUIUtils.nonUIResource( embeddedForeground ) : foreground; Color titleForeground = (hasEmbeddedMenuBar && active) ? FlatUIUtils.nonUIResource( embeddedForeground ) : foreground;
@@ -252,8 +275,6 @@ public class FlatTitlePane
restoreButton.setForeground( foreground ); restoreButton.setForeground( foreground );
closeButton.setForeground( foreground ); closeButton.setForeground( foreground );
titleLabel.setHorizontalAlignment( hasEmbeddedMenuBar ? SwingConstants.CENTER : SwingConstants.LEADING );
// this is necessary because hover/pressed colors are derived from background color // this is necessary because hover/pressed colors are derived from background color
iconifyButton.setBackground( background ); iconifyButton.setBackground( background );
maximizeButton.setBackground( background ); maximizeButton.setBackground( background );
@@ -337,7 +358,7 @@ public class FlatTitlePane
// show/hide icon // show/hide icon
iconLabel.setVisible( hasIcon ); iconLabel.setVisible( hasIcon );
updateJBRHitTestSpotsAndTitleBarHeightLater(); updateNativeTitleBarHeightAndHitTestSpotsLater();
} }
@Override @Override
@@ -355,7 +376,7 @@ public class FlatTitlePane
installWindowListeners(); installWindowListeners();
} }
updateJBRHitTestSpotsAndTitleBarHeightLater(); updateNativeTitleBarHeightAndHitTestSpotsLater();
} }
@Override @Override
@@ -394,6 +415,16 @@ public class FlatTitlePane
window.removeComponentListener( handler ); window.removeComponentListener( handler );
} }
/**
* Returns whether this title pane currently has an visible and embedded menubar.
*/
protected boolean hasVisibleEmbeddedMenuBar( JMenuBar menuBar ) {
return menuBar != null && menuBar.isVisible() && isMenuBarEmbedded();
}
/**
* Returns whether the menubar should be embedded into the title pane.
*/
protected boolean isMenuBarEmbedded() { protected boolean isMenuBarEmbedded() {
// not storing value of "TitlePane.menuBarEmbedded" in class to allow changing at runtime // not storing value of "TitlePane.menuBarEmbedded" in class to allow changing at runtime
return UIManager.getBoolean( "TitlePane.menuBarEmbedded" ) && return UIManager.getBoolean( "TitlePane.menuBarEmbedded" ) &&
@@ -412,13 +443,30 @@ public class FlatTitlePane
Insets borderInsets = getBorder().getBorderInsets( this ); Insets borderInsets = getBorder().getBorderInsets( this );
bounds.height += borderInsets.bottom; bounds.height += borderInsets.bottom;
return FlatUIUtils.subtractInsets( bounds, UIScale.scale( getMenuBarMargins() ) ); // If menu bar is embedded and contains a horizontal glue component,
// then make the menu bar wider so that it completely overlaps the title label.
// Since the menu bar is not opaque, the title label is still visible.
// The title label is moved to the location of the glue component by the layout manager.
// This allows placing any component on the trailing side of the title pane.
Component horizontalGlue = findHorizontalGlue( rootPane.getJMenuBar() );
if( horizontalGlue != null ) {
int titleWidth = Math.max( titleLabel.getWidth(), 0 ); // title width may be negative
bounds.width += titleWidth;
if( !getComponentOrientation().isLeftToRight() )
bounds.x -= titleWidth;
} }
protected Insets getMenuBarMargins() { return bounds;
return getComponentOrientation().isLeftToRight() }
? menuBarMargins
: new Insets( menuBarMargins.top, menuBarMargins.right, menuBarMargins.bottom, menuBarMargins.left ); protected Component findHorizontalGlue( JMenuBar menuBar ) {
int count = menuBar.getComponentCount();
for( int i = count - 1; i >= 0; i-- ) {
Component c = menuBar.getComponent( i );
if( c instanceof Box.Filler && c.getMaximumSize().width >= Short.MAX_VALUE )
return c;
}
return null;
} }
protected void menuBarChanged() { protected void menuBarChanged() {
@@ -435,7 +483,8 @@ public class FlatTitlePane
} }
protected void menuBarLayouted() { protected void menuBarLayouted() {
updateJBRHitTestSpotsAndTitleBarHeightLater(); updateNativeTitleBarHeightAndHitTestSpotsLater();
revalidate();
} }
/*debug /*debug
@@ -449,17 +498,26 @@ public class FlatTitlePane
} }
if( debugHitTestSpots != null ) { if( debugHitTestSpots != null ) {
g.setColor( Color.blue ); g.setColor( Color.blue );
Point offset = SwingUtilities.convertPoint( this, 0, 0, window );
for( Rectangle r : debugHitTestSpots ) for( Rectangle r : debugHitTestSpots )
g.drawRect( r.x, r.y, r.width, r.height ); g.drawRect( r.x - offset.x, r.y - offset.y, r.width - 1, r.height - 1 );
}
if( debugAppIconBounds != null ) {
g.setColor( Color.red );
Point offset = SwingUtilities.convertPoint( this, 0, 0, window );
Rectangle r = debugAppIconBounds;
g.drawRect( r.x - offset.x, r.y - offset.y, r.width - 1, r.height - 1 );
} }
} }
debug*/ debug*/
@Override @Override
protected void paintComponent( Graphics g ) { protected void paintComponent( Graphics g ) {
if( !unifiedBackground ) {
g.setColor( getBackground() ); g.setColor( getBackground() );
g.fillRect( 0, 0, getWidth(), getHeight() ); g.fillRect( 0, 0, getWidth(), getHeight() );
} }
}
protected void repaintWindowBorder() { protected void repaintWindowBorder() {
int width = rootPane.getWidth(); int width = rootPane.getWidth();
@@ -503,9 +561,9 @@ debug*/
Frame frame = (Frame) window; Frame frame = (Frame) window;
// set maximized bounds to avoid that maximized window overlaps Windows task bar // set maximized bounds to avoid that maximized window overlaps Windows task bar
// (if not running in JBR and if not modified from the application) // (if not having native window border and if not modified from the application)
Rectangle oldMaximizedBounds = frame.getMaximizedBounds(); Rectangle oldMaximizedBounds = frame.getMaximizedBounds();
if( !hasJBRCustomDecoration() && if( !hasNativeCustomDecoration() &&
(oldMaximizedBounds == null || (oldMaximizedBounds == null ||
Objects.equals( oldMaximizedBounds, rootPane.getClientProperty( "_flatlaf.maximizedBounds" ) )) ) Objects.equals( oldMaximizedBounds, rootPane.getClientProperty( "_flatlaf.maximizedBounds" ) )) )
{ {
@@ -601,65 +659,115 @@ debug*/
window.dispatchEvent( new WindowEvent( window, WindowEvent.WINDOW_CLOSING ) ); window.dispatchEvent( new WindowEvent( window, WindowEvent.WINDOW_CLOSING ) );
} }
protected boolean hasJBRCustomDecoration() { private boolean hasJBRCustomDecoration() {
return FlatRootPaneUI.canUseJBRCustomDecorations && return window != null && JBRCustomDecorations.hasCustomDecoration( window );
window != null &&
JBRCustomDecorations.hasCustomDecoration( window );
} }
protected void updateJBRHitTestSpotsAndTitleBarHeightLater() { /**
* Returns whether windows uses native window border and has custom decorations enabled.
*/
protected boolean hasNativeCustomDecoration() {
return window != null && FlatNativeWindowBorder.hasCustomDecoration( window );
}
protected void updateNativeTitleBarHeightAndHitTestSpotsLater() {
EventQueue.invokeLater( () -> { EventQueue.invokeLater( () -> {
updateJBRHitTestSpotsAndTitleBarHeight(); updateNativeTitleBarHeightAndHitTestSpots();
} ); } );
} }
protected void updateJBRHitTestSpotsAndTitleBarHeight() { protected void updateNativeTitleBarHeightAndHitTestSpots() {
if( !isDisplayable() ) if( !isDisplayable() )
return; return;
if( !hasJBRCustomDecoration() ) if( !hasNativeCustomDecoration() )
return; return;
List<Rectangle> hitTestSpots = new ArrayList<>();
if( iconLabel.isVisible() )
addJBRHitTestSpot( iconLabel, false, hitTestSpots );
addJBRHitTestSpot( buttonPanel, false, hitTestSpots );
addJBRHitTestSpot( menuBarPlaceholder, true, hitTestSpots );
int titleBarHeight = getHeight(); int titleBarHeight = getHeight();
// slightly reduce height so that component receives mouseExit events // slightly reduce height so that component receives mouseExit events
if( titleBarHeight > 0 ) if( titleBarHeight > 0 )
titleBarHeight--; titleBarHeight--;
JBRCustomDecorations.setHitTestSpotsAndTitleBarHeight( window, hitTestSpots, titleBarHeight ); List<Rectangle> hitTestSpots = new ArrayList<>();
Rectangle appIconBounds = null;
if( iconLabel.isVisible() ) {
// compute real icon size (without insets)
Point location = SwingUtilities.convertPoint( iconLabel, 0, 0, window );
Insets iconInsets = iconLabel.getInsets();
Rectangle iconBounds = new Rectangle(
location.x + iconInsets.left,
location.y + iconInsets.top,
iconLabel.getWidth() - iconInsets.left - iconInsets.right,
iconLabel.getHeight() - iconInsets.top - iconInsets.bottom );
if( hasJBRCustomDecoration() )
hitTestSpots.add( iconBounds );
else
appIconBounds = iconBounds;
}
Rectangle r = getNativeHitTestSpot( buttonPanel );
if( r != null )
hitTestSpots.add( r );
r = getNativeHitTestSpot( menuBarPlaceholder );
if( r != null ) {
Component horizontalGlue = findHorizontalGlue( rootPane.getJMenuBar() );
if( horizontalGlue != null ) {
// If menu bar is embedded and contains a horizontal glue component,
// then split the hit test spot into two spots so that
// the glue component area can used to move the window.
Point glueLocation = SwingUtilities.convertPoint( horizontalGlue, 0, 0, window );
Rectangle r2;
if( getComponentOrientation().isLeftToRight() ) {
int trailingWidth = (r.x + r.width - HIT_TEST_SPOT_GROW) - glueLocation.x;
r.width -= trailingWidth;
r2 = new Rectangle( glueLocation.x + horizontalGlue.getWidth(), r.y, trailingWidth, r.height );
} else {
int leadingWidth = (glueLocation.x + horizontalGlue.getWidth()) - (r.x + HIT_TEST_SPOT_GROW);
r.x += leadingWidth;
r.width -= leadingWidth;
r2 = new Rectangle( glueLocation.x -leadingWidth, r.y, leadingWidth, r.height );
}
r2.grow( HIT_TEST_SPOT_GROW, HIT_TEST_SPOT_GROW );
hitTestSpots.add( r2 );
}
hitTestSpots.add( r );
}
FlatNativeWindowBorder.setTitleBarHeightAndHitTestSpots( window, titleBarHeight, hitTestSpots, appIconBounds );
/*debug /*debug
debugHitTestSpots = hitTestSpots;
debugTitleBarHeight = titleBarHeight; debugTitleBarHeight = titleBarHeight;
debugHitTestSpots = hitTestSpots;
debugAppIconBounds = appIconBounds;
repaint(); repaint();
debug*/ debug*/
} }
protected void addJBRHitTestSpot( JComponent c, boolean subtractMenuBarMargins, List<Rectangle> hitTestSpots ) { protected Rectangle getNativeHitTestSpot( JComponent c ) {
Dimension size = c.getSize(); Dimension size = c.getSize();
if( size.width <= 0 || size.height <= 0 ) if( size.width <= 0 || size.height <= 0 )
return; return null;
Point location = SwingUtilities.convertPoint( c, 0, 0, window ); Point location = SwingUtilities.convertPoint( c, 0, 0, window );
Rectangle r = new Rectangle( location, size ); Rectangle r = new Rectangle( location, size );
if( subtractMenuBarMargins )
r = FlatUIUtils.subtractInsets( r, UIScale.scale( getMenuBarMargins() ) );
// slightly increase rectangle so that component receives mouseExit events // slightly increase rectangle so that component receives mouseExit events
r.grow( 2, 2 ); r.grow( HIT_TEST_SPOT_GROW, HIT_TEST_SPOT_GROW );
hitTestSpots.add( r ); return r;
} }
private static final int HIT_TEST_SPOT_GROW = 2;
/*debug /*debug
private List<Rectangle> debugHitTestSpots;
private int debugTitleBarHeight; private int debugTitleBarHeight;
private List<Rectangle> debugHitTestSpots;
private Rectangle debugAppIconBounds;
debug*/ debug*/
//---- class TitlePaneBorder ---------------------------------------------- //---- class FlatTitlePaneBorder ------------------------------------------
protected class FlatTitlePaneBorder protected class FlatTitlePaneBorder
extends AbstractBorder extends AbstractBorder
@@ -676,8 +784,8 @@ debug*/
} else if( borderColor != null && (rootPane.getJMenuBar() == null || !rootPane.getJMenuBar().isVisible()) ) } else if( borderColor != null && (rootPane.getJMenuBar() == null || !rootPane.getJMenuBar().isVisible()) )
insets.bottom += UIScale.scale( 1 ); insets.bottom += UIScale.scale( 1 );
if( hasJBRCustomDecoration() ) if( hasNativeCustomDecoration() )
insets = FlatUIUtils.addInsets( insets, JBRWindowTopBorder.getInstance().getBorderInsets() ); insets = FlatUIUtils.addInsets( insets, WindowTopBorder.getInstance().getBorderInsets() );
return insets; return insets;
} }
@@ -695,13 +803,51 @@ debug*/
FlatUIUtils.paintFilledRectangle( g, borderColor, x, y + height - lineHeight, width, lineHeight ); FlatUIUtils.paintFilledRectangle( g, borderColor, x, y + height - lineHeight, width, lineHeight );
} }
if( hasJBRCustomDecoration() ) if( hasNativeCustomDecoration() )
JBRWindowTopBorder.getInstance().paintBorder( c, g, x, y, width, height ); WindowTopBorder.getInstance().paintBorder( c, g, x, y, width, height );
} }
protected Border getMenuBarBorder() { protected Border getMenuBarBorder() {
JMenuBar menuBar = rootPane.getJMenuBar(); JMenuBar menuBar = rootPane.getJMenuBar();
return (menuBar != null && menuBar.isVisible() && isMenuBarEmbedded()) ? menuBar.getBorder() : null; return hasVisibleEmbeddedMenuBar( menuBar ) ? menuBar.getBorder() : null;
}
}
//---- class FlatTitleLabelUI ---------------------------------------------
/**
* @since 1.1
*/
protected class FlatTitleLabelUI
extends FlatLabelUI
{
@Override
protected void paintEnabledText( JLabel l, Graphics g, String s, int textX, int textY ) {
boolean hasEmbeddedMenuBar = hasVisibleEmbeddedMenuBar( rootPane.getJMenuBar() );
int labelWidth = l.getWidth();
int textWidth = labelWidth - (textX * 2);
int gap = UIScale.scale( menuBarTitleGap );
// The passed in textX coordinate is always to horizontally center the text within the label bounds.
// Modify textX so that the text is painted either centered within the window bounds or leading aligned.
boolean center = hasEmbeddedMenuBar ? centerTitleIfMenuBarEmbedded : centerTitle;
if( center ) {
// If window is wide enough, center title within window bounds.
// Otherwise leave it centered within free space (label bounds).
int centeredTextX = ((l.getParent().getWidth() - textWidth) / 2) - l.getX();
if( centeredTextX >= gap && centeredTextX + textWidth <= labelWidth - gap )
textX = centeredTextX;
} else {
// leading aligned
boolean leftToRight = getComponentOrientation().isLeftToRight();
Insets insets = l.getInsets();
int leadingInset = hasEmbeddedMenuBar ? gap : (leftToRight ? insets.left : insets.right);
int leadingTextX = leftToRight ? leadingInset : labelWidth - leadingInset - textWidth;
if( leftToRight ? leadingTextX < textX : leadingTextX > textX )
textX = leadingTextX;
}
super.paintEnabledText( l, g, s, textX, textY );
} }
} }
@@ -730,7 +876,7 @@ debug*/
break; break;
case "componentOrientation": case "componentOrientation":
updateJBRHitTestSpotsAndTitleBarHeightLater(); updateNativeTitleBarHeightAndHitTestSpotsLater();
break; break;
} }
} }
@@ -740,10 +886,10 @@ debug*/
@Override @Override
public void windowActivated( WindowEvent e ) { public void windowActivated( WindowEvent e ) {
activeChanged( true ); activeChanged( true );
updateJBRHitTestSpotsAndTitleBarHeight(); updateNativeTitleBarHeightAndHitTestSpots();
if( hasJBRCustomDecoration() ) if( hasNativeCustomDecoration() )
JBRWindowTopBorder.getInstance().repaintBorder( FlatTitlePane.this ); WindowTopBorder.getInstance().repaintBorder( FlatTitlePane.this );
repaintWindowBorder(); repaintWindowBorder();
} }
@@ -751,10 +897,10 @@ debug*/
@Override @Override
public void windowDeactivated( WindowEvent e ) { public void windowDeactivated( WindowEvent e ) {
activeChanged( false ); activeChanged( false );
updateJBRHitTestSpotsAndTitleBarHeight(); updateNativeTitleBarHeightAndHitTestSpots();
if( hasJBRCustomDecoration() ) if( hasNativeCustomDecoration() )
JBRWindowTopBorder.getInstance().repaintBorder( FlatTitlePane.this ); WindowTopBorder.getInstance().repaintBorder( FlatTitlePane.this );
repaintWindowBorder(); repaintWindowBorder();
} }
@@ -762,7 +908,7 @@ debug*/
@Override @Override
public void windowStateChanged( WindowEvent e ) { public void windowStateChanged( WindowEvent e ) {
frameStateChanged(); frameStateChanged();
updateJBRHitTestSpotsAndTitleBarHeight(); updateNativeTitleBarHeightAndHitTestSpots();
} }
//---- interface MouseListener ---- //---- interface MouseListener ----
@@ -775,7 +921,7 @@ debug*/
if( e.getSource() == iconLabel ) { if( e.getSource() == iconLabel ) {
// double-click on icon closes window // double-click on icon closes window
close(); close();
} else if( !hasJBRCustomDecoration() && } else if( !hasNativeCustomDecoration() &&
window instanceof Frame && window instanceof Frame &&
((Frame)window).isResizable() ) ((Frame)window).isResizable() )
{ {
@@ -808,8 +954,8 @@ debug*/
if( window == null ) if( window == null )
return; // should newer occur return; // should newer occur
if( hasJBRCustomDecoration() ) if( hasNativeCustomDecoration() )
return; // do nothing if running in JBR return; // do nothing if having native window border
// restore window if it is maximized // restore window if it is maximized
if( window instanceof Frame ) { if( window instanceof Frame ) {
@@ -852,7 +998,7 @@ debug*/
@Override @Override
public void componentResized( ComponentEvent e ) { public void componentResized( ComponentEvent e ) {
updateJBRHitTestSpotsAndTitleBarHeightLater(); updateNativeTitleBarHeightAndHitTestSpotsLater();
} }
@Override @Override

View File

@@ -146,10 +146,17 @@ public class FlatToggleButtonUI
int height = c.getHeight(); int height = c.getHeight();
int width = c.getWidth(); int width = c.getWidth();
boolean selected = ((AbstractButton)c).isSelected(); 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 // paint background
Color background = buttonStateColor( c, Color background = buttonStateColor( c, enabledColor,
selected ? clientPropertyColor( c, TAB_BUTTON_SELECTED_BACKGROUND, tabSelectedBackground ) : null,
null, tabFocusBackground, tabHoverBackground, null ); null, tabFocusBackground, tabHoverBackground, null );
if( background != null ) { if( background != null ) {
g.setColor( background ); g.setColor( background );

View File

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

View File

@@ -71,7 +71,7 @@ public class FlatToolTipUI
if( sharedPropertyChangedListener == null ) { if( sharedPropertyChangedListener == null ) {
sharedPropertyChangedListener = e -> { sharedPropertyChangedListener = e -> {
String name = e.getPropertyName(); String name = e.getPropertyName();
if( name == "text" || name == "font" || name == "foreground" ) { if( name == "tiptext" || name == "font" || name == "foreground" ) {
JToolTip toolTip = (JToolTip) e.getSource(); JToolTip toolTip = (JToolTip) e.getSource();
FlatLabelUI.updateHTMLRenderer( toolTip, toolTip.getTipText(), false ); FlatLabelUI.updateHTMLRenderer( toolTip, toolTip.getTipText(), false );
} }
@@ -116,7 +116,6 @@ public class FlatToolTipUI
FontMetrics fm = c.getFontMetrics( c.getFont() ); FontMetrics fm = c.getFontMetrics( c.getFont() );
Insets insets = c.getInsets(); Insets insets = c.getInsets();
FlatUIUtils.setRenderingHints( (Graphics2D) g );
g.setColor( c.getForeground() ); g.setColor( c.getForeground() );
List<String> lines = StringUtils.split( ((JToolTip)c).getTipText(), '\n' ); List<String> lines = StringUtils.split( ((JToolTip)c).getTipText(), '\n' );

View File

@@ -16,6 +16,8 @@
package com.formdev.flatlaf.ui; package com.formdev.flatlaf.ui;
import static com.formdev.flatlaf.FlatClientProperties.*;
import java.awt.Color; import java.awt.Color;
import java.awt.Component; import java.awt.Component;
import java.awt.Graphics; import java.awt.Graphics;
@@ -23,10 +25,11 @@ import java.awt.Insets;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener; import java.awt.event.MouseListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import javax.swing.CellRendererPane; import javax.swing.CellRendererPane;
import javax.swing.Icon;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JTree; import javax.swing.JTree;
import javax.swing.LookAndFeel; import javax.swing.LookAndFeel;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
@@ -145,9 +148,6 @@ public class FlatTreeUI
@Override @Override
protected MouseListener createMouseListener() { protected MouseListener createMouseListener() {
if( !wideSelection )
return super.createMouseListener();
return new BasicTreeUI.MouseHandler() { return new BasicTreeUI.MouseHandler() {
@Override @Override
public void mousePressed( MouseEvent e ) { public void mousePressed( MouseEvent e ) {
@@ -165,7 +165,7 @@ public class FlatTreeUI
} }
private MouseEvent handleWideMouseEvent( MouseEvent e ) { private MouseEvent handleWideMouseEvent( MouseEvent e ) {
if( !tree.isEnabled() || !SwingUtilities.isLeftMouseButton( e ) || e.isConsumed() ) if( !isWideSelection() || !tree.isEnabled() || !SwingUtilities.isLeftMouseButton( e ) || e.isConsumed() )
return e; return e;
int x = e.getX(); int x = e.getX();
@@ -192,19 +192,27 @@ public class FlatTreeUI
@Override @Override
protected PropertyChangeListener createPropertyChangeListener() { protected PropertyChangeListener createPropertyChangeListener() {
if( !wideSelection ) PropertyChangeListener superListener = super.createPropertyChangeListener();
return super.createPropertyChangeListener(); return e -> {
superListener.propertyChange( e );
return new BasicTreeUI.PropertyChangeHandler() { if( e.getSource() == tree ) {
@Override switch( e.getPropertyName() ) {
public void propertyChange( PropertyChangeEvent e ) { case TREE_WIDE_SELECTION:
super.propertyChange( e ); case TREE_PAINT_SELECTION:
tree.repaint();
break;
if( e.getSource() == tree && e.getPropertyName() == "dropLocation" ) { case "dropLocation":
if( isWideSelection() ) {
JTree.DropLocation oldValue = (JTree.DropLocation) e.getOldValue(); JTree.DropLocation oldValue = (JTree.DropLocation) e.getOldValue();
repaintWideDropLocation( oldValue ); repaintWideDropLocation( oldValue );
repaintWideDropLocation( tree.getDropLocation() ); repaintWideDropLocation( tree.getDropLocation() );
} }
break;
}
}
};
} }
private void repaintWideDropLocation(JTree.DropLocation loc) { private void repaintWideDropLocation(JTree.DropLocation loc) {
@@ -215,8 +223,6 @@ public class FlatTreeUI
if( r != null ) if( r != null )
tree.repaint( 0, r.y, tree.getWidth(), r.height ); tree.repaint( 0, r.y, tree.getWidth(), r.height );
} }
};
}
/** /**
* Same as super.paintRow(), but supports wide selection and uses * Same as super.paintRow(), but supports wide selection and uses
@@ -227,34 +233,22 @@ public class FlatTreeUI
TreePath path, int row, boolean isExpanded, boolean hasBeenExpanded, boolean isLeaf ) TreePath path, int row, boolean isExpanded, boolean hasBeenExpanded, boolean isLeaf )
{ {
boolean isEditing = (editingComponent != null && editingRow == row); boolean isEditing = (editingComponent != null && editingRow == row);
boolean hasFocus = FlatUIUtils.isPermanentFocusOwner( tree );
boolean cellHasFocus = hasFocus && (row == getLeadSelectionRow());
boolean isSelected = tree.isRowSelected( row ); boolean isSelected = tree.isRowSelected( row );
boolean isDropRow = isDropRow( 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), // 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 // check whether that component is focused to get correct selection colors
if( !hasFocus && isSelected && tree.getParent() instanceof CellRendererPane ) if( !hasFocus && isSelected && tree.getParent() instanceof CellRendererPane )
hasFocus = FlatUIUtils.isPermanentFocusOwner( tree.getParent().getParent() ); 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 // get renderer component
Component rendererComponent = currentCellRenderer.getTreeCellRendererComponent( tree, Component rendererComponent = currentCellRenderer.getTreeCellRendererComponent( tree,
path.getLastPathComponent(), isSelected, isExpanded, isLeaf, row, cellHasFocus ); path.getLastPathComponent(), isSelected, isExpanded, isLeaf, row, cellHasFocus );
@@ -290,7 +284,50 @@ 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 // paint renderer
if( !isEditing )
rendererPane.paintComponent( g, rendererComponent, tree, bounds.x, bounds.y, bounds.width, bounds.height, true ); rendererPane.paintComponent( g, rendererComponent, tree, bounds.x, bounds.y, bounds.width, bounds.height, true );
// restore background selection color and border selection color // restore background selection color and border selection color
@@ -314,6 +351,14 @@ public class FlatTreeUI
@Override @Override
protected Rectangle getDropLineRect( DropLocation loc ) { protected Rectangle getDropLineRect( DropLocation loc ) {
Rectangle r = super.getDropLineRect( 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 );
} }
} }

View File

@@ -16,6 +16,7 @@
package com.formdev.flatlaf.ui; package com.formdev.flatlaf.ui;
import java.awt.BasicStroke;
import java.awt.Color; import java.awt.Color;
import java.awt.Component; import java.awt.Component;
import java.awt.Container; import java.awt.Container;
@@ -30,22 +31,22 @@ import java.awt.KeyboardFocusManager;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.RenderingHints; import java.awt.RenderingHints;
import java.awt.Shape; import java.awt.Shape;
import java.awt.Stroke;
import java.awt.Window; import java.awt.Window;
import java.awt.event.FocusEvent; import java.awt.event.FocusEvent;
import java.awt.event.FocusListener; import java.awt.event.FocusListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.geom.Ellipse2D; import java.awt.geom.Ellipse2D;
import java.awt.geom.Path2D; import java.awt.geom.Path2D;
import java.awt.geom.Rectangle2D; import java.awt.geom.Rectangle2D;
import java.awt.geom.RoundRectangle2D; import java.awt.geom.RoundRectangle2D;
import java.util.IdentityHashMap; import java.util.IdentityHashMap;
import java.util.WeakHashMap; import java.util.WeakHashMap;
import java.util.function.Consumer; import java.util.function.Predicate;
import java.util.function.Supplier; import java.util.function.Supplier;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JTable; import javax.swing.JTable;
import javax.swing.LookAndFeel; import javax.swing.LookAndFeel;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.UIManager; import javax.swing.UIManager;
import javax.swing.border.Border; import javax.swing.border.Border;
@@ -121,6 +122,14 @@ public class FlatUIUtils
return (color != null) ? color : UIManager.getColor( defaultKey ); return (color != null) ? color : UIManager.getColor( defaultKey );
} }
/**
* @since 1.1
*/
public static boolean getUIBoolean( String key, boolean defaultValue ) {
Object value = UIManager.get( key );
return (value instanceof Boolean) ? (Boolean) value : defaultValue;
}
public static int getUIInt( String key, int defaultValue ) { public static int getUIInt( String key, int defaultValue ) {
Object value = UIManager.get( key ); Object value = UIManager.get( key );
return (value instanceof Integer) ? (Integer) value : defaultValue; return (value instanceof Integer) ? (Integer) value : defaultValue;
@@ -178,8 +187,18 @@ public class FlatUIUtils
* Returns whether the given component is the permanent focus owner and * Returns whether the given component is the permanent focus owner and
* is in the active window. Used to paint focus indicators. * is in the active window. Used to paint focus indicators.
*/ */
@SuppressWarnings( "unchecked" )
public static boolean isPermanentFocusOwner( Component c ) { public static boolean isPermanentFocusOwner( Component c ) {
KeyboardFocusManager keyboardFocusManager = KeyboardFocusManager.getCurrentKeyboardFocusManager(); 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 && return keyboardFocusManager.getPermanentFocusOwner() == c &&
keyboardFocusManager.getActiveWindow() == SwingUtilities.windowForComponent( c ); keyboardFocusManager.getActiveWindow() == SwingUtilities.windowForComponent( c );
} }
@@ -240,10 +259,57 @@ public class FlatUIUtils
/** /**
* Sets rendering hints used for painting. * Sets rendering hints used for painting.
*/ */
public static void setRenderingHints( Graphics2D g ) { public static Object[] setRenderingHints( Graphics g ) {
g.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON ); Graphics2D g2 = (Graphics2D) g;
g.setRenderingHint( RenderingHints.KEY_STROKE_CONTROL, 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 ); 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 ) { public static Color deriveColor( Color color, Color baseColor ) {
@@ -290,7 +356,7 @@ public class FlatUIUtils
float innerArc = arc - (lineWidth * 2); float innerArc = arc - (lineWidth * 2);
// reduce outer arc slightly for small arcs to make the curve slightly wider // 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 ); outerArc -= UIScale.scale( 2f );
Path2D path = new Path2D.Float( Path2D.WIND_EVEN_ODD ); Path2D path = new Path2D.Float( Path2D.WIND_EVEN_ODD );
@@ -549,6 +615,111 @@ public class FlatUIUtils
return rect; return rect;
} }
/**
* Paints a chevron or triangle arrow in the center of the given rectangle.
*
* @param g the graphics context used for painting
* @param x the x coordinate of the rectangle
* @param y the y coordinate of the rectangle
* @param width the width of the rectangle
* @param height the height of the rectangle
* @param direction the arrow direction ({@link SwingConstants#NORTH}, {@link SwingConstants#SOUTH}
* {@link SwingConstants#WEST} or {@link SwingConstants#EAST})
* @param chevron {@code true} for chevron arrow, {@code false} for triangle arrow
* @param arrowSize the width of the painted arrow (for vertical direction) (will be scaled)
* @param xOffset a offset added to the x coordinate of the arrow to paint it out-of-center. Usually zero. (will be scaled)
* @param yOffset a offset added to the y coordinate of the arrow to paint it out-of-center. Usually zero. (will be scaled)
*
* @since 1.1
*/
public static void paintArrow( Graphics2D g, int x, int y, int width, int height,
int direction, boolean chevron, int arrowSize, int xOffset, int yOffset )
{
// compute arrow width/height
int aw = UIScale.scale( arrowSize + (chevron ? 0 : 1) );
int ah = UIScale.scale( (arrowSize / 2) + (chevron ? 0 : 1) );
// rotate arrow width/height for horizontal directions
boolean vert = (direction == SwingConstants.NORTH || direction == SwingConstants.SOUTH);
if( !vert ) {
int temp = aw;
aw = ah;
ah = temp;
}
// chevron lines end 1px outside of width/height
// --> add 1px to arrow width/height for position calculation
int extra = chevron ? 1 : 0;
// compute arrow location
int ax = x + Math.round( ((width - (aw + extra)) / 2f) + UIScale.scale( (float) xOffset ) );
int ay = y + Math.round( ((height - (ah + extra)) / 2f) + UIScale.scale( (float) yOffset ) );
// paint arrow
g.translate( ax, ay );
/*debug
debugPaintArrow( g, Color.red, vert, aw + extra, ah + extra );
debug*/
Shape arrowShape = createArrowShape( direction, chevron, aw, ah );
if( chevron ) {
Stroke oldStroke = g.getStroke();
g.setStroke( new BasicStroke( UIScale.scale( 1f ) ) );
g.draw( arrowShape );
g.setStroke( oldStroke );
} else {
// triangle
g.fill( arrowShape );
}
g.translate( -ax, -ay );
}
/**
* Creates a chevron or triangle arrow shape for the given direction and size.
* <p>
* The chevron shape is a open path that can be painted with {@link Graphics2D#draw(Shape)}.
* The triangle shape is a close path that can be painted with {@link Graphics2D#fill(Shape)}.
*
* @param direction the arrow direction ({@link SwingConstants#NORTH}, {@link SwingConstants#SOUTH}
* {@link SwingConstants#WEST} or {@link SwingConstants#EAST})
* @param chevron {@code true} for chevron arrow, {@code false} for triangle arrow
* @param w the width of the returned shape
* @param h the height of the returned shape
*
* @since 1.1
*/
public static Shape createArrowShape( int direction, boolean chevron, float w, float h ) {
switch( direction ) {
case SwingConstants.NORTH: return createPath( !chevron, 0,h, (w / 2f),0, w,h );
case SwingConstants.SOUTH: return createPath( !chevron, 0,0, (w / 2f),h, w,0 );
case SwingConstants.WEST: return createPath( !chevron, w,0, 0,(h / 2f), w,h );
case SwingConstants.EAST: return createPath( !chevron, 0,0, w,(h / 2f), 0,h );
default: return new Path2D.Float();
}
}
/*debug
private static void debugPaintArrow( Graphics2D g, Color color, boolean vert, int w, int h ) {
Color oldColor = g.getColor();
g.setColor( color );
g.fill( createRectangle( 0, 0, w, h, 1 ) );
int xy1 = -2;
int x2 = w + 1;
int y2 = h + 1;
for( int i = 0; i < 20; i++ ) {
g.fillRect( 0, xy1, 1, 1 );
g.fillRect( 0, y2, 1, 1 );
g.fillRect( xy1, 0, 1, 1 );
g.fillRect( x2, 0, 1, 1 );
xy1 -= 2;
x2 += 2;
y2 += 2;
}
g.setColor( oldColor );
}
debug*/
/** /**
* Creates a closed path for the given points. * Creates a closed path for the given points.
*/ */
@@ -633,37 +804,6 @@ public class FlatUIUtils
.computeIfAbsent( key, k -> newInstanceSupplier.get() ); .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 ----------------------------------------- //---- class RepaintFocusListener -----------------------------------------
public static class RepaintFocusListener public static class RepaintFocusListener

View File

@@ -0,0 +1,382 @@
/*
* Copyright 2021 FormDev Software GmbH
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.formdev.flatlaf.ui;
import java.awt.Color;
import java.awt.Dialog;
import java.awt.EventQueue;
import java.awt.Frame;
import java.awt.GraphicsConfiguration;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Window;
import java.awt.geom.AffineTransform;
import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.Timer;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.EventListenerList;
import com.formdev.flatlaf.util.LoggingFacade;
import com.formdev.flatlaf.util.NativeLibrary;
import com.formdev.flatlaf.util.SystemInfo;
//
// Interesting resources:
// https://github.com/microsoft/terminal/blob/main/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp
// https://docs.microsoft.com/en-us/windows/win32/dwm/customframe
// https://github.com/JetBrains/JetBrainsRuntime/blob/master/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp
// https://github.com/JetBrains/JetBrainsRuntime/commit/d2820524a1aa211b1c49b30f659b9b4d07a6f96e
// https://github.com/JetBrains/JetBrainsRuntime/pull/18
// https://medium.com/swlh/customizing-the-title-bar-of-an-application-window-50a4ac3ed27e
// https://github.com/kalbetredev/CustomDecoratedJFrame
// https://github.com/Guerra24/NanoUI-win32
// https://github.com/oberth/custom-chrome
// https://github.com/rossy/borderless-window
//
/**
* Native window border support for Windows 10 when using custom decorations.
* <p>
* If the application wants to use custom decorations, the Windows 10 title bar is hidden
* (including minimize, maximize and close buttons), but not the resize borders (including drop shadow).
* Windows 10 window snapping functionality will remain unaffected:
* https://support.microsoft.com/en-us/windows/snap-your-windows-885a9b1e-a983-a3b1-16cd-c531795e6241
*
* @author Karl Tauber
* @since 1.1
*/
class FlatWindowsNativeWindowBorder
implements FlatNativeWindowBorder.Provider
{
private final Map<Window, WndProc> windowsMap = Collections.synchronizedMap( new IdentityHashMap<>() );
private final EventListenerList listenerList = new EventListenerList();
private Timer fireStateChangedTimer;
private boolean colorizationUpToDate;
private boolean colorizationColorAffectsBorders;
private Color colorizationColor;
private int colorizationColorBalance;
private static NativeLibrary nativeLibrary;
private static FlatWindowsNativeWindowBorder instance;
static FlatNativeWindowBorder.Provider getInstance() {
// requires Windows 10
if( !SystemInfo.isWindows_10_orLater )
return null;
// load native library
if( nativeLibrary == null ) {
if( !SystemInfo.isJava_9_orLater ) {
// In Java 8, load jawt.dll (part of JRE) explicitly because it
// is not found when running application with <jdk>/bin/java.exe.
// When using <jdk>/jre/bin/java.exe, it is found.
// jawt.dll is located in <jdk>/jre/bin/.
// Java 9 and later does not have this problem.
try {
System.loadLibrary( "jawt" );
} catch( Exception ex ) {
LoggingFacade.INSTANCE.logSevere( null, ex );
}
}
String libraryName = "com/formdev/flatlaf/natives/flatlaf-windows-x86";
if( SystemInfo.isX86_64 )
libraryName += "_64";
nativeLibrary = new NativeLibrary( libraryName,
FlatWindowsNativeWindowBorder.class.getClassLoader(), true );
}
// check whether native library was successfully loaded
if( !nativeLibrary.isLoaded() )
return null;
// create new instance
if( instance == null )
instance = new FlatWindowsNativeWindowBorder();
return instance;
}
private FlatWindowsNativeWindowBorder() {
}
@Override
public boolean hasCustomDecoration( Window window ) {
return windowsMap.containsKey( window );
}
/**
* Tell the window whether the application wants use custom decorations.
* If {@code true}, the Windows 10 title bar is hidden (including minimize,
* maximize and close buttons), but not the resize borders (including drop shadow).
*/
@Override
public void setHasCustomDecoration( Window window, boolean hasCustomDecoration ) {
if( hasCustomDecoration )
install( window );
else
uninstall( window );
}
private void install( Window window ) {
// requires Windows 10
if( !SystemInfo.isWindows_10_orLater )
return;
// only JFrame and JDialog are supported
if( !(window instanceof JFrame) && !(window instanceof JDialog) )
return;
// not supported if frame/dialog is undecorated
if( (window instanceof Frame && ((Frame)window).isUndecorated()) ||
(window instanceof Dialog && ((Dialog)window).isUndecorated()) )
return;
// check whether already installed
if( windowsMap.containsKey( window ) )
return;
// install
WndProc wndProc = new WndProc( window );
if( wndProc.hwnd == 0 )
return;
windowsMap.put( window, wndProc );
}
private void uninstall( Window window ) {
WndProc wndProc = windowsMap.remove( window );
if( wndProc != null )
wndProc.uninstall();
}
@Override
public void setTitleBarHeight( Window window, int titleBarHeight ) {
WndProc wndProc = windowsMap.get( window );
if( wndProc == null )
return;
wndProc.titleBarHeight = titleBarHeight;
}
@Override
public void setTitleBarHitTestSpots( Window window, List<Rectangle> hitTestSpots ) {
WndProc wndProc = windowsMap.get( window );
if( wndProc == null )
return;
wndProc.hitTestSpots = hitTestSpots.toArray( new Rectangle[hitTestSpots.size()] );
}
@Override
public void setTitleBarAppIconBounds( Window window, Rectangle appIconBounds ) {
WndProc wndProc = windowsMap.get( window );
if( wndProc == null )
return;
wndProc.appIconBounds = (appIconBounds != null) ? new Rectangle( appIconBounds ) : null;
}
@Override
public boolean isColorizationColorAffectsBorders() {
updateColorization();
return colorizationColorAffectsBorders;
}
@Override
public Color getColorizationColor() {
updateColorization();
return colorizationColor;
}
@Override
public int getColorizationColorBalance() {
updateColorization();
return colorizationColorBalance;
}
private void updateColorization() {
if( colorizationUpToDate )
return;
colorizationUpToDate = true;
String subKey = "SOFTWARE\\Microsoft\\Windows\\DWM";
int value = registryGetIntValue( subKey, "ColorPrevalence", -1 );
colorizationColorAffectsBorders = (value > 0);
value = registryGetIntValue( subKey, "ColorizationColor", -1 );
colorizationColor = (value != -1) ? new Color( value ) : null;
colorizationColorBalance = registryGetIntValue( subKey, "ColorizationColorBalance", -1 );
}
private native static int registryGetIntValue( String key, String valueName, int defaultValue );
@Override
public void addChangeListener( ChangeListener l ) {
listenerList.add( ChangeListener.class, l );
}
@Override
public void removeChangeListener( ChangeListener l ) {
listenerList.remove( ChangeListener.class, l );
}
private void fireStateChanged() {
Object[] listeners = listenerList.getListenerList();
if( listeners.length == 0 )
return;
ChangeEvent e = new ChangeEvent( this );
for( int i = 0; i < listeners.length; i += 2 ) {
if( listeners[i] == ChangeListener.class )
((ChangeListener)listeners[i+1]).stateChanged( e );
}
}
/**
* Because there may be sent many WM_DWMCOLORIZATIONCOLORCHANGED messages,
* slightly delay event firing and fire it only once (on the AWT thread).
*/
void fireStateChangedLaterOnce() {
EventQueue.invokeLater( () -> {
if( fireStateChangedTimer != null ) {
fireStateChangedTimer.restart();
return;
}
fireStateChangedTimer = new Timer( 300, e -> {
fireStateChangedTimer = null;
colorizationUpToDate = false;
fireStateChanged();
} );
fireStateChangedTimer.setRepeats( false );
fireStateChangedTimer.start();
} );
}
//---- class WndProc ------------------------------------------------------
private class WndProc
{
// WM_NCHITTEST mouse position codes
private static final int
HTCLIENT = 1,
HTCAPTION = 2,
HTSYSMENU = 3,
HTTOP = 12;
private Window window;
private final long hwnd;
private int titleBarHeight;
private Rectangle[] hitTestSpots;
private Rectangle appIconBounds;
WndProc( Window window ) {
this.window = window;
hwnd = installImpl( window );
}
void uninstall() {
uninstallImpl( hwnd );
// cleanup
window = null;
}
private native long installImpl( Window window );
private native void uninstallImpl( long hwnd );
// invoked from native code
private int onNcHitTest( int x, int y, boolean isOnResizeBorder ) {
// scale-down mouse x/y
Point pt = scaleDown( x, y );
int sx = pt.x;
int sy = pt.y;
// return HTSYSMENU if mouse is over application icon
// - left-click on HTSYSMENU area shows system menu
// - double-left-click sends WM_CLOSE
if( appIconBounds != null && appIconBounds.contains( sx, sy ) )
return HTSYSMENU;
boolean isOnTitleBar = (sy < titleBarHeight);
if( isOnTitleBar ) {
// use a second reference to the array to avoid that it can be changed
// in another thread while processing the array
Rectangle[] hitTestSpots2 = hitTestSpots;
for( Rectangle spot : hitTestSpots2 ) {
if( spot.contains( sx, sy ) )
return HTCLIENT;
}
return isOnResizeBorder ? HTTOP : HTCAPTION;
}
return isOnResizeBorder ? HTTOP : HTCLIENT;
}
/**
* Scales down in the same way as AWT.
* See AwtWin32GraphicsDevice::ScaleDownX() and ::ScaleDownY()
*/
private Point scaleDown( int x, int y ) {
GraphicsConfiguration gc = window.getGraphicsConfiguration();
if( gc == null )
return new Point( x, y );
AffineTransform t = gc.getDefaultTransform();
return new Point( clipRound( x / t.getScaleX() ), clipRound( y / t.getScaleY() ) );
}
/**
* Rounds in the same way as AWT.
* See AwtWin32GraphicsDevice::ClipRound()
*/
private int clipRound( double value ) {
value -= 0.5;
if( value < Integer.MIN_VALUE )
return Integer.MIN_VALUE;
if( value > Integer.MAX_VALUE )
return Integer.MAX_VALUE;
return (int) Math.ceil( value );
}
// invoked from native code
private boolean isFullscreen() {
GraphicsConfiguration gc = window.getGraphicsConfiguration();
if( gc == null )
return false;
return gc.getDevice().getFullScreenWindow() == window;
}
// invoked from native code
private void fireStateChangedLaterOnce() {
FlatWindowsNativeWindowBorder.this.fireStateChangedLaterOnce();
}
}
}

View File

@@ -29,17 +29,15 @@ import java.awt.event.HierarchyEvent;
import java.awt.event.HierarchyListener; import java.awt.event.HierarchyListener;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JRootPane; import javax.swing.JRootPane;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.UIManager; import javax.swing.UIManager;
import javax.swing.plaf.BorderUIResource; import javax.swing.plaf.BorderUIResource;
import com.formdev.flatlaf.FlatLaf; import com.formdev.flatlaf.FlatLaf;
import com.formdev.flatlaf.FlatSystemProperties; import com.formdev.flatlaf.FlatSystemProperties;
import com.formdev.flatlaf.util.LoggingFacade;
import com.formdev.flatlaf.util.HiDPIUtils; import com.formdev.flatlaf.util.HiDPIUtils;
import com.formdev.flatlaf.util.SystemInfo; import com.formdev.flatlaf.util.SystemInfo;
@@ -55,26 +53,29 @@ import com.formdev.flatlaf.util.SystemInfo;
*/ */
public class JBRCustomDecorations public class JBRCustomDecorations
{ {
private static boolean initialized; private static Boolean supported;
private static Method Window_hasCustomDecoration; private static Method Window_hasCustomDecoration;
private static Method Window_setHasCustomDecoration; private static Method Window_setHasCustomDecoration;
private static Method WWindowPeer_setCustomDecorationHitTestSpots;
private static Method WWindowPeer_setCustomDecorationTitleBarHeight; private static Method WWindowPeer_setCustomDecorationTitleBarHeight;
private static Method WWindowPeer_setCustomDecorationHitTestSpots;
private static Method AWTAccessor_getComponentAccessor; private static Method AWTAccessor_getComponentAccessor;
private static Method AWTAccessor_ComponentAccessor_getPeer; private static Method AWTAccessor_ComponentAccessor_getPeer;
public static boolean isSupported() { public static boolean isSupported() {
initialize(); initialize();
return Window_setHasCustomDecoration != null; return supported;
} }
static void install( JRootPane rootPane ) { static Object install( JRootPane rootPane ) {
if( !isSupported() ) if( !isSupported() )
return; return null;
// check whether root pane already has a parent, which is the case when switching LaF // check whether root pane already has a parent, which is the case when switching LaF
if( rootPane.getParent() != null ) Window window = SwingUtilities.windowForComponent( rootPane );
return; if( window != null ) {
FlatNativeWindowBorder.install( window, FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS );
return null;
}
// Use hierarchy listener to wait until the root pane is added to a window. // Use hierarchy listener to wait until the root pane is added to a window.
// Enabling JBR decorations must be done very early, probably before // Enabling JBR decorations must be done very early, probably before
@@ -88,8 +89,9 @@ public class JBRCustomDecorations
Container parent = e.getChangedParent(); Container parent = e.getChangedParent();
if( parent instanceof Window ) if( parent instanceof Window )
install( (Window) parent ); FlatNativeWindowBorder.install( (Window) parent, FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS );
// remove listener since it is actually not possible to uninstall JBR decorations
// use invokeLater to remove listener to avoid that listener // use invokeLater to remove listener to avoid that listener
// is removed while listener queue is processed // is removed while listener queue is processed
EventQueue.invokeLater( () -> { EventQueue.invokeLater( () -> {
@@ -98,54 +100,20 @@ public class JBRCustomDecorations
} }
}; };
rootPane.addHierarchyListener( addListener ); rootPane.addHierarchyListener( addListener );
return addListener;
} }
static void install( Window window ) { static void uninstall( JRootPane rootPane, Object data ) {
if( !isSupported() ) // remove listener (if not yet done)
return; if( data instanceof HierarchyListener )
rootPane.removeHierarchyListener( (HierarchyListener) data );
// do not enable JBR decorations if LaF provides decorations // since it is actually not possible to uninstall JBR decorations,
if( UIManager.getLookAndFeel().getSupportsWindowDecorations() ) // simply reduce titleBarHeight so that it is still possible to resize window
return; // and remove hitTestSpots
Window window = SwingUtilities.windowForComponent( rootPane );
if( window instanceof JFrame ) { if( window != null )
JFrame frame = (JFrame) window; setHasCustomDecoration( window, false );
// do not enable JBR decorations if JFrame should use system window decorations
// and if not forced to use JBR decorations
if( !JFrame.isDefaultLookAndFeelDecorated() &&
!FlatSystemProperties.getBoolean( FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS, false ))
return;
// do not enable JBR decorations if frame is undecorated
if( frame.isUndecorated() )
return;
// enable JBR custom window decoration for window
setHasCustomDecoration( frame );
// enable Swing window decoration
frame.getRootPane().setWindowDecorationStyle( JRootPane.FRAME );
} else if( window instanceof JDialog ) {
JDialog dialog = (JDialog) window;
// do not enable JBR decorations if JDialog should use system window decorations
// and if not forced to use JBR decorations
if( !JDialog.isDefaultLookAndFeelDecorated() &&
!FlatSystemProperties.getBoolean( FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS, false ))
return;
// do not enable JBR decorations if dialog is undecorated
if( dialog.isUndecorated() )
return;
// enable JBR custom window decoration for window
setHasCustomDecoration( dialog );
// enable Swing window decoration
dialog.getRootPane().setWindowDecorationStyle( JRootPane.PLAIN_DIALOG );
}
} }
static boolean hasCustomDecoration( Window window ) { static boolean hasCustomDecoration( Window window ) {
@@ -155,45 +123,49 @@ public class JBRCustomDecorations
try { try {
return (Boolean) Window_hasCustomDecoration.invoke( window ); return (Boolean) Window_hasCustomDecoration.invoke( window );
} catch( Exception ex ) { } catch( Exception ex ) {
Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex ); LoggingFacade.INSTANCE.logSevere( null, ex );
return false; return false;
} }
} }
static void setHasCustomDecoration( Window window ) { static void setHasCustomDecoration( Window window, boolean hasCustomDecoration ) {
if( !isSupported() ) if( !isSupported() )
return; return;
try { try {
if( hasCustomDecoration )
Window_setHasCustomDecoration.invoke( window ); Window_setHasCustomDecoration.invoke( window );
else
setTitleBarHeightAndHitTestSpots( window, 4, Collections.emptyList() );
} catch( Exception ex ) { } catch( Exception ex ) {
Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex ); LoggingFacade.INSTANCE.logSevere( null, ex );
} }
} }
static void setHitTestSpotsAndTitleBarHeight( Window window, List<Rectangle> hitTestSpots, int titleBarHeight ) { static void setTitleBarHeightAndHitTestSpots( Window window, int titleBarHeight, List<Rectangle> hitTestSpots ) {
if( !isSupported() ) if( !isSupported() )
return; return;
try { try {
Object compAccessor = AWTAccessor_getComponentAccessor.invoke( null ); Object compAccessor = AWTAccessor_getComponentAccessor.invoke( null );
Object peer = AWTAccessor_ComponentAccessor_getPeer.invoke( compAccessor, window ); Object peer = AWTAccessor_ComponentAccessor_getPeer.invoke( compAccessor, window );
WWindowPeer_setCustomDecorationHitTestSpots.invoke( peer, hitTestSpots );
WWindowPeer_setCustomDecorationTitleBarHeight.invoke( peer, titleBarHeight ); WWindowPeer_setCustomDecorationTitleBarHeight.invoke( peer, titleBarHeight );
WWindowPeer_setCustomDecorationHitTestSpots.invoke( peer, hitTestSpots );
} catch( Exception ex ) { } catch( Exception ex ) {
Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex ); LoggingFacade.INSTANCE.logSevere( null, ex );
} }
} }
private static void initialize() { private static void initialize() {
if( initialized ) if( supported != null )
return; return;
initialized = true; supported = false;
// requires JetBrains Runtime 11 and Windows 10 // requires JetBrains Runtime 11 and Windows 10
if( !SystemInfo.isJetBrainsJVM_11_orLater || !SystemInfo.isWindows_10_orLater ) if( !SystemInfo.isJetBrainsJVM_11_orLater || !SystemInfo.isWindows_10_orLater )
return; return;
// check whether disabled via system property
if( !FlatSystemProperties.getBoolean( FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS, true ) ) if( !FlatSystemProperties.getBoolean( FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS, true ) )
return; return;
@@ -204,15 +176,17 @@ public class JBRCustomDecorations
AWTAccessor_ComponentAccessor_getPeer = compAccessorClass.getDeclaredMethod( "getPeer", Component.class ); AWTAccessor_ComponentAccessor_getPeer = compAccessorClass.getDeclaredMethod( "getPeer", Component.class );
Class<?> peerClass = Class.forName( "sun.awt.windows.WWindowPeer" ); Class<?> peerClass = Class.forName( "sun.awt.windows.WWindowPeer" );
WWindowPeer_setCustomDecorationHitTestSpots = peerClass.getDeclaredMethod( "setCustomDecorationHitTestSpots", List.class );
WWindowPeer_setCustomDecorationTitleBarHeight = peerClass.getDeclaredMethod( "setCustomDecorationTitleBarHeight", int.class ); WWindowPeer_setCustomDecorationTitleBarHeight = peerClass.getDeclaredMethod( "setCustomDecorationTitleBarHeight", int.class );
WWindowPeer_setCustomDecorationHitTestSpots.setAccessible( true ); WWindowPeer_setCustomDecorationHitTestSpots = peerClass.getDeclaredMethod( "setCustomDecorationHitTestSpots", List.class );
WWindowPeer_setCustomDecorationTitleBarHeight.setAccessible( true ); WWindowPeer_setCustomDecorationTitleBarHeight.setAccessible( true );
WWindowPeer_setCustomDecorationHitTestSpots.setAccessible( true );
Window_hasCustomDecoration = Window.class.getDeclaredMethod( "hasCustomDecoration" ); Window_hasCustomDecoration = Window.class.getDeclaredMethod( "hasCustomDecoration" );
Window_setHasCustomDecoration = Window.class.getDeclaredMethod( "setHasCustomDecoration" ); Window_setHasCustomDecoration = Window.class.getDeclaredMethod( "setHasCustomDecoration" );
Window_hasCustomDecoration.setAccessible( true ); Window_hasCustomDecoration.setAccessible( true );
Window_setHasCustomDecoration.setAccessible( true ); Window_setHasCustomDecoration.setAccessible( true );
supported = true;
} catch( Exception ex ) { } catch( Exception ex ) {
// ignore // ignore
} }
@@ -227,7 +201,6 @@ public class JBRCustomDecorations
private final Color defaultActiveBorder = new Color( 0x707070 ); private final Color defaultActiveBorder = new Color( 0x707070 );
private final Color inactiveLightColor = new Color( 0xaaaaaa ); private final Color inactiveLightColor = new Color( 0xaaaaaa );
private final Color inactiveDarkColor = new Color( 0x3f3f3f );
private boolean colorizationAffectsBorders; private boolean colorizationAffectsBorders;
private Color activeColor = defaultActiveBorder; private Color activeColor = defaultActiveBorder;
@@ -238,15 +211,22 @@ public class JBRCustomDecorations
return instance; return instance;
} }
private JBRWindowTopBorder() { JBRWindowTopBorder() {
super( 1, 0, 0, 0 ); super( 1, 0, 0, 0 );
colorizationAffectsBorders = calculateAffectsBorders(); update();
activeColor = calculateActiveBorderColor(); installListeners();
}
void update() {
colorizationAffectsBorders = isColorizationColorAffectsBorders();
activeColor = calculateActiveBorderColor();
}
void installListeners() {
Toolkit toolkit = Toolkit.getDefaultToolkit(); Toolkit toolkit = Toolkit.getDefaultToolkit();
toolkit.addPropertyChangeListener( "win.dwm.colorizationColor.affects.borders", e -> { toolkit.addPropertyChangeListener( "win.dwm.colorizationColor.affects.borders", e -> {
colorizationAffectsBorders = calculateAffectsBorders(); colorizationAffectsBorders = isColorizationColorAffectsBorders();
activeColor = calculateActiveBorderColor(); activeColor = calculateActiveBorderColor();
} ); } );
@@ -258,22 +238,28 @@ public class JBRCustomDecorations
toolkit.addPropertyChangeListener( "win.frame.activeBorderColor", l ); toolkit.addPropertyChangeListener( "win.frame.activeBorderColor", l );
} }
private boolean calculateAffectsBorders() { boolean isColorizationColorAffectsBorders() {
Object value = Toolkit.getDefaultToolkit().getDesktopProperty( "win.dwm.colorizationColor.affects.borders" ); Object value = Toolkit.getDefaultToolkit().getDesktopProperty( "win.dwm.colorizationColor.affects.borders" );
return (value instanceof Boolean) ? (Boolean) value : true; return (value instanceof Boolean) ? (Boolean) value : true;
} }
Color getColorizationColor() {
return (Color) Toolkit.getDefaultToolkit().getDesktopProperty( "win.dwm.colorizationColor" );
}
int getColorizationColorBalance() {
Object value = Toolkit.getDefaultToolkit().getDesktopProperty( "win.dwm.colorizationColorBalance" );
return (value instanceof Integer) ? (Integer) value : -1;
}
private Color calculateActiveBorderColor() { private Color calculateActiveBorderColor() {
if( !colorizationAffectsBorders ) if( !colorizationAffectsBorders )
return defaultActiveBorder; return defaultActiveBorder;
Toolkit toolkit = Toolkit.getDefaultToolkit(); Color colorizationColor = getColorizationColor();
Color colorizationColor = (Color) toolkit.getDesktopProperty( "win.dwm.colorizationColor" );
if( colorizationColor != null ) { if( colorizationColor != null ) {
Object colorizationColorBalanceObj = toolkit.getDesktopProperty( "win.dwm.colorizationColorBalance" ); int colorizationColorBalance = getColorizationColorBalance();
if( colorizationColorBalanceObj instanceof Integer ) { if( colorizationColorBalance < 0 || colorizationColorBalance > 100 )
int colorizationColorBalance = (Integer) colorizationColorBalanceObj;
if( colorizationColorBalance < 0 )
colorizationColorBalance = 100; colorizationColorBalance = 100;
if( colorizationColorBalance == 0 ) if( colorizationColorBalance == 0 )
@@ -283,15 +269,19 @@ public class JBRCustomDecorations
float alpha = colorizationColorBalance / 100.0f; float alpha = colorizationColorBalance / 100.0f;
float remainder = 1 - alpha; float remainder = 1 - alpha;
int r = Math.round( (colorizationColor.getRed() * alpha + 0xD9 * remainder) ); int r = Math.round( colorizationColor.getRed() * alpha + 0xD9 * remainder );
int g = Math.round( (colorizationColor.getGreen() * alpha + 0xD9 * remainder) ); int g = Math.round( colorizationColor.getGreen() * alpha + 0xD9 * remainder );
int b = Math.round( (colorizationColor.getBlue() * 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 new Color( r, g, b );
} }
return colorizationColor;
}
Color activeBorderColor = (Color) toolkit.getDesktopProperty( "win.frame.activeBorderColor" ); Color activeBorderColor = (Color) Toolkit.getDefaultToolkit().getDesktopProperty( "win.frame.activeBorderColor" );
return (activeBorderColor != null) ? activeBorderColor : UIManager.getColor( "MenuBar.borderColor" ); return (activeBorderColor != null) ? activeBorderColor : UIManager.getColor( "MenuBar.borderColor" );
} }
@@ -300,7 +290,14 @@ public class JBRCustomDecorations
Window window = SwingUtilities.windowForComponent( c ); Window window = SwingUtilities.windowForComponent( c );
boolean active = (window != null) ? window.isActive() : false; 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 ); HiDPIUtils.paintAtScale1x( (Graphics2D) g, x, y, width, height, this::paintImpl );
} }

View File

@@ -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;
}
}
}
}

View File

@@ -44,6 +44,38 @@ public class ColorFunctions
: value); : 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 -------------------------------------------- //---- interface ColorFunction --------------------------------------------
public interface ColorFunction { public interface ColorFunction {
@@ -93,8 +125,23 @@ public class ColorFunctions
protected boolean shouldInverse( float[] hsla ) { protected boolean shouldInverse( float[] hsla ) {
return increase return increase
? hsla[hslIndex] >= 50 ? hsla[hslIndex] > 65
: hsla[hslIndex] < 50; : hsla[hslIndex] < 35;
}
@Override
public String toString() {
String name;
switch( hslIndex ) {
case 0: name = "spin"; break;
case 1: name = increase ? "saturate" : "desaturate"; break;
case 2: name = increase ? "lighten" : "darken"; break;
case 3: name = increase ? "fadein" : "fadeout"; break;
default: throw new IllegalArgumentException();
}
return String.format( "%s(%.0f%%%s%s)", name, amount,
(relative ? " relative" : ""),
(autoInverse ? " autoInverse" : "") );
} }
} }
@@ -116,5 +163,10 @@ public class ColorFunctions
public void apply( float[] hsla ) { public void apply( float[] hsla ) {
hsla[3] = clamp( amount ); hsla[3] = clamp( amount );
} }
@Override
public String toString() {
return String.format( "fade(%.0f%%)", amount );
}
} }
} }

View File

@@ -24,6 +24,13 @@ package com.formdev.flatlaf.util;
public class CubicBezierEasing public class CubicBezierEasing
implements Animator.Interpolator 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) // common cubic-bezier easing functions (same as in CSS)
// https://developer.mozilla.org/en-US/docs/Web/CSS/easing-function // 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 ); public static final CubicBezierEasing EASE = new CubicBezierEasing( 0.25f, 0.1f, 0.25f, 1f );

View File

@@ -59,4 +59,17 @@ public class DerivedColor
public ColorFunction[] getFunctions() { public ColorFunction[] getFunctions() {
return functions; return functions;
} }
@Override
public String toString() {
StringBuilder buf = new StringBuilder();
buf.append( super.toString() );
for( ColorFunction function : functions ) {
buf.append( '\n' );
buf.append( function.toString() );
}
return buf.toString();
}
} }

View File

@@ -134,7 +134,7 @@ public class HiDPIUtils
// - fractional scale factors result in fractional component Y device coordinates // - fractional scale factors result in fractional component Y device coordinates
// - fractional text Y device coordinates are rounded for horizontal lines of characters // - fractional text Y device coordinates are rounded for horizontal lines of characters
// - maybe different rounding methods for drawing primitives (e.g. rectangle) and text // - 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 // this is not the optimal solution, but works very good in most cases
// (tested with class FlatPaintingStringTest on Windows 10 with font "Segoe UI") // (tested with class FlatPaintingStringTest on Windows 10 with font "Segoe UI")

View File

@@ -21,10 +21,7 @@ import java.awt.Graphics;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JComponent; import javax.swing.JComponent;
import com.formdev.flatlaf.FlatLaf;
/** /**
* Provides Java version compatibility methods. * Provides Java version compatibility methods.
@@ -58,7 +55,7 @@ public class JavaCompatibility
? new Class[] { JComponent.class, Graphics2D.class, String.class, int.class, float.class, float.class } ? new Class[] { JComponent.class, Graphics2D.class, String.class, int.class, float.class, float.class }
: new Class[] { JComponent.class, Graphics.class, String.class, int.class, int.class, int.class } ); : new Class[] { JComponent.class, Graphics.class, String.class, int.class, int.class, int.class } );
} catch( Exception ex ) { } catch( Exception ex ) {
Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex ); LoggingFacade.INSTANCE.logSevere( null, ex );
throw new RuntimeException( ex ); throw new RuntimeException( ex );
} }
} }
@@ -70,7 +67,7 @@ public class JavaCompatibility
else else
drawStringUnderlineCharAtMethod.invoke( null, c, g, text, underlinedIndex, x, y ); drawStringUnderlineCharAtMethod.invoke( null, c, g, text, underlinedIndex, x, y );
} catch( IllegalAccessException | IllegalArgumentException | InvocationTargetException ex ) { } catch( IllegalAccessException | IllegalArgumentException | InvocationTargetException ex ) {
Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex ); LoggingFacade.INSTANCE.logSevere( null, ex );
throw new RuntimeException( ex ); throw new RuntimeException( ex );
} }
} }
@@ -94,7 +91,7 @@ public class JavaCompatibility
: "clipStringIfNecessary", : "clipStringIfNecessary",
new Class[] { JComponent.class, FontMetrics.class, String.class, int.class } ); new Class[] { JComponent.class, FontMetrics.class, String.class, int.class } );
} catch( Exception ex ) { } catch( Exception ex ) {
Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex ); LoggingFacade.INSTANCE.logSevere( null, ex );
throw new RuntimeException( ex ); throw new RuntimeException( ex );
} }
} }
@@ -103,7 +100,7 @@ public class JavaCompatibility
try { try {
return (String) getClippedStringMethod.invoke( null, c, fm, string, availTextWidth ); return (String) getClippedStringMethod.invoke( null, c, fm, string, availTextWidth );
} catch( IllegalAccessException | IllegalArgumentException | InvocationTargetException ex ) { } catch( IllegalAccessException | IllegalArgumentException | InvocationTargetException ex ) {
Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex ); LoggingFacade.INSTANCE.logSevere( null, ex );
throw new RuntimeException( ex ); throw new RuntimeException( ex );
} }
} }

View File

@@ -0,0 +1,28 @@
/*
* Copyright 2021 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;
/**
* @since 1.1
*/
public interface LoggingFacade
{
LoggingFacade INSTANCE = new LoggingFacadeImpl();
void logSevere( String message, Throwable t );
void logConfig( String message, Throwable t );
}

View File

@@ -0,0 +1,40 @@
/*
* Copyright 2021 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 com.formdev.flatlaf.FlatLaf;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
* @since 1.1
*/
class LoggingFacadeImpl
implements LoggingFacade
{
private static final Logger LOG = Logger.getLogger( FlatLaf.class.getName() );
@Override
public void logSevere( String message, Throwable t ) {
LOG.log( Level.SEVERE, message, t );
}
@Override
public void logConfig( String message, Throwable t ) {
LOG.log( Level.CONFIG, message, t );
}
}

View File

@@ -0,0 +1,191 @@
/*
* Copyright 2021 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.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
/**
* Helper class to load native library (.dll, .so or .dylib) stored in Jar.
* <p>
* Copies native library to users temporary folder before loading it.
*
* @author Karl Tauber
* @since 1.1
*/
public class NativeLibrary
{
private static final String DELETE_SUFFIX = ".delete";
private static boolean deletedTemporary;
private final boolean loaded;
/**
* Load native library from given classloader.
*
* @param libraryName resource name of the native library (without "lib" prefix and without extension)
* @param classLoader the classloader used to locate the library
* @param supported whether the native library is supported on the current platform
*/
public NativeLibrary( String libraryName, ClassLoader classLoader, boolean supported ) {
this.loaded = supported
? loadLibraryFromJar( libraryName, classLoader )
: false;
}
/**
* Returns whether the native library is loaded.
* <p>
* Returns {@code false} if not supported on current platform as specified in constructor
* or if loading failed.
*/
public boolean isLoaded() {
return loaded;
}
private static boolean loadLibraryFromJar( String libraryName, ClassLoader classLoader ) {
// add prefix and suffix to library name
libraryName = decorateLibraryName( libraryName );
// find library
URL libraryUrl = classLoader.getResource( libraryName );
if( libraryUrl == null ) {
log( "Library '" + libraryName + "' not found", null );
return false;
}
File tempFile = null;
try {
// for development environment
if( "file".equals( libraryUrl.getProtocol() ) ) {
File libraryFile = new File( libraryUrl.getPath() );
if( libraryFile.isFile() ) {
// load library without copying
System.load( libraryFile.getCanonicalPath() );
return true;
}
}
// create temporary file
Path tempPath = createTempFile( libraryName );
tempFile = tempPath.toFile();
// copy library to temporary file
try( InputStream in = libraryUrl.openStream() ) {
Files.copy( in, tempPath, StandardCopyOption.REPLACE_EXISTING );
}
// load library
System.load( tempFile.getCanonicalPath() );
// delete library
deleteOrMarkForDeletion( tempFile );
return true;
} catch( Throwable ex ) {
log( null, ex );
if( tempFile != null )
deleteOrMarkForDeletion( tempFile );
return false;
}
}
private static String decorateLibraryName( String libraryName ) {
if( SystemInfo.isWindows )
return libraryName.concat( ".dll" );
String suffix = SystemInfo.isMacOS ? ".dylib" : ".so";
int sep = libraryName.lastIndexOf( '/' );
return (sep >= 0)
? libraryName.substring( 0, sep + 1 ) + "lib" + libraryName.substring( sep + 1 ) + suffix
: "lib" + libraryName + suffix;
}
private static void log( String msg, Throwable thrown ) {
LoggingFacade.INSTANCE.logSevere( msg, thrown );
}
private static Path createTempFile( String libraryName ) throws IOException {
int sep = libraryName.lastIndexOf( '/' );
String name = (sep >= 0) ? libraryName.substring( sep + 1 ) : libraryName;
int dot = name.lastIndexOf( '.' );
String prefix = ((dot >= 0) ? name.substring( 0, dot ) : name) + '-';
String suffix = (dot >= 0) ? name.substring( dot ) : "";
Path tempDir = getTempDir();
if( tempDir != null ) {
deleteTemporaryFiles( tempDir );
return Files.createTempFile( tempDir, prefix, suffix );
} else
return Files.createTempFile( prefix, suffix );
}
private static Path getTempDir() throws IOException {
if( SystemInfo.isWindows ) {
// On Windows, where File.delete() and File.deleteOnExit() does not work
// for loaded native libraries, they will be deleted on next application startup.
// The default temporary directory may contain hundreds or thousands of files.
// To make searching for "marked for deletion" files as fast as possible,
// use a sub directory that contains only our temporary native libraries.
Path tempDir = Paths.get( System.getProperty( "java.io.tmpdir" ) + "/flatlaf.temp" );
Files.createDirectories( tempDir );
return tempDir;
} else
return null; // use standard temporary directory
}
private static void deleteTemporaryFiles( Path tempDir ) {
if( deletedTemporary )
return;
deletedTemporary = true;
File[] markerFiles = tempDir.toFile().listFiles( (dir, name) -> name.endsWith( DELETE_SUFFIX ) );
if( markerFiles == null )
return;
for( File markerFile : markerFiles ) {
File toDeleteFile = new File( markerFile.getParent(), StringUtils.removeTrailing( markerFile.getName(), DELETE_SUFFIX ) );
if( !toDeleteFile.exists() || toDeleteFile.delete() )
markerFile.delete();
}
}
private static void deleteOrMarkForDeletion( File file ) {
// try to delete the native library
if( file.delete() )
return;
// not possible to delete on Windows because native library file is locked
// --> create "to delete" marker file (used at next startup)
try {
File markFile = new File( file.getParent(), file.getName() + DELETE_SUFFIX );
markFile.createNewFile();
} catch( IOException ex2 ) {
// ignore
}
}
}

View File

@@ -38,6 +38,9 @@ public class SystemInfo
public static final boolean isMacOS_10_14_Mojave_orLater; public static final boolean isMacOS_10_14_Mojave_orLater;
public static final boolean isMacOS_10_15_Catalina_orLater; public static final boolean isMacOS_10_15_Catalina_orLater;
// OS architecture
/** @since 1.1 */ public static final boolean isX86_64;
// Java versions // Java versions
public static final long javaVersion; public static final long javaVersion;
public static final boolean isJava_9_orLater; public static final boolean isJava_9_orLater;
@@ -51,6 +54,9 @@ public class SystemInfo
// UI toolkits // UI toolkits
public static final boolean isKDE; public static final boolean isKDE;
// other
/** @since 1.1 */ public static final boolean isProjector;
static { static {
// platforms // platforms
String osName = System.getProperty( "os.name" ).toLowerCase( Locale.ENGLISH ); String osName = System.getProperty( "os.name" ).toLowerCase( Locale.ENGLISH );
@@ -65,6 +71,10 @@ public class SystemInfo
isMacOS_10_14_Mojave_orLater = (isMacOS && osVersion >= toVersion( 10, 14, 0, 0 )); isMacOS_10_14_Mojave_orLater = (isMacOS && osVersion >= toVersion( 10, 14, 0, 0 ));
isMacOS_10_15_Catalina_orLater = (isMacOS && osVersion >= toVersion( 10, 15, 0, 0 )); isMacOS_10_15_Catalina_orLater = (isMacOS && osVersion >= toVersion( 10, 15, 0, 0 ));
// OS architecture
String osArch = System.getProperty( "os.arch" );
isX86_64 = osArch.equals( "amd64" ) || osArch.equals( "x86_64" );
// Java versions // Java versions
javaVersion = scanVersion( System.getProperty( "java.version" ) ); javaVersion = scanVersion( System.getProperty( "java.version" ) );
isJava_9_orLater = (javaVersion >= toVersion( 9, 0, 0, 0 )); isJava_9_orLater = (javaVersion >= toVersion( 9, 0, 0, 0 ));
@@ -78,6 +88,9 @@ public class SystemInfo
// UI toolkits // UI toolkits
isKDE = (isLinux && System.getenv( "KDE_FULL_SESSION" ) != null); isKDE = (isLinux && System.getenv( "KDE_FULL_SESSION" ) != null);
// other
isProjector = Boolean.getBoolean( "org.jetbrains.projector.server.enable" );
} }
public static long scanVersion( String version ) { public static long scanVersion( String version ) {

View File

@@ -36,9 +36,14 @@ import javax.swing.plaf.UIResource;
import com.formdev.flatlaf.FlatSystemProperties; 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 * 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 * (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 be different for each connected display.
* The scale factor may change for a window when moving the window from one display to another one. * 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 * This mode is mainly for Java 8 compatibility, but is also used on Linux
* or if the default font is changed. * or if the default font is changed.
@@ -85,6 +90,9 @@ public class UIScale
private static Boolean jreHiDPI; private static Boolean jreHiDPI;
/**
* Returns whether system scaling is enabled.
*/
public static boolean isSystemScalingEnabled() { public static boolean isSystemScalingEnabled() {
if( jreHiDPI != null ) if( jreHiDPI != null )
return jreHiDPI; return jreHiDPI;
@@ -112,10 +120,16 @@ public class UIScale
return jreHiDPI; return jreHiDPI;
} }
/**
* Returns the system scale factor for the given graphics context.
*/
public static double getSystemScaleFactor( Graphics2D g ) { 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 ) { public static double getSystemScaleFactor( GraphicsConfiguration gc ) {
return (isSystemScalingEnabled() && gc != null) ? gc.getDefaultTransform().getScaleX() : 1; return (isSystemScalingEnabled() && gc != null) ? gc.getDefaultTransform().getScaleX() : 1;
} }
@@ -297,11 +311,17 @@ public class UIScale
} }
} }
/**
* Returns the user scale factor.
*/
public static float getUserScaleFactor() { public static float getUserScaleFactor() {
initialize(); initialize();
return scaleFactor; return scaleFactor;
} }
/**
* Sets the user scale factor.
*/
private static void setUserScaleFactor( float scaleFactor ) { private static void setUserScaleFactor( float scaleFactor ) {
if( scaleFactor <= 1f ) if( scaleFactor <= 1f )
scaleFactor = 1f; scaleFactor = 1f;
@@ -318,40 +338,65 @@ public class UIScale
changeSupport.firePropertyChange( "userScaleFactor", oldScaleFactor, scaleFactor ); changeSupport.firePropertyChange( "userScaleFactor", oldScaleFactor, scaleFactor );
} }
/**
* Multiplies the given value by the user scale factor.
*/
public static float scale( float value ) { public static float scale( float value ) {
initialize(); initialize();
return (scaleFactor == 1) ? value : (value * scaleFactor); 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 ) { public static int scale( int value ) {
initialize(); initialize();
return (scaleFactor == 1) ? value : Math.round( value * scaleFactor ); 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 ) { public static int scale2( int value ) {
initialize(); initialize();
return (scaleFactor == 1) ? value : (int) (value * scaleFactor); return (scaleFactor == 1) ? value : (int) (value * scaleFactor);
} }
/**
* Divides the given value by the user scale factor.
*/
public static float unscale( float value ) { public static float unscale( float value ) {
initialize(); initialize();
return (scaleFactor == 1f) ? value : (value / scaleFactor); 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 ) { public static int unscale( int value ) {
initialize(); initialize();
return (scaleFactor == 1f) ? value : Math.round( value / scaleFactor ); 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 ) { public static void scaleGraphics( Graphics2D g ) {
initialize(); initialize();
if( scaleFactor != 1f ) if( scaleFactor != 1f )
g.scale( scaleFactor, scaleFactor ); 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 ) { public static Dimension scale( Dimension dimension ) {
initialize(); initialize();
return (dimension == null || scaleFactor == 1f) return (dimension == null || scaleFactor == 1f)
@@ -361,6 +406,13 @@ public class UIScale
: new Dimension ( scale( dimension.width ), scale( dimension.height ) )); : 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 ) { public static Insets scale( Insets insets ) {
initialize(); initialize();
return (insets == null || scaleFactor == 1f) return (insets == null || scaleFactor == 1f)

View File

@@ -0,0 +1,38 @@
/*
* Copyright 2021 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 com.formdev.flatlaf.FlatLaf;
/**
* @since 1.1
*/
class LoggingFacadeImpl
implements LoggingFacade
{
private static final System.Logger LOG = System.getLogger( FlatLaf.class.getName() );
@Override
public void logSevere( String message, Throwable t ) {
LOG.log( System.Logger.Level.ERROR, message, t );
}
@Override
public void logConfig( String message, Throwable t ) {
LOG.log( System.Logger.Level.DEBUG, message, t );
}
}

View File

@@ -19,7 +19,6 @@
*/ */
module com.formdev.flatlaf { module com.formdev.flatlaf {
requires java.desktop; requires java.desktop;
requires java.logging;
exports com.formdev.flatlaf; exports com.formdev.flatlaf;
exports com.formdev.flatlaf.icons; exports com.formdev.flatlaf.icons;

View File

@@ -14,29 +14,49 @@
# limitations under the License. # 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, # 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. # which is licensed under the Apache 2.0 license. Copyright 2000-2019 JetBrains s.r.o.
# See: https://github.com/JetBrains/intellij-community/ # See: https://github.com/JetBrains/intellij-community/
#---- Button ---- #---- Button ----
Button.default.boldText=true Button.innerFocusWidth = 0
Button.default.boldText = true
#---- CheckBox ----
CheckBox.icon.focusedBackground = null
#---- Component ---- #---- Component ----
Component.focusWidth=2 Component.focusWidth = 2
Component.innerFocusWidth=0 Component.innerFocusWidth = 0
Component.innerOutlineWidth=0 Component.innerOutlineWidth = 0
Component.arrowType=triangle Component.arrowType = triangle
#---- ProgressBar ---- #---- ProgressBar ----
ProgressBar.foreground=#a0a0a0 ProgressBar.foreground = #a0a0a0
ProgressBar.selectionForeground=@background ProgressBar.selectionForeground = @background
#---- RadioButton ---- #---- RadioButton ----
RadioButton.icon.centerDiameter=5 RadioButton.icon.centerDiameter = 5

View File

@@ -14,297 +14,314 @@
# limitations under the License. # 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, # 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. # which is licensed under the Apache 2.0 license. Copyright 2000-2019 JetBrains s.r.o.
# See: https://github.com/JetBrains/intellij-community/ # See: https://github.com/JetBrains/intellij-community/
#---- variables ---- #---- variables ----
@background=#3c3f41 @background = #3c3f41
@foreground=#bbb @foreground = #bbb
@selectionBackground=#4B6EAF @selectionBackground = #4B6EAF
@selectionForeground=@foreground @selectionForeground = @foreground
@selectionInactiveBackground=#0D293E @selectionInactiveBackground = #0D293E
@selectionInactiveForeground=@foreground @selectionInactiveForeground = @foreground
@disabledText=#888 @disabledText = #888
@textComponentBackground=#45494A @textComponentBackground = #45494A
@menuBackground=darken(@background,5%) @menuBackground = darken(@background,5%)
@menuHoverBackground=lighten(@menuBackground,10%,derived) @menuHoverBackground = lighten(@menuBackground,10%,derived)
@menuCheckBackground=darken(@selectionBackground,10%) @menuCheckBackground = darken(@selectionBackground,10%,derived noAutoInverse)
@menuAcceleratorForeground=darken(@foreground,15%) @menuAcceleratorForeground = darken(@foreground,15%)
@menuAcceleratorSelectionForeground=@selectionForeground @menuAcceleratorSelectionForeground = @selectionForeground
@cellFocusColor=#000 @cellFocusColor = #000
@icon=#adadad @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) # Drop (use lazy colors for IntelliJ platform themes, which usually do not specify these colors)
@dropCellBackground=darken(List.selectionBackground,10%,lazy) @dropCellBackground = darken(List.selectionBackground,10%,lazy)
@dropCellForeground=lazy(List.selectionForeground) @dropCellForeground = lazy(List.selectionForeground)
@dropLineColor=lighten(List.selectionBackground,10%,lazy) @dropLineColor = lighten(List.selectionBackground,10%,lazy)
@dropLineShortColor=lighten(List.selectionBackground,30%,lazy) @dropLineShortColor = lighten(List.selectionBackground,30%,lazy)
#---- system colors ---- #---- system colors ----
activeCaption=#434E60 activeCaption = #434E60
inactiveCaption=#393C3D inactiveCaption = #393C3D
controlHighlight=darken($controlShadow,20%) controlHighlight = darken($controlShadow,20%)
controlLtHighlight=darken($controlShadow,25%) controlLtHighlight = darken($controlShadow,25%)
controlDkShadow=lighten($controlShadow,10%) controlDkShadow = lighten($controlShadow,10%)
#---- Button ---- #---- Button ----
Button.background=#4c5052 Button.background = #4c5052
Button.hoverBackground=lighten($Button.background,3%,derived) Button.hoverBackground = lighten($Button.background,3%,derived)
Button.pressedBackground=lighten($Button.background,6%,derived) Button.pressedBackground = lighten($Button.background,6%,derived)
Button.selectedBackground=lighten($Button.background,10%,derived) Button.selectedBackground = lighten($Button.background,10%,derived)
Button.selectedForeground=@foreground Button.selectedForeground = @foreground
Button.disabledSelectedBackground=lighten($Button.background,3%,derived) Button.disabledSelectedBackground = lighten($Button.background,3%,derived)
Button.borderColor=#5e6060 Button.borderColor = #5e6060
Button.disabledBorderColor=#5e6060 Button.disabledBorderColor = $Button.borderColor
Button.focusedBorderColor=#466d94 Button.focusedBorderColor = $Component.focusedBorderColor
Button.hoverBorderColor=$Button.focusedBorderColor Button.hoverBorderColor = $Button.focusedBorderColor
Button.default.background=#365880 Button.innerFocusWidth = 1
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.default.background = #365880
Button.toolbar.pressedBackground=lighten($Button.background,4%,derived) Button.default.foreground = #bbb
Button.toolbar.selectedBackground=lighten($Button.background,7%,derived) 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 ---- #---- CheckBox ----
# enabled # enabled
CheckBox.icon.borderColor=#6B6B6B CheckBox.icon.borderColor = #6B6B6B
CheckBox.icon.background=#43494A CheckBox.icon.background = #43494A
CheckBox.icon.selectedBorderColor=$CheckBox.icon.borderColor CheckBox.icon.selectedBorderColor = $CheckBox.icon.borderColor
CheckBox.icon.selectedBackground=$CheckBox.icon.background CheckBox.icon.selectedBackground = $CheckBox.icon.background
CheckBox.icon.checkmarkColor=#A7A7A7 CheckBox.icon.checkmarkColor = #A7A7A7
# disabled # disabled
CheckBox.icon.disabledBorderColor=#545556 CheckBox.icon.disabledBorderColor = #545556
CheckBox.icon.disabledBackground=@background CheckBox.icon.disabledBackground = @background
CheckBox.icon.disabledCheckmarkColor=#606060 CheckBox.icon.disabledCheckmarkColor = #606060
# focused # focused
CheckBox.icon.focusedBorderColor=#466D94 CheckBox.icon.focusedBorderColor = #466D94
CheckBox.icon.selectedFocusedBorderColor=#466D94 CheckBox.icon.focusedBackground = fade($CheckBox.icon.focusedBorderColor,30%)
# hover # hover
CheckBox.icon.hoverBorderColor=$CheckBox.icon.focusedBorderColor CheckBox.icon.hoverBorderColor = $CheckBox.icon.focusedBorderColor
CheckBox.icon.hoverBackground=lighten($CheckBox.icon.background,3%,derived) CheckBox.icon.hoverBackground = lighten($CheckBox.icon.background,3%,derived)
# pressed # 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 # enabled
CheckBox.icon[filled].selectedBorderColor=$CheckBox.icon.checkmarkColor CheckBox.icon[filled].selectedBorderColor = $CheckBox.icon.checkmarkColor
CheckBox.icon[filled].selectedBackground=$CheckBox.icon.checkmarkColor CheckBox.icon[filled].selectedBackground = $CheckBox.icon.checkmarkColor
CheckBox.icon[filled].checkmarkColor=$CheckBox.icon.background CheckBox.icon[filled].checkmarkColor = $CheckBox.icon.background
# hover # hover
CheckBox.icon[filled].selectedHoverBackground=darken($CheckBox.icon[filled].selectedBackground,3%) CheckBox.icon[filled].selectedHoverBackground = darken($CheckBox.icon[filled].selectedBackground,3%,derived)
# pressed # pressed
CheckBox.icon[filled].selectedPressedBackground=darken($CheckBox.icon[filled].selectedBackground,6%) CheckBox.icon[filled].selectedPressedBackground = darken($CheckBox.icon[filled].selectedBackground,6%,derived)
#---- ComboBox ---- #---- ComboBox ----
ComboBox.buttonEditableBackground=#404445 ComboBox.buttonEditableBackground = darken($ComboBox.background,2%)
ComboBox.buttonArrowColor=#9A9DA1
ComboBox.buttonDisabledArrowColor=#585858
ComboBox.buttonHoverArrowColor=#bbb
#---- Component ---- #---- Component ----
Component.borderColor=#646464 Component.borderColor = #646464
Component.disabledBorderColor=#646464 Component.disabledBorderColor = #646464
Component.focusedBorderColor=#466d94 Component.focusedBorderColor = #466d94
Component.focusColor=#3d6185 Component.focusColor = #3d6185
Component.linkColor=#589df6 Component.linkColor = #589df6
Component.grayFilter=-20,-70,100 Component.grayFilter = -20,-70,100
Component.error.borderColor=desaturate($Component.error.focusedBorderColor,25%) Component.error.borderColor = desaturate($Component.error.focusedBorderColor,25%)
Component.error.focusedBorderColor=#8b3c3c Component.error.focusedBorderColor = #8b3c3c
Component.warning.borderColor=darken(desaturate($Component.warning.focusedBorderColor,20%),10%) Component.warning.borderColor = darken(desaturate($Component.warning.focusedBorderColor,20%),10%)
Component.warning.focusedBorderColor=#ac7920 Component.warning.focusedBorderColor = #ac7920
Component.custom.borderColor=desaturate(#f00,50%,relative derived noAutoInverse) Component.custom.borderColor = desaturate(#f00,50%,relative derived noAutoInverse)
#---- Desktop ---- #---- Desktop ----
Desktop.background=#3E434C Desktop.background = #3E434C
#---- DesktopIcon ---- #---- DesktopIcon ----
DesktopIcon.background=lighten($Desktop.background,10%) DesktopIcon.background = lighten($Desktop.background,10%)
#---- InternalFrame ---- #---- InternalFrame ----
InternalFrame.activeTitleBackground=darken(@background,10%) InternalFrame.activeTitleBackground = darken(@background,10%)
InternalFrame.activeTitleForeground=@foreground InternalFrame.activeTitleForeground = @foreground
InternalFrame.inactiveTitleBackground=darken(@background,5%) InternalFrame.inactiveTitleBackground = darken(@background,5%)
InternalFrame.inactiveTitleForeground=@disabledText InternalFrame.inactiveTitleForeground = @disabledText
InternalFrame.activeBorderColor=darken(@background,7%) InternalFrame.activeBorderColor = darken(@background,7%)
InternalFrame.inactiveBorderColor=darken(@background,3%) InternalFrame.inactiveBorderColor = darken(@background,3%)
InternalFrame.buttonHoverBackground=lighten($InternalFrame.activeTitleBackground,10%,derived) InternalFrame.buttonHoverBackground = lighten($InternalFrame.activeTitleBackground,10%,derived)
InternalFrame.buttonPressedBackground=lighten($InternalFrame.activeTitleBackground,20%,derived) InternalFrame.buttonPressedBackground = lighten($InternalFrame.activeTitleBackground,20%,derived)
InternalFrame.closeHoverBackground=lazy(Actions.Red) InternalFrame.closeHoverBackground = lazy(Actions.Red)
InternalFrame.closePressedBackground=darken(Actions.Red,10%,lazy) InternalFrame.closePressedBackground = darken(Actions.Red,10%,lazy)
InternalFrame.closeHoverForeground=#fff InternalFrame.closeHoverForeground = #fff
InternalFrame.closePressedForeground=#fff InternalFrame.closePressedForeground = #fff
InternalFrame.activeDropShadowOpacity=0.5 InternalFrame.activeDropShadowOpacity = 0.5
InternalFrame.inactiveDropShadowOpacity=0.75 InternalFrame.inactiveDropShadowOpacity = 0.75
#---- Menu ---- #---- Menu ----
Menu.icon.arrowColor=#A7A7A7 Menu.icon.arrowColor = #A7A7A7
Menu.icon.disabledArrowColor=#606060 Menu.icon.disabledArrowColor = #606060
#---- MenuBar ---- #---- MenuBar ----
MenuBar.borderColor=#515151 MenuBar.borderColor = #515151
#---- MenuItemCheckBox ---- #---- MenuItemCheckBox ----
MenuItemCheckBox.icon.checkmarkColor=#A7A7A7 MenuItemCheckBox.icon.checkmarkColor = #A7A7A7
MenuItemCheckBox.icon.disabledCheckmarkColor=#606060 MenuItemCheckBox.icon.disabledCheckmarkColor = #606060
#---- PasswordField ---- #---- PasswordField ----
PasswordField.capsLockIconColor=#ffffff64 PasswordField.capsLockIconColor = #ffffff64
#---- Popup ---- #---- Popup ----
Popup.dropShadowColor=#000 Popup.dropShadowColor = #000
Popup.dropShadowOpacity=0.25 Popup.dropShadowOpacity = 0.25
#---- PopupMenu ---- #---- PopupMenu ----
PopupMenu.borderColor=#5e5e5e PopupMenu.borderColor = #5e5e5e
#---- ProgressBar ---- #---- ProgressBar ----
ProgressBar.background=#555 ProgressBar.background = #555
ProgressBar.foreground=#4A88C7 ProgressBar.foreground = #4A88C7
ProgressBar.selectionForeground=@foreground ProgressBar.selectionForeground = @foreground
ProgressBar.selectionBackground=@foreground ProgressBar.selectionBackground = @foreground
#---- RootPane ---- #---- RootPane ----
RootPane.activeBorderColor=darken(@background,7%,derived) RootPane.activeBorderColor = lighten(@background,7%,derived)
RootPane.inactiveBorderColor=darken(@background,5%,derived) RootPane.inactiveBorderColor = lighten(@background,5%,derived)
#---- ScrollBar ---- #---- ScrollBar ----
ScrollBar.track=lighten(@background,1%,derived noAutoInverse) ScrollBar.track = lighten(@background,1%,derived noAutoInverse)
ScrollBar.thumb=lighten($ScrollBar.track,10%,derived noAutoInverse) ScrollBar.thumb = lighten($ScrollBar.track,10%,derived noAutoInverse)
ScrollBar.hoverTrackColor=lighten($ScrollBar.track,4%,derived noAutoInverse) ScrollBar.hoverTrackColor = lighten($ScrollBar.track,4%,derived noAutoInverse)
ScrollBar.hoverThumbColor=lighten($ScrollBar.thumb,10%,derived noAutoInverse) ScrollBar.hoverThumbColor = lighten($ScrollBar.thumb,10%,derived noAutoInverse)
ScrollBar.pressedThumbColor=lighten($ScrollBar.thumb,15%,derived noAutoInverse) ScrollBar.pressedThumbColor = lighten($ScrollBar.thumb,15%,derived noAutoInverse)
ScrollBar.hoverButtonBackground=lighten(@background,5%,derived noAutoInverse) ScrollBar.hoverButtonBackground = lighten(@background,5%,derived noAutoInverse)
ScrollBar.pressedButtonBackground=lighten(@background,10%,derived noAutoInverse) ScrollBar.pressedButtonBackground = lighten(@background,10%,derived noAutoInverse)
#---- Separator ---- #---- Separator ----
Separator.foreground=#515151 Separator.foreground = #515151
#---- Slider ---- #---- Slider ----
Slider.trackValueColor=#4A88C7 Slider.trackValueColor = #4A88C7
Slider.trackColor=#646464 Slider.trackColor = #646464
Slider.thumbColor=$Slider.trackValueColor Slider.thumbColor = $Slider.trackValueColor
Slider.tickColor=#888 Slider.tickColor = #888
Slider.focusedColor=fade($Component.focusColor,70%,derived) Slider.focusedColor = fade($Component.focusColor,70%,derived)
Slider.hoverThumbColor=darken($Slider.thumbColor,10%,derived) Slider.hoverThumbColor = lighten($Slider.thumbColor,5%,derived)
Slider.pressedThumbColor=darken($Slider.thumbColor,15%,derived) Slider.pressedThumbColor = lighten($Slider.thumbColor,8%,derived)
Slider.disabledTrackColor=#4c5052 Slider.disabledTrackColor = #4c5052
Slider.disabledThumbColor=$Slider.disabledTrackColor Slider.disabledThumbColor = $Slider.disabledTrackColor
#---- SplitPane ---- #---- SplitPane ----
SplitPaneDivider.draggingColor=#646464 SplitPaneDivider.draggingColor = #646464
SplitPaneDivider.oneTouchHoverArrowColor=#7A7D81
#---- TabbedPane ---- #---- TabbedPane ----
TabbedPane.underlineColor=#4A88C7 TabbedPane.underlineColor = #4A88C7
TabbedPane.disabledUnderlineColor=#7a7a7a TabbedPane.disabledUnderlineColor = #7a7a7a
TabbedPane.hoverColor=darken($TabbedPane.background,5%,derived noAutoInverse) TabbedPane.hoverColor = darken($TabbedPane.background,5%,derived noAutoInverse)
TabbedPane.focusColor=#3d4b5c TabbedPane.focusColor = #3d4b5c
TabbedPane.contentAreaColor=#646464 TabbedPane.contentAreaColor = #646464
TabbedPane.buttonHoverBackground=darken($TabbedPane.background,5%,derived noAutoInverse) TabbedPane.buttonHoverBackground = darken($TabbedPane.background,5%,derived noAutoInverse)
TabbedPane.buttonPressedBackground=darken($TabbedPane.background,8%,derived noAutoInverse) TabbedPane.buttonPressedBackground = darken($TabbedPane.background,8%,derived noAutoInverse)
TabbedPane.closeBackground=null TabbedPane.closeBackground = null
TabbedPane.closeForeground=@disabledText TabbedPane.closeForeground = @disabledText
TabbedPane.closeHoverBackground=lighten($TabbedPane.background,5%,derived) TabbedPane.closeHoverBackground = lighten($TabbedPane.background,5%,derived)
TabbedPane.closeHoverForeground=@foreground TabbedPane.closeHoverForeground = @foreground
TabbedPane.closePressedBackground=lighten($TabbedPane.background,10%,derived) TabbedPane.closePressedBackground = lighten($TabbedPane.background,10%,derived)
TabbedPane.closePressedForeground=$TabbedPane.closeHoverForeground TabbedPane.closePressedForeground = $TabbedPane.closeHoverForeground
#---- Table ---- #---- Table ----
Table.gridColor=lighten($Table.background,3%) Table.gridColor = lighten($Table.background,5%)
#---- TableHeader ---- #---- TableHeader ----
TableHeader.separatorColor=lighten($TableHeader.background,10%) TableHeader.separatorColor = lighten($TableHeader.background,10%)
TableHeader.bottomSeparatorColor=$TableHeader.separatorColor TableHeader.bottomSeparatorColor = $TableHeader.separatorColor
#---- TitlePane ---- #---- TitlePane ----
TitlePane.embeddedForeground=darken($TitlePane.foreground,15%) TitlePane.embeddedForeground = darken($TitlePane.foreground,15%)
TitlePane.buttonHoverBackground=lighten($TitlePane.background,10%,derived) TitlePane.buttonHoverBackground = lighten($TitlePane.background,10%,derived)
TitlePane.buttonPressedBackground=lighten($TitlePane.background,20%,derived) TitlePane.buttonPressedBackground = lighten($TitlePane.background,20%,derived)
#---- ToggleButton ---- #---- ToggleButton ----
ToggleButton.selectedBackground=lighten($ToggleButton.background,10%,derived) ToggleButton.selectedBackground = lighten($ToggleButton.background,10%,derived)
ToggleButton.disabledSelectedBackground=lighten($ToggleButton.background,3%,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 ----
ToolTip.border=4,6,4,6 ToolTip.border = 4,6,4,6
ToolTip.background=#1e2123 ToolTip.background = #1e2123
#---- Tree ---- #---- Tree ----
Tree.hash=#505355 Tree.hash = lighten($Tree.background,5%)

View File

@@ -14,33 +14,46 @@
# limitations under the License. # 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, # 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. # which is licensed under the Apache 2.0 license. Copyright 2000-2019 JetBrains s.r.o.
# See: https://github.com/JetBrains/intellij-community/ # See: https://github.com/JetBrains/intellij-community/
#---- Button ---- #---- Button ----
Button.focusedBackground=null Button.focusedBackground = null
Button.default.background=#4D8AC9 Button.default.background = #4D8AC9
Button.default.foreground=#fff Button.default.foreground = #fff
Button.default.focusedBackground=null Button.default.focusedBackground = null
Button.default.borderColor=#3D75B2 Button.default.borderColor = #3D75B2
Button.default.hoverBorderColor=#A9C9F5 Button.default.hoverBorderColor = #A9C9F5
Button.default.focusedBorderColor=#A9C9F5 Button.default.focusedBorderColor = #A9C9F5
Button.default.focusColor=#97c3f3 Button.default.focusColor = #97c3f3
Button.default.boldText=true Button.default.boldText = true
Button.default.borderWidth=1 Button.default.borderWidth = 1
#---- CheckBox ---- #---- CheckBox ----
CheckBox.icon.style=filled CheckBox.icon.style = filled
#---- Component ---- #---- Component ----
Component.focusWidth=2 Component.focusWidth = 2
Component.innerFocusWidth=0 Component.innerFocusWidth = 0
Component.innerOutlineWidth=0 Component.innerOutlineWidth = 0
Component.arrowType=triangle Component.arrowType = triangle

View File

@@ -14,309 +14,325 @@
# limitations under the License. # 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, # 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. # which is licensed under the Apache 2.0 license. Copyright 2000-2019 JetBrains s.r.o.
# See: https://github.com/JetBrains/intellij-community/ # See: https://github.com/JetBrains/intellij-community/
#---- variables ---- #---- variables ----
@background=#f2f2f2 @background = #f2f2f2
@foreground=#000 @foreground = #000
@selectionBackground=#2675BF @selectionBackground = #2675BF
@selectionForeground=#fff @selectionForeground = #fff
@selectionInactiveBackground=#d4d4d4 @selectionInactiveBackground = #d4d4d4
@selectionInactiveForeground=@foreground @selectionInactiveForeground = @foreground
@disabledText=#8C8C8C @disabledText = #8C8C8C
@textComponentBackground=#fff @textComponentBackground = #fff
@menuBackground=#fff @menuBackground = #fff
@menuHoverBackground=darken(@menuBackground,10%,derived) @menuHoverBackground = darken(@menuBackground,10%,derived)
@menuCheckBackground=lighten(@selectionBackground,40%) @menuCheckBackground = lighten(@selectionBackground,40%,derived noAutoInverse)
@menuAcceleratorForeground=lighten(@foreground,30%) @menuAcceleratorForeground = lighten(@foreground,30%)
@menuAcceleratorSelectionForeground=@selectionForeground @menuAcceleratorSelectionForeground = @selectionForeground
@cellFocusColor=#000 @cellFocusColor = #000
@icon=#afafaf @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) # Drop (use lazy colors for IntelliJ platform themes, which usually do not specify these colors)
@dropCellBackground=lighten(List.selectionBackground,10%,lazy) @dropCellBackground = lighten(List.selectionBackground,10%,lazy)
@dropCellForeground=lazy(List.selectionForeground) @dropCellForeground = lazy(List.selectionForeground)
@dropLineColor=lighten(List.selectionBackground,20%,lazy) @dropLineColor = lighten(List.selectionBackground,20%,lazy)
@dropLineShortColor=darken(List.selectionBackground,20%,lazy) @dropLineShortColor = darken(List.selectionBackground,20%,lazy)
#---- system colors ---- #---- system colors ----
activeCaption=#99b4d1 activeCaption = #99b4d1
inactiveCaption=#bfcddb inactiveCaption = #bfcddb
controlHighlight=#e3e3e3 controlHighlight = lighten($controlShadow,12%)
controlLtHighlight=#fff controlLtHighlight = lighten($controlShadow,25%)
controlDkShadow=darken($controlShadow,15%) controlDkShadow = darken($controlShadow,15%)
#---- Button ---- #---- Button ----
Button.background=#fff Button.background = #fff
Button.focusedBackground=#e3f1fa Button.focusedBackground = #e3f1fa
Button.hoverBackground=darken($Button.background,3%,derived) Button.hoverBackground = darken($Button.background,3%,derived)
Button.pressedBackground=darken($Button.background,10%,derived) Button.pressedBackground = darken($Button.background,10%,derived)
Button.selectedBackground=darken($Button.background,20%,derived) Button.selectedBackground = darken($Button.background,20%,derived)
Button.selectedForeground=@foreground Button.selectedForeground = @foreground
Button.disabledSelectedBackground=darken($Button.background,13%,derived) Button.disabledSelectedBackground = darken($Button.background,13%,derived)
Button.borderColor=$Component.borderColor Button.borderColor = $Component.borderColor
Button.disabledBorderColor=$Component.disabledBorderColor Button.disabledBorderColor = $Component.disabledBorderColor
Button.focusedBorderColor=$Component.focusedBorderColor Button.focusedBorderColor = $Component.focusedBorderColor
Button.hoverBorderColor=$Button.focusedBorderColor Button.hoverBorderColor = $Button.focusedBorderColor
Button.default.background=$Button.background Button.innerFocusWidth = 0
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.toolbar.hoverBackground=darken($Button.background,12%,derived) Button.default.background = $Button.background
Button.toolbar.pressedBackground=darken($Button.background,15%,derived) Button.default.foreground = @foreground
Button.toolbar.selectedBackground=$Button.selectedBackground 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 ---- #---- CheckBox ----
# enabled # enabled
CheckBox.icon.borderColor=#b0b0b0 CheckBox.icon.borderColor = #b0b0b0
CheckBox.icon.background=#fff CheckBox.icon.background = #fff
CheckBox.icon.selectedBorderColor=$CheckBox.icon.borderColor CheckBox.icon.selectedBorderColor = $CheckBox.icon.borderColor
CheckBox.icon.selectedBackground=$CheckBox.icon.background CheckBox.icon.selectedBackground = $CheckBox.icon.background
CheckBox.icon.checkmarkColor=#4F9EE3 CheckBox.icon.checkmarkColor = #4F9EE3
# disabled # disabled
CheckBox.icon.disabledBorderColor=#BDBDBD CheckBox.icon.disabledBorderColor = #BDBDBD
CheckBox.icon.disabledBackground=@background CheckBox.icon.disabledBackground = @background
CheckBox.icon.disabledCheckmarkColor=#ABABAB CheckBox.icon.disabledCheckmarkColor = #ABABAB
# focused # focused
CheckBox.icon.focusedBorderColor=#7B9FC7 CheckBox.icon.focusedBorderColor = #7B9FC7
CheckBox.icon.focusedBackground=$Button.focusedBackground CheckBox.icon.focusedBackground = $Button.focusedBackground
# hover # hover
CheckBox.icon.hoverBorderColor=$CheckBox.icon.focusedBorderColor CheckBox.icon.hoverBorderColor = $CheckBox.icon.focusedBorderColor
CheckBox.icon.hoverBackground=$Button.hoverBackground CheckBox.icon.hoverBackground = $Button.hoverBackground
# pressed # pressed
CheckBox.icon.pressedBackground=$Button.pressedBackground CheckBox.icon.pressedBackground = $Button.pressedBackground
# used if CheckBox.icon.style=filled # used if CheckBox.icon.style = filled
# enabled # enabled
CheckBox.icon[filled].selectedBorderColor=#4B97D9 CheckBox.icon[filled].selectedBorderColor = #4B97D9
CheckBox.icon[filled].selectedBackground=#4F9EE3 CheckBox.icon[filled].selectedBackground = #4F9EE3
CheckBox.icon[filled].checkmarkColor=#fff CheckBox.icon[filled].checkmarkColor = #fff
# focused # focused
CheckBox.icon[filled].selectedFocusedBorderColor=#ACCFF7 CheckBox.icon[filled].selectedFocusedBorderColor = #ACCFF7
CheckBox.icon[filled].selectedFocusedBackground=$CheckBox.icon[filled].selectedBackground CheckBox.icon[filled].selectedFocusedBackground = $CheckBox.icon[filled].selectedBackground
CheckBox.icon[filled].selectedFocusedCheckmarkColor=$CheckBox.icon.focusedBackground CheckBox.icon[filled].selectedFocusedCheckmarkColor = $CheckBox.icon.focusedBackground
# hover # hover
CheckBox.icon[filled].selectedHoverBackground=darken($CheckBox.icon[filled].selectedBackground,5%) CheckBox.icon[filled].selectedHoverBackground = darken($CheckBox.icon[filled].selectedBackground,5%,derived)
# pressed # pressed
CheckBox.icon[filled].selectedPressedBackground=darken($CheckBox.icon[filled].selectedBackground,10%) CheckBox.icon[filled].selectedPressedBackground = darken($CheckBox.icon[filled].selectedBackground,10%,derived)
#---- ComboBox ---- #---- ComboBox ----
ComboBox.buttonEditableBackground=#fafafa ComboBox.buttonEditableBackground = darken($ComboBox.background,2%)
ComboBox.buttonArrowColor=#666
ComboBox.buttonDisabledArrowColor=#ABABAB
ComboBox.buttonHoverArrowColor=#999
#---- Component ---- #---- Component ----
Component.borderColor=#c4c4c4 Component.borderColor = #c4c4c4
Component.disabledBorderColor=#cfcfcf Component.disabledBorderColor = #cfcfcf
Component.focusedBorderColor=#87afda Component.focusedBorderColor = #87afda
Component.focusColor=#97c3f3 Component.focusColor = #97c3f3
Component.linkColor=#2470B3 Component.linkColor = #2470B3
Component.grayFilter=25,-25,100 Component.grayFilter = 25,-25,100
Component.error.borderColor=lighten(desaturate($Component.error.focusedBorderColor,20%),25%) Component.error.borderColor = lighten(desaturate($Component.error.focusedBorderColor,20%),25%)
Component.error.focusedBorderColor=#e53e4d Component.error.focusedBorderColor = #e53e4d
Component.warning.borderColor=lighten(saturate($Component.warning.focusedBorderColor,25%),20%) Component.warning.borderColor = lighten(saturate($Component.warning.focusedBorderColor,25%),20%)
Component.warning.focusedBorderColor=#e2a53a Component.warning.focusedBorderColor = #e2a53a
Component.custom.borderColor=lighten(desaturate(#f00,20%,derived noAutoInverse),25%,derived noAutoInverse) Component.custom.borderColor = lighten(desaturate(#f00,20%,derived noAutoInverse),25%,derived noAutoInverse)
#---- Desktop ---- #---- Desktop ----
Desktop.background=#E6EBF0 Desktop.background = #E6EBF0
#---- DesktopIcon ---- #---- DesktopIcon ----
DesktopIcon.background=darken($Desktop.background,10%) DesktopIcon.background = darken($Desktop.background,10%)
#---- HelpButton ---- #---- HelpButton ----
HelpButton.questionMarkColor=#4F9EE3 HelpButton.questionMarkColor = #4F9EE3
#---- InternalFrame ---- #---- InternalFrame ----
InternalFrame.activeTitleBackground=#fff InternalFrame.activeTitleBackground = #fff
InternalFrame.activeTitleForeground=@foreground InternalFrame.activeTitleForeground = @foreground
InternalFrame.inactiveTitleBackground=#fafafa InternalFrame.inactiveTitleBackground = #fafafa
InternalFrame.inactiveTitleForeground=@disabledText InternalFrame.inactiveTitleForeground = @disabledText
InternalFrame.activeBorderColor=darken($Component.borderColor,20%) InternalFrame.activeBorderColor = darken($Component.borderColor,20%)
InternalFrame.inactiveBorderColor=$Component.borderColor InternalFrame.inactiveBorderColor = $Component.borderColor
InternalFrame.buttonHoverBackground=darken($InternalFrame.activeTitleBackground,10%,derived) InternalFrame.buttonHoverBackground = darken($InternalFrame.activeTitleBackground,10%,derived)
InternalFrame.buttonPressedBackground=darken($InternalFrame.activeTitleBackground,20%,derived) InternalFrame.buttonPressedBackground = darken($InternalFrame.activeTitleBackground,20%,derived)
InternalFrame.closeHoverBackground=lazy(Actions.Red) InternalFrame.closeHoverBackground = lazy(Actions.Red)
InternalFrame.closePressedBackground=darken(Actions.Red,10%,lazy) InternalFrame.closePressedBackground = darken(Actions.Red,10%,lazy)
InternalFrame.closeHoverForeground=#fff InternalFrame.closeHoverForeground = #fff
InternalFrame.closePressedForeground=#fff InternalFrame.closePressedForeground = #fff
InternalFrame.activeDropShadowOpacity=0.25 InternalFrame.activeDropShadowOpacity = 0.25
InternalFrame.inactiveDropShadowOpacity=0.5 InternalFrame.inactiveDropShadowOpacity = 0.5
#---- Menu ---- #---- Menu ----
Menu.icon.arrowColor=#666 Menu.icon.arrowColor = #666
Menu.icon.disabledArrowColor=#ABABAB Menu.icon.disabledArrowColor = #ABABAB
#---- MenuBar ---- #---- MenuBar ----
MenuBar.borderColor=#cdcdcd MenuBar.borderColor = #cdcdcd
#---- MenuItemCheckBox ---- #---- MenuItemCheckBox ----
MenuItemCheckBox.icon.checkmarkColor=#4F9EE3 MenuItemCheckBox.icon.checkmarkColor = #4F9EE3
MenuItemCheckBox.icon.disabledCheckmarkColor=#ABABAB MenuItemCheckBox.icon.disabledCheckmarkColor = #ABABAB
#---- PasswordField ---- #---- PasswordField ----
PasswordField.capsLockIconColor=#00000064 PasswordField.capsLockIconColor = #00000064
#---- Popup ---- #---- Popup ----
Popup.dropShadowColor=#000 Popup.dropShadowColor = #000
Popup.dropShadowOpacity=0.15 Popup.dropShadowOpacity = 0.15
#---- PopupMenu ---- #---- PopupMenu ----
PopupMenu.borderColor=#adadad PopupMenu.borderColor = #adadad
#---- ProgressBar ---- #---- ProgressBar ----
ProgressBar.background=#D1D1D1 ProgressBar.background = #D1D1D1
ProgressBar.foreground=#1E82E6 ProgressBar.foreground = #1E82E6
ProgressBar.selectionForeground=@textComponentBackground ProgressBar.selectionForeground = @textComponentBackground
ProgressBar.selectionBackground=@foreground ProgressBar.selectionBackground = @foreground
#---- RootPane ---- #---- RootPane ----
RootPane.activeBorderColor=#707070 RootPane.activeBorderColor = darken(@background,50%,derived)
RootPane.inactiveBorderColor=lighten($RootPane.activeBorderColor,20%,derived) RootPane.inactiveBorderColor = darken(@background,30%,derived)
#---- ScrollBar ---- #---- ScrollBar ----
ScrollBar.track=lighten(@background,1%,derived noAutoInverse) ScrollBar.track = lighten(@background,1%,derived noAutoInverse)
ScrollBar.thumb=darken($ScrollBar.track,10%,derived noAutoInverse) ScrollBar.thumb = darken($ScrollBar.track,10%,derived noAutoInverse)
ScrollBar.hoverTrackColor=darken($ScrollBar.track,3%,derived noAutoInverse) ScrollBar.hoverTrackColor = darken($ScrollBar.track,3%,derived noAutoInverse)
ScrollBar.hoverThumbColor=darken($ScrollBar.thumb,10%,derived noAutoInverse) ScrollBar.hoverThumbColor = darken($ScrollBar.thumb,10%,derived noAutoInverse)
ScrollBar.pressedThumbColor=darken($ScrollBar.thumb,20%,derived noAutoInverse) ScrollBar.pressedThumbColor = darken($ScrollBar.thumb,20%,derived noAutoInverse)
ScrollBar.hoverButtonBackground=darken(@background,5%,derived noAutoInverse) ScrollBar.hoverButtonBackground = darken(@background,5%,derived noAutoInverse)
ScrollBar.pressedButtonBackground=darken(@background,10%,derived noAutoInverse) ScrollBar.pressedButtonBackground = darken(@background,10%,derived noAutoInverse)
#---- Separator ---- #---- Separator ----
Separator.foreground=#d1d1d1 Separator.foreground = #d1d1d1
#---- Slider ---- #---- Slider ----
Slider.trackValueColor=#1E82E6 Slider.trackValueColor = #1E82E6
Slider.trackColor=#c4c4c4 Slider.trackColor = #c4c4c4
Slider.thumbColor=$Slider.trackValueColor Slider.thumbColor = $Slider.trackValueColor
Slider.tickColor=#888 Slider.tickColor = #888
Slider.focusedColor=fade($Component.focusColor,50%,derived) Slider.focusedColor = fade($Component.focusColor,50%,derived)
Slider.hoverThumbColor=lighten($Slider.thumbColor,10%,derived) Slider.hoverThumbColor = darken($Slider.thumbColor,5%,derived)
Slider.pressedThumbColor=lighten($Slider.thumbColor,15%,derived) Slider.pressedThumbColor = darken($Slider.thumbColor,8%,derived)
Slider.disabledTrackColor=#c0c0c0 Slider.disabledTrackColor = #c0c0c0
Slider.disabledThumbColor=$Slider.disabledTrackColor Slider.disabledThumbColor = $Slider.disabledTrackColor
#---- SplitPane ---- #---- SplitPane ----
SplitPaneDivider.draggingColor=#c4c4c4 SplitPaneDivider.draggingColor = #c4c4c4
SplitPaneDivider.oneTouchHoverArrowColor=#333
#---- TabbedPane ---- #---- TabbedPane ----
TabbedPane.underlineColor=#4083C9 TabbedPane.underlineColor = #4083C9
TabbedPane.disabledUnderlineColor=#ababab TabbedPane.disabledUnderlineColor = #ababab
TabbedPane.hoverColor=darken($TabbedPane.background,7%,derived) TabbedPane.hoverColor = darken($TabbedPane.background,7%,derived)
TabbedPane.focusColor=#dae4ed TabbedPane.focusColor = #dae4ed
TabbedPane.contentAreaColor=#bfbfbf TabbedPane.contentAreaColor = #bfbfbf
TabbedPane.buttonHoverBackground=darken($TabbedPane.background,7%,derived) TabbedPane.buttonHoverBackground = darken($TabbedPane.background,7%,derived)
TabbedPane.buttonPressedBackground=darken($TabbedPane.background,10%,derived) TabbedPane.buttonPressedBackground = darken($TabbedPane.background,10%,derived)
TabbedPane.closeBackground=null TabbedPane.closeBackground = null
TabbedPane.closeForeground=@disabledText TabbedPane.closeForeground = @disabledText
TabbedPane.closeHoverBackground=darken($TabbedPane.background,20%,derived) TabbedPane.closeHoverBackground = darken($TabbedPane.background,20%,derived)
TabbedPane.closeHoverForeground=@foreground TabbedPane.closeHoverForeground = @foreground
TabbedPane.closePressedBackground=darken($TabbedPane.background,25%,derived) TabbedPane.closePressedBackground = darken($TabbedPane.background,25%,derived)
TabbedPane.closePressedForeground=$TabbedPane.closeHoverForeground TabbedPane.closePressedForeground = $TabbedPane.closeHoverForeground
#---- Table ---- #---- Table ----
Table.gridColor=darken($Table.background,3%) Table.gridColor = darken($Table.background,5%)
#---- TableHeader ---- #---- TableHeader ----
TableHeader.separatorColor=darken($TableHeader.background,10%) TableHeader.separatorColor = darken($TableHeader.background,10%)
TableHeader.bottomSeparatorColor=$TableHeader.separatorColor TableHeader.bottomSeparatorColor = $TableHeader.separatorColor
#---- TitlePane ---- #---- TitlePane ----
TitlePane.embeddedForeground=lighten($TitlePane.foreground,35%) TitlePane.embeddedForeground = lighten($TitlePane.foreground,35%)
TitlePane.buttonHoverBackground=darken($TitlePane.background,10%,derived) TitlePane.buttonHoverBackground = darken($TitlePane.background,10%,derived)
TitlePane.buttonPressedBackground=darken($TitlePane.background,20%,derived) TitlePane.buttonPressedBackground = darken($TitlePane.background,20%,derived)
#---- ToggleButton ---- #---- ToggleButton ----
ToggleButton.selectedBackground=darken($ToggleButton.background,20%,derived) ToggleButton.selectedBackground = darken($ToggleButton.background,20%,derived)
ToggleButton.disabledSelectedBackground=darken($ToggleButton.background,13%,derived) ToggleButton.disabledSelectedBackground = darken($ToggleButton.background,13%,derived)
ToggleButton.toolbar.selectedBackground=$ToggleButton.selectedBackground ToggleButton.toolbar.selectedBackground = $ToggleButton.selectedBackground
#---- ToolTip ---- #---- ToolTip ----
ToolTip.border=4,6,4,6,$InternalFrame.activeBorderColor ToolTip.border = 4,6,4,6,$InternalFrame.activeBorderColor
ToolTip.background=#fafafa ToolTip.background = #fafafa
#---- Tree ---- #---- Tree ----
Tree.hash=#E6E6E6 Tree.hash = darken($Tree.background,10%)

View File

@@ -14,139 +14,215 @@
# limitations under the License. # 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 ----
Button.startBackground=$Button.background Button.startBackground = $Button.background
Button.endBackground=$Button.background Button.endBackground = $Button.background
Button.startBorderColor=$Button.borderColor Button.startBorderColor = $Button.borderColor
Button.endBorderColor=$Button.borderColor Button.endBorderColor = $Button.borderColor
Button.default.startBackground=$Button.default.background Button.default.startBackground = $Button.default.background
Button.default.endBackground=$Button.default.background Button.default.endBackground = $Button.default.background
Button.default.startBorderColor=$Button.default.borderColor Button.default.startBorderColor = $Button.default.borderColor
Button.default.endBorderColor=$Button.default.borderColor Button.default.endBorderColor = $Button.default.borderColor
Button.hoverBorderColor=null Button.hoverBorderColor = null
Button.default.hoverBorderColor=null Button.default.hoverBorderColor = null
#---- HelpButton ---- #---- 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 ----
Slider.focusedColor=fade($Component.focusColor,40%,derived) Slider.focusedColor = fade($Component.focusColor,40%,derived)
#---- ToggleButton ---- #---- ToggleButton ----
ToggleButton.startBackground=$ToggleButton.background ToggleButton.startBackground = $ToggleButton.background
ToggleButton.endBackground=$ToggleButton.background ToggleButton.endBackground = $ToggleButton.background
[dark]ToggleButton.selectedBackground=lighten($ToggleButton.background,15%,derived) [dark]ToggleButton.selectedBackground = lighten($ToggleButton.background,15%,derived)
[dark]ToggleButton.disabledSelectedBackground=lighten($ToggleButton.background,5%,derived) [dark]ToggleButton.disabledSelectedBackground = lighten($ToggleButton.background,5%,derived)
#---- theme specific ---- #---- theme specific ----
[Arc_Theme]ProgressBar.selectionBackground=#000 @ijMenuCheckBackgroundL10 = lighten(@selectionBackground,10%,derived noAutoInverse)
[Arc_Theme]ProgressBar.selectionForeground=#fff @ijMenuCheckBackgroundL20 = lighten(@selectionBackground,20%,derived noAutoInverse)
@ijMenuCheckBackgroundD10 = darken(@selectionBackground,10%,derived noAutoInverse)
[Arc_Theme_-_Orange]ProgressBar.selectionBackground=#000 [Arc_Theme]CheckBoxMenuItem.foreground = lazy(MenuItem.foreground)
[Arc_Theme_-_Orange]ProgressBar.selectionForeground=#fff [Arc_Theme]PopupMenu.foreground = lazy(MenuItem.foreground)
[Arc_Theme]RadioButtonMenuItem.foreground = lazy(MenuItem.foreground)
[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_-_Orange]CheckBoxMenuItem.foreground = lazy(MenuItem.foreground)
[Arc_Theme_Dark]ProgressBar.selectionForeground=#ddd [Arc_Theme_-_Orange]PopupMenu.foreground = lazy(MenuItem.foreground)
[Arc_Theme_-_Orange]RadioButtonMenuItem.foreground = lazy(MenuItem.foreground)
[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]CheckBoxMenuItem.foreground = lazy(MenuItem.foreground)
[Arc_Theme_Dark_-_Orange]ProgressBar.selectionForeground=#fff [Arc_Theme_Dark]PopupMenu.foreground = lazy(MenuItem.foreground)
[Arc_Theme_Dark]RadioButtonMenuItem.foreground = lazy(MenuItem.foreground)
[Arc_Theme_Dark]ProgressBar.selectionBackground = #ddd
[Arc_Theme_Dark]ProgressBar.selectionForeground = #ddd
[Cobalt_2]CheckBox.icon.background=#002946 [Arc_Theme_Dark_-_Orange]CheckBoxMenuItem.foreground = lazy(MenuItem.foreground)
[Cobalt_2]CheckBox.icon.checkmarkColor=#002946 [Arc_Theme_Dark_-_Orange]PopupMenu.foreground = lazy(MenuItem.foreground)
[Arc_Theme_Dark_-_Orange]RadioButtonMenuItem.foreground = lazy(MenuItem.foreground)
[Arc_Theme_Dark_-_Orange]ProgressBar.selectionBackground = #ddd
[Arc_Theme_Dark_-_Orange]ProgressBar.selectionForeground = #fff
[Dark_purple]Slider.focusedColor=fade($Component.focusColor,70%,derived) [Cobalt_2]CheckBox.icon.background = #002946
[Cobalt_2]CheckBox.icon.checkmarkColor = #002946
[Cobalt_2]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
[Cobalt_2]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
[Dracula]ProgressBar.selectionBackground=#fff [Cyan_light]MenuItem.checkBackground = @ijMenuCheckBackgroundL20
[Dracula]ProgressBar.selectionForeground=#fff [Cyan_light]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL20
[Gruvbox_Dark_Hard]ToggleButton.selectedBackground=$ToggleButton.selectedBackground [Dark_Flat_Theme]TableHeader.background = #3B3B3B
[Gruvbox_Dark_Hard]ToggleButton.toolbar.selectedBackground=$ToggleButton.toolbar.selectedBackground
[Gruvbox_Dark_Medium]ToggleButton.selectedBackground=$ToggleButton.selectedBackground [Dark_purple]Slider.focusedColor = fade($Component.focusColor,70%,derived)
[Gruvbox_Dark_Medium]ToggleButton.toolbar.selectedBackground=$ToggleButton.toolbar.selectedBackground
[Gruvbox_Dark_Soft]ToggleButton.selectedBackground=$ToggleButton.selectedBackground [Dracula]ProgressBar.selectionBackground = #fff
[Gruvbox_Dark_Soft]ToggleButton.toolbar.selectedBackground=$ToggleButton.toolbar.selectedBackground [Dracula]ProgressBar.selectionForeground = #fff
[Hiberbee_Dark]ToggleButton.selectedBackground=$ToggleButton.selectedBackground [Gradianto_Dark_Fuchsia]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
[Hiberbee_Dark]ToggleButton.selectedBackground=$ToggleButton.selectedBackground [Gradianto_Dark_Fuchsia]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
[Hiberbee_Dark]ToggleButton.toolbar.selectedBackground=$ToggleButton.toolbar.selectedBackground
[High_contrast]ToggleButton.selectedBackground=#fff [Gruvbox_Dark_Hard]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
[High_contrast]ToggleButton.selectedForeground=#000 [Gruvbox_Dark_Hard]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground
[High_contrast]ToggleButton.disabledSelectedBackground=#444
[High_contrast]ToggleButton.toolbar.selectedBackground=#fff
[One_Dark]Slider.focusedColor=fade(#568af2,40%) [Gruvbox_Dark_Medium]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
[Gruvbox_Dark_Medium]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground
[Solarized_Dark]Slider.focusedColor=fade($Component.focusColor,80%,derived) [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
[vuesion-theme]Slider.trackValueColor=#ececee [Hiberbee_Dark]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
[vuesion-theme]Slider.trackColor=#303a45 [Hiberbee_Dark]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
[vuesion-theme]Slider.thumbColor=#ececee [Hiberbee_Dark]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground
[vuesion-theme]Slider.focusedColor=fade(#ececee,20%)
[High_contrast]ToggleButton.selectedBackground = #fff
[High_contrast]ToggleButton.selectedForeground = #000
[High_contrast]ToggleButton.disabledSelectedBackground = #444
[High_contrast]ToggleButton.toolbar.selectedBackground = #fff
[Light_Flat]TableHeader.background = #E5E5E9
[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 # Material Theme UI Lite
[Dracula_Contrast]ProgressBar.selectionBackground=#fff [light][author-Mallowigi]MenuItem.checkBackground = @ijMenuCheckBackgroundD10
[Dracula_Contrast]ProgressBar.selectionForeground=#fff [light][author-Mallowigi]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundD10
[dark][author-Mallowigi]MenuItem.checkBackground = @ijMenuCheckBackgroundL20
[dark][author-Mallowigi]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL20
[GitHub]ProgressBar.selectionBackground=#222 [Dracula_Contrast]ProgressBar.selectionBackground = #fff
[GitHub]ProgressBar.selectionForeground=#222 [Dracula_Contrast]ProgressBar.selectionForeground = #fff
[GitHub_Contrast]ProgressBar.selectionBackground=#222 [GitHub]ProgressBar.selectionBackground = #222
[GitHub_Contrast]ProgressBar.selectionForeground=#222 [GitHub]ProgressBar.selectionForeground = #222
[Light_Owl]ProgressBar.selectionBackground=#111 [GitHub_Contrast]ProgressBar.selectionBackground = #222
[Light_Owl]ProgressBar.selectionForeground=#fff [GitHub_Contrast]ProgressBar.selectionForeground = #222
[Light_Owl_Contrast]ProgressBar.selectionBackground=#111 [Light_Owl]ProgressBar.selectionBackground = #111
[Light_Owl_Contrast]ProgressBar.selectionForeground=#fff [Light_Owl]ProgressBar.selectionForeground = #fff
[Material_Lighter]ProgressBar.selectionBackground=#222 [Light_Owl_Contrast]ProgressBar.selectionBackground = #111
[Material_Lighter]ProgressBar.selectionForeground=#fff [Light_Owl_Contrast]ProgressBar.selectionForeground = #fff
[Material_Lighter_Contrast]ProgressBar.selectionBackground=#222 [Material_Lighter]ProgressBar.selectionBackground = #222
[Material_Lighter_Contrast]ProgressBar.selectionForeground=#fff [Material_Lighter]ProgressBar.selectionForeground = #fff
[Material_Oceanic]ProgressBar.selectionBackground=#ddd [Material_Lighter_Contrast]ProgressBar.selectionBackground = #222
[Material_Oceanic]ProgressBar.selectionForeground=#ddd [Material_Lighter_Contrast]ProgressBar.selectionForeground = #fff
[Material_Oceanic_Contrast]ProgressBar.selectionBackground=#ddd [Material_Oceanic]ProgressBar.selectionBackground = #ddd
[Material_Oceanic_Contrast]ProgressBar.selectionForeground=#ddd [Material_Oceanic]ProgressBar.selectionForeground = #ddd
[Material_Palenight]ProgressBar.selectionBackground=#ddd [Material_Oceanic_Contrast]ProgressBar.selectionBackground = #ddd
[Material_Palenight]ProgressBar.selectionForeground=#ddd [Material_Oceanic_Contrast]ProgressBar.selectionForeground = #ddd
[Material_Palenight_Contrast]ProgressBar.selectionBackground=#ddd [Material_Palenight]ProgressBar.selectionBackground = #ddd
[Material_Palenight_Contrast]ProgressBar.selectionForeground=#ddd [Material_Palenight]ProgressBar.selectionForeground = #ddd
[Night_Owl]ProgressBar.selectionBackground=#ddd [Material_Palenight_Contrast]ProgressBar.selectionBackground = #ddd
[Night_Owl]ProgressBar.selectionForeground=#ddd [Material_Palenight_Contrast]ProgressBar.selectionForeground = #ddd
[Night_Owl_Contrast]ProgressBar.selectionBackground=#ddd [Night_Owl]ProgressBar.selectionBackground = #ddd
[Night_Owl_Contrast]ProgressBar.selectionForeground=#ddd [Night_Owl]ProgressBar.selectionForeground = #ddd
[Solarized_Dark]ProgressBar.selectionBackground=#ccc [Night_Owl_Contrast]ProgressBar.selectionBackground = #ddd
[Solarized_Dark]ProgressBar.selectionForeground=#ccc [Night_Owl_Contrast]ProgressBar.selectionForeground = #ddd
[Material_Solarized_Dark_Contrast]ProgressBar.selectionBackground=#ccc [Solarized_Dark]ProgressBar.selectionBackground = #ccc
[Material_Solarized_Dark_Contrast]ProgressBar.selectionForeground=#ccc [Solarized_Dark]ProgressBar.selectionForeground = #ccc
[Solarized_Light]ProgressBar.selectionBackground=#222 [Material_Solarized_Dark_Contrast]ProgressBar.selectionBackground = #ccc
[Solarized_Light]ProgressBar.selectionForeground=#fff [Material_Solarized_Dark_Contrast]ProgressBar.selectionForeground = #ccc
[Material_Solarized_Light_Contrast]ProgressBar.selectionBackground=#222 [Solarized_Light]ProgressBar.selectionBackground = #222
[Material_Solarized_Light_Contrast]ProgressBar.selectionForeground=#fff [Solarized_Light]ProgressBar.selectionForeground = #fff
[Material_Solarized_Light_Contrast]ProgressBar.selectionBackground = #222
[Material_Solarized_Light_Contrast]ProgressBar.selectionForeground = #fff

View File

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

View File

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

View File

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

View File

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

View File

@@ -2,3 +2,12 @@ FlatLaf Demo
============ ============
This sub-project contains the FlatLaf Demo source code. 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.

View File

@@ -16,15 +16,6 @@
plugins { plugins {
`java-library` `java-library`
id( "com.jfrog.bintray" )
// Although artifactory plugin is not used in this subproject, the plugin is required
// because otherwise gradle fails with following error:
// Caused by: org.codehaus.groovy.runtime.typehandling.GroovyCastException:
// Cannot cast object 'task ':bintrayUpload''
// with class 'com.jfrog.bintray.gradle.tasks.BintrayUploadTask_Decorated'
// to class 'com.jfrog.bintray.gradle.tasks.BintrayUploadTask'
id( "com.jfrog.artifactory" )
} }
repositories { repositories {
@@ -40,6 +31,7 @@ dependencies {
implementation( project( ":flatlaf-intellij-themes" ) ) implementation( project( ":flatlaf-intellij-themes" ) )
implementation( "com.miglayout:miglayout-swing:5.3-SNAPSHOT" ) implementation( "com.miglayout:miglayout-swing:5.3-SNAPSHOT" )
implementation( "com.jgoodies:jgoodies-forms:1.9.0" ) implementation( "com.jgoodies:jgoodies-forms:1.9.0" )
// implementation( project( ":flatlaf-natives-jna" ) )
} }
tasks { tasks {
@@ -47,6 +39,7 @@ tasks {
dependsOn( ":flatlaf-core:jar" ) dependsOn( ":flatlaf-core:jar" )
dependsOn( ":flatlaf-extras:jar" ) dependsOn( ":flatlaf-extras:jar" )
dependsOn( ":flatlaf-intellij-themes:jar" ) dependsOn( ":flatlaf-intellij-themes:jar" )
// dependsOn( ":flatlaf-natives-jna:jar" )
manifest { manifest {
attributes( "Main-Class" to "com.formdev.flatlaf.demo.FlatLafDemo" ) attributes( "Main-Class" to "com.formdev.flatlaf.demo.FlatLafDemo" )
@@ -68,24 +61,3 @@ tasks {
} ) } )
} }
} }
bintray {
user = rootProject.extra["bintray.user"] as String?
key = rootProject.extra["bintray.key"] as String?
setConfigurations( "archives" )
with( pkg ) {
repo = "flatlaf"
name = "flatlaf-demo"
setLicenses( "Apache-2.0" )
vcsUrl = "https://github.com/JFormDesigner/FlatLaf"
with( version ) {
name = project.version.toString()
}
publish = rootProject.extra["bintray.publish"] as Boolean
dryRun = rootProject.extra["bintray.dryRun"] as Boolean
}
}

View File

@@ -32,7 +32,10 @@ import com.formdev.flatlaf.demo.intellijthemes.*;
import com.formdev.flatlaf.extras.FlatAnimatedLafChange; import com.formdev.flatlaf.extras.FlatAnimatedLafChange;
import com.formdev.flatlaf.extras.FlatSVGIcon; import com.formdev.flatlaf.extras.FlatSVGIcon;
import com.formdev.flatlaf.extras.FlatUIDefaultsInspector; import com.formdev.flatlaf.extras.FlatUIDefaultsInspector;
import com.formdev.flatlaf.extras.SVGUtils; import com.formdev.flatlaf.extras.components.FlatButton;
import com.formdev.flatlaf.extras.components.FlatButton.ButtonType;
import com.formdev.flatlaf.extras.FlatSVGUtils;
import com.formdev.flatlaf.ui.FlatNativeWindowBorder;
import com.formdev.flatlaf.ui.JBRCustomDecorations; import com.formdev.flatlaf.ui.JBRCustomDecorations;
import net.miginfocom.layout.ConstraintParser; import net.miginfocom.layout.ConstraintParser;
import net.miginfocom.layout.LC; import net.miginfocom.layout.LC;
@@ -59,7 +62,7 @@ class DemoFrame
updateFontMenuItems(); updateFontMenuItems();
controlBar.initialize( this, tabbedPane ); 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() ) if( tabIndex >= 0 && tabIndex < tabbedPane.getTabCount() && tabIndex != tabbedPane.getSelectedIndex() )
tabbedPane.setSelectedIndex( tabIndex ); tabbedPane.setSelectedIndex( tabIndex );
@@ -142,15 +145,19 @@ class DemoFrame
boolean windowDecorations = windowDecorationsCheckBoxMenuItem.isSelected(); boolean windowDecorations = windowDecorationsCheckBoxMenuItem.isSelected();
// change window decoration of demo main frame // change window decoration of demo main frame
if( FlatNativeWindowBorder.isSupported() ) {
FlatNativeWindowBorder.setHasCustomDecoration( this, windowDecorations );
getRootPane().setWindowDecorationStyle( windowDecorations ? JRootPane.FRAME : JRootPane.NONE );
} else {
dispose(); dispose();
setUndecorated( windowDecorations ); setUndecorated( windowDecorations );
getRootPane().setWindowDecorationStyle( windowDecorations ? JRootPane.FRAME : JRootPane.NONE ); getRootPane().setWindowDecorationStyle( windowDecorations ? JRootPane.FRAME : JRootPane.NONE );
menuBarEmbeddedCheckBoxMenuItem.setEnabled( windowDecorations );
setVisible( true ); setVisible( true );
}
menuBarEmbeddedCheckBoxMenuItem.setEnabled( windowDecorations );
// enable/disable window decoration for later created frames/dialogs // enable/disable window decoration for later created frames/dialogs
JFrame.setDefaultLookAndFeelDecorated( windowDecorations ); UIManager.put( "TitlePane.useWindowDecorations", windowDecorations );
JDialog.setDefaultLookAndFeelDecorated( windowDecorations );
} }
private void menuBarEmbeddedChanged() { private void menuBarEmbeddedChanged() {
@@ -163,6 +170,11 @@ class DemoFrame
// repaint(); // repaint();
} }
private void unifiedTitleBar() {
UIManager.put( "TitlePane.unifiedBackground", unifiedTitleBarMenuItem.isSelected() );
FlatLaf.updateUI();
}
private void underlineMenuSelection() { private void underlineMenuSelection() {
UIManager.put( "MenuItem.selectionType", underlineMenuSelectionMenuItem.isSelected() ? "underline" : null ); UIManager.put( "MenuItem.selectionType", underlineMenuSelectionMenuItem.isSelected() ? "underline" : null );
} }
@@ -327,6 +339,7 @@ class DemoFrame
optionsMenu = new JMenu(); optionsMenu = new JMenu();
windowDecorationsCheckBoxMenuItem = new JCheckBoxMenuItem(); windowDecorationsCheckBoxMenuItem = new JCheckBoxMenuItem();
menuBarEmbeddedCheckBoxMenuItem = new JCheckBoxMenuItem(); menuBarEmbeddedCheckBoxMenuItem = new JCheckBoxMenuItem();
unifiedTitleBarMenuItem = new JCheckBoxMenuItem();
underlineMenuSelectionMenuItem = new JCheckBoxMenuItem(); underlineMenuSelectionMenuItem = new JCheckBoxMenuItem();
alwaysShowMnemonicsMenuItem = new JCheckBoxMenuItem(); alwaysShowMnemonicsMenuItem = new JCheckBoxMenuItem();
animatedLafChangeMenuItem = new JCheckBoxMenuItem(); animatedLafChangeMenuItem = new JCheckBoxMenuItem();
@@ -588,6 +601,11 @@ class DemoFrame
menuBarEmbeddedCheckBoxMenuItem.addActionListener(e -> menuBarEmbeddedChanged()); menuBarEmbeddedCheckBoxMenuItem.addActionListener(e -> menuBarEmbeddedChanged());
optionsMenu.add(menuBarEmbeddedCheckBoxMenuItem); optionsMenu.add(menuBarEmbeddedCheckBoxMenuItem);
//---- unifiedTitleBarMenuItem ----
unifiedTitleBarMenuItem.setText("Unified Title Bar");
unifiedTitleBarMenuItem.addActionListener(e -> unifiedTitleBar());
optionsMenu.add(unifiedTitleBarMenuItem);
//---- underlineMenuSelectionMenuItem ---- //---- underlineMenuSelectionMenuItem ----
underlineMenuSelectionMenuItem.setText("Use underline menu selection"); underlineMenuSelectionMenuItem.setText("Use underline menu selection");
underlineMenuSelectionMenuItem.addActionListener(e -> underlineMenuSelection()); underlineMenuSelectionMenuItem.addActionListener(e -> underlineMenuSelection());
@@ -702,6 +720,15 @@ class DemoFrame
buttonGroup1.add(radioButtonMenuItem3); buttonGroup1.add(radioButtonMenuItem3);
// JFormDesigner - End of component initialization //GEN-END:initComponents // JFormDesigner - End of component initialization //GEN-END:initComponents
// add "Users" button to menubar
FlatButton usersButton = new FlatButton();
usersButton.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/users.svg" ) );
usersButton.setButtonType( ButtonType.toolBarButton );
usersButton.setFocusable( false );
usersButton.addActionListener( e -> JOptionPane.showMessageDialog( null, "Hello User! How are you?", "User", JOptionPane.INFORMATION_MESSAGE ) );
menuBar1.add( Box.createGlue() );
menuBar1.add( usersButton );
undoMenuItem.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/undo.svg" ) ); undoMenuItem.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/undo.svg" ) );
redoMenuItem.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/redo.svg" ) ); redoMenuItem.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/redo.svg" ) );
@@ -722,7 +749,7 @@ class DemoFrame
pasteMenuItem.addActionListener( new DefaultEditorKit.PasteAction() ); pasteMenuItem.addActionListener( new DefaultEditorKit.PasteAction() );
boolean supportsWindowDecorations = UIManager.getLookAndFeel() boolean supportsWindowDecorations = UIManager.getLookAndFeel()
.getSupportsWindowDecorations() || JBRCustomDecorations.isSupported(); .getSupportsWindowDecorations() || FlatNativeWindowBorder.isSupported();
windowDecorationsCheckBoxMenuItem.setEnabled( supportsWindowDecorations && !JBRCustomDecorations.isSupported() ); windowDecorationsCheckBoxMenuItem.setEnabled( supportsWindowDecorations && !JBRCustomDecorations.isSupported() );
menuBarEmbeddedCheckBoxMenuItem.setEnabled( supportsWindowDecorations ); menuBarEmbeddedCheckBoxMenuItem.setEnabled( supportsWindowDecorations );
@@ -744,6 +771,7 @@ class DemoFrame
private JMenu optionsMenu; private JMenu optionsMenu;
private JCheckBoxMenuItem windowDecorationsCheckBoxMenuItem; private JCheckBoxMenuItem windowDecorationsCheckBoxMenuItem;
private JCheckBoxMenuItem menuBarEmbeddedCheckBoxMenuItem; private JCheckBoxMenuItem menuBarEmbeddedCheckBoxMenuItem;
private JCheckBoxMenuItem unifiedTitleBarMenuItem;
private JCheckBoxMenuItem underlineMenuSelectionMenuItem; private JCheckBoxMenuItem underlineMenuSelectionMenuItem;
private JCheckBoxMenuItem alwaysShowMnemonicsMenuItem; private JCheckBoxMenuItem alwaysShowMnemonicsMenuItem;
private JCheckBoxMenuItem animatedLafChangeMenuItem; private JCheckBoxMenuItem animatedLafChangeMenuItem;

View File

@@ -1,4 +1,4 @@
JFDML JFormDesigner: "7.0.2.0.298" Java: "15" encoding: "UTF-8" JFDML JFormDesigner: "7.0.3.1.342" Java: "15" encoding: "UTF-8"
new FormModel { new FormModel {
contentType: "form/swing" contentType: "form/swing"
@@ -360,6 +360,14 @@ new FormModel {
} }
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "menuBarEmbeddedChanged", false ) ) addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "menuBarEmbeddedChanged", false ) )
} ) } )
add( new FormComponent( "javax.swing.JCheckBoxMenuItem" ) {
name: "unifiedTitleBarMenuItem"
"text": "Unified Title Bar"
auxiliary() {
"JavaCodeGenerator.variableLocal": false
}
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "unifiedTitleBar", false ) )
} )
add( new FormComponent( "javax.swing.JCheckBoxMenuItem" ) { add( new FormComponent( "javax.swing.JCheckBoxMenuItem" ) {
name: "underlineMenuSelectionMenuItem" name: "underlineMenuSelectionMenuItem"
"text": "Use underline menu selection" "text": "Use underline menu selection"

View File

@@ -17,8 +17,6 @@
package com.formdev.flatlaf.demo; package com.formdev.flatlaf.demo;
import java.awt.Dimension; import java.awt.Dimension;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import com.formdev.flatlaf.FlatLaf; import com.formdev.flatlaf.FlatLaf;
import com.formdev.flatlaf.extras.FlatInspector; import com.formdev.flatlaf.extras.FlatInspector;
@@ -40,13 +38,12 @@ public class FlatLafDemo
if( SystemInfo.isMacOS && System.getProperty( "apple.laf.useScreenMenuBar" ) == null ) if( SystemInfo.isMacOS && System.getProperty( "apple.laf.useScreenMenuBar" ) == null )
System.setProperty( "apple.laf.useScreenMenuBar", "true" ); 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( () -> { SwingUtilities.invokeLater( () -> {
DemoPrefs.init( PREFS_ROOT_PATH ); DemoPrefs.init( PREFS_ROOT_PATH );
// enable window decorations
JFrame.setDefaultLookAndFeelDecorated( true );
JDialog.setDefaultLookAndFeelDecorated( true );
// application specific UI defaults // application specific UI defaults
FlatLaf.registerCustomDefaultsSource( "com.formdev.flatlaf.demo" ); FlatLaf.registerCustomDefaultsSource( "com.formdev.flatlaf.demo" );
@@ -61,7 +58,7 @@ public class FlatLafDemo
DemoFrame frame = new DemoFrame(); DemoFrame frame = new DemoFrame();
if( FlatLafDemo.screenshotsMode ) if( FlatLafDemo.screenshotsMode )
frame.setPreferredSize( new Dimension( 1280, 620 ) ); frame.setPreferredSize( new Dimension( 1660, 840 ) );
// show frame // show frame
frame.pack(); frame.pack();

View File

@@ -481,6 +481,7 @@ class MoreComponentsPanel
indeterminateCheckBox, indeterminateCheckBox,
toolTipLabel, toolTip1, toolTip2, toolTipLabel, toolTip1, toolTip2,
toolBarLabel, toolBar1, toolBar2, toolBarLabel, toolBar1, toolBar2,
splitPaneLabel, splitPane3,
}; };
for( Component c : components ) for( Component c : components )

View File

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

View File

@@ -25,6 +25,8 @@ import javax.swing.*;
import javax.swing.border.*; import javax.swing.border.*;
import com.formdev.flatlaf.extras.FlatSVGIcon; import com.formdev.flatlaf.extras.FlatSVGIcon;
import com.formdev.flatlaf.icons.FlatTabbedPaneCloseIcon; import com.formdev.flatlaf.icons.FlatTabbedPaneCloseIcon;
import net.miginfocom.layout.AC;
import net.miginfocom.layout.ConstraintParser;
import net.miginfocom.swing.*; import net.miginfocom.swing.*;
/** /**
@@ -1009,6 +1011,29 @@ class TabsPanel
tabsPopupPolicyButtonGroup.add(popupAsNeededButton); tabsPopupPolicyButtonGroup.add(popupAsNeededButton);
tabsPopupPolicyButtonGroup.add(popupNeverButton); tabsPopupPolicyButtonGroup.add(popupNeverButton);
// JFormDesigner - End of component initialization //GEN-END:initComponents // JFormDesigner - End of component initialization //GEN-END:initComponents
if( FlatLafDemo.screenshotsMode ) {
Component[] components = new Component[] {
tabPlacementLabel, tabPlacementToolBar, tabPlacementTabbedPane,
iconBottomTabbedPane, iconTrailingTabbedPane,
alignLeadingTabbedPane, alignTrailingTabbedPane, alignFillTabbedPane,
panel3, separator2, panel4,
};
for( Component c : components )
c.setVisible( false );
// remove gaps
MigLayout layout1 = (MigLayout) panel1.getLayout();
AC rowSpecs1 = ConstraintParser.parseRowConstraints( (String) layout1.getRowConstraints() );
rowSpecs1.gap( "0!", 0, 1 );
layout1.setRowConstraints( rowSpecs1 );
MigLayout layout2 = (MigLayout) panel2.getLayout();
AC rowSpecs2 = ConstraintParser.parseRowConstraints( (String) layout2.getRowConstraints() );
rowSpecs2.gap( "0!", 2, 4, 8 );
layout2.setRowConstraints( rowSpecs2 );
}
} }
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables // JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables

View File

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

View File

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

View File

@@ -108,7 +108,8 @@ public class IJThemesClassGenerator
allInfos.append( THEME_TEMPLATE allInfos.append( THEME_TEMPLATE
.replace( "${subPackage}", subPackage ) .replace( "${subPackage}", subPackage )
.replace( "${themeClass}", themeClass ) .replace( "${themeClass}", themeClass )
.replace( "${themeName}", themeName ) ); .replace( "${themeName}", themeName )
.replace( "${dark}", Boolean.toString( ti.dark ) ) );
markdownTable.append( String.format( "[%s](%s) | `com.formdev.flatlaf.intellijthemes%s.%s`\n", markdownTable.append( String.format( "[%s](%s) | `com.formdev.flatlaf.intellijthemes%s.%s`\n",
themeName, ti.sourceCodeUrl, subPackage, themeClass ) ); themeName, ti.sourceCodeUrl, subPackage, themeClass ) );
@@ -189,11 +190,28 @@ public class IJThemesClassGenerator
" */\n" + " */\n" +
"public class FlatAllIJThemes\n" + "public class FlatAllIJThemes\n" +
"{\n" + "{\n" +
" public static final LookAndFeelInfo[] INFOS = {\n" + " public static final FlatIJLookAndFeelInfo[] INFOS = {\n" +
"${allInfos}\n" + "${allInfos}\n" +
" };\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"; "}\n";
private static final String THEME_TEMPLATE = 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} ),";
} }

View File

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

View File

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

View File

@@ -0,0 +1 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><rect id="frame" width="16" height="16" fill="none"/><path d="M11.6 8.5c1.104 0 1.992-.88 1.992-1.964 0-1.085-.888-1.965-1.992-1.965s-2 .88-2 1.965c0 1.084.896 1.964 2 1.964zm-6-.786c1.328 0 2.392-1.053 2.392-2.357C7.992 4.053 6.928 3 5.6 3 4.272 3 3.2 4.053 3.2 5.357c0 1.304 1.072 2.357 2.4 2.357zm6 2.357c-1.464 0-4.4.723-4.4 2.161V14H16v-1.768c0-1.438-2.936-2.16-4.4-2.16zm-6-.785c-1.864 0-5.6.919-5.6 2.75V14h5.6v-1.768c0-.668.264-1.838 1.896-2.726-.696-.142-1.368-.22-1.896-.22z" fill="#6E6E6E"/></svg>

After

Width:  |  Height:  |  Size: 603 B

View File

@@ -74,7 +74,7 @@
"license": "MIT", "license": "MIT",
"licenseFile": "Dracula.LICENSE.txt", "licenseFile": "Dracula.LICENSE.txt",
"sourceCodeUrl": "https://github.com/dracula/jetbrains", "sourceCodeUrl": "https://github.com/dracula/jetbrains",
"sourceCodePath": "blob/master/src/main/resources/themes/dracula.theme.json" "sourceCodePath": "blob/master/src/main/resources/themes/Dracula.theme.json"
}, },
"Gradianto_dark_fuchsia.theme.json": { "Gradianto_dark_fuchsia.theme.json": {
"name": "Gradianto Dark Fuchsia", "name": "Gradianto Dark Fuchsia",
@@ -410,6 +410,22 @@
"sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite",
"sourceCodePath": "blob/master/src/main/resources/themes/Monokai Pro Contrast.theme.json" "sourceCodePath": "blob/master/src/main/resources/themes/Monokai Pro Contrast.theme.json"
}, },
"material-theme-ui-lite/Moonlight.theme.json": {
"name": "Material Theme UI Lite / Moonlight",
"dark": true,
"license": "MIT",
"licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt",
"sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite",
"sourceCodePath": "blob/master/src/main/resources/themes/Moonlight.theme.json"
},
"material-theme-ui-lite/Moonlight Contrast.theme.json": {
"name": "Material Theme UI Lite / Moonlight Contrast",
"dark": true,
"license": "MIT",
"licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt",
"sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite",
"sourceCodePath": "blob/master/src/main/resources/themes/Moonlight Contrast.theme.json"
},
"material-theme-ui-lite/Night Owl.theme.json": { "material-theme-ui-lite/Night Owl.theme.json": {
"name": "Material Theme UI Lite / Night Owl", "name": "Material Theme UI Lite / Night Owl",
"dark": true, "dark": true,

View File

@@ -7,9 +7,12 @@ This sub-project provides some additional components and classes:
An icon that displays SVG using An icon that displays SVG using
[svgSalamander](https://github.com/JFormDesigner/svgSalamander).\ [svgSalamander](https://github.com/JFormDesigner/svgSalamander).\
![FlatSVGIcon.png](../images/extras-FlatSVGIcon.png) ![FlatSVGIcon.png](../images/extras-FlatSVGIcon.png)
- [TriStateCheckBox](https://www.javadoc.io/doc/com.formdev/flatlaf-extras/latest/com/formdev/flatlaf/extras/TriStateCheckBox.html): - [FlatTriStateCheckBox](https://www.javadoc.io/doc/com.formdev/flatlaf-extras/latest/com/formdev/flatlaf/extras/components/FlatTriStateCheckBox.html):
A tri-state check box.\ A tri-state check box.\
![TriStateCheckBox.png](../images/extras-TriStateCheckBox.png) ![TriStateCheckBox.png](../images/extras-TriStateCheckBox.png)
- Extension classes of standard Swing components that provide easy access to
FlatLaf specific client properties (see package
[com.formdev.flatlaf.extras.components](https://www.javadoc.io/doc/com.formdev/flatlaf-extras/latest/com/formdev/flatlaf/extras/components/package-summary.html)).
- [FlatAnimatedLafChange](https://www.javadoc.io/doc/com.formdev/flatlaf-extras/latest/com/formdev/flatlaf/extras/FlatAnimatedLafChange.html): - [FlatAnimatedLafChange](https://www.javadoc.io/doc/com.formdev/flatlaf-extras/latest/com/formdev/flatlaf/extras/FlatAnimatedLafChange.html):
Animated Laf (theme) changing. Animated Laf (theme) changing.
- [FlatInspector](#ui-inspector): A simple UI inspector that shows information - [FlatInspector](#ui-inspector): A simple UI inspector that shows information
@@ -22,7 +25,7 @@ This sub-project provides some additional components and classes:
Download Download
-------- --------
FlatLaf Extras binaries are available on **JCenter** and **Maven Central**. FlatLaf Extras binaries are available on **Maven Central**.
If you use Maven or Gradle, add a dependency with following coordinates to your If you use Maven or Gradle, add a dependency with following coordinates to your
build script: build script:
@@ -33,13 +36,11 @@ build script:
Otherwise download `flatlaf-extras-<version>.jar` here: Otherwise download `flatlaf-extras-<version>.jar` here:
[![Download](https://api.bintray.com/packages/jformdesigner/flatlaf/flatlaf-extras/images/download.svg)](https://bintray.com/jformdesigner/flatlaf/flatlaf-extras/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-extras/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-extras)
You also need `flatlaf-<version>.jar` and `svgSalamander-<version>.jar`, which If SVG classes are used, `svgSalamander-<version>.jar` is also required:
you can download here:
[![Download](https://api.bintray.com/packages/jformdesigner/flatlaf/flatlaf/images/download.svg)](https://bintray.com/jformdesigner/flatlaf/flatlaf/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/svgSalamander/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/svgSalamander)
[![Download](https://api.bintray.com/packages/jformdesigner/svgSalamander/svgSalamander/images/download.svg)](https://bintray.com/jformdesigner/svgSalamander/svgSalamander/_latestVersion)
Tools Tools

View File

@@ -40,6 +40,7 @@ tasks {
this as StandardJavadocDocletOptions this as StandardJavadocDocletOptions
use( true ) use( true )
tags = listOf( "uiDefault", "clientProperty" ) tags = listOf( "uiDefault", "clientProperty" )
addStringOption( "Xdoclint:all,-missing", "-Xdoclint:all,-missing" )
} }
isFailOnError = false isFailOnError = false
} }

View File

@@ -24,7 +24,6 @@ import java.awt.Dimension;
import java.awt.EventQueue; import java.awt.EventQueue;
import java.awt.Font; import java.awt.Font;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Insets; import java.awt.Insets;
import java.awt.KeyboardFocusManager; import java.awt.KeyboardFocusManager;
import java.awt.LayoutManager; import java.awt.LayoutManager;
@@ -39,6 +38,9 @@ import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionAdapter; import java.awt.event.MouseMotionAdapter;
import java.awt.event.MouseMotionListener; import java.awt.event.MouseMotionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.event.WindowListener;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport; import java.beans.PropertyChangeSupport;
import java.lang.reflect.Field; import java.lang.reflect.Field;
@@ -49,6 +51,8 @@ import javax.swing.JRootPane;
import javax.swing.JToolBar; import javax.swing.JToolBar;
import javax.swing.JToolTip; import javax.swing.JToolTip;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
import javax.swing.Popup;
import javax.swing.PopupFactory;
import javax.swing.RootPaneContainer; import javax.swing.RootPaneContainer;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.border.Border; import javax.swing.border.Border;
@@ -56,7 +60,7 @@ import javax.swing.border.EmptyBorder;
import javax.swing.border.LineBorder; import javax.swing.border.LineBorder;
import javax.swing.plaf.UIResource; import javax.swing.plaf.UIResource;
import javax.swing.text.JTextComponent; import javax.swing.text.JTextComponent;
import com.formdev.flatlaf.ui.FlatToolTipUI; import com.formdev.flatlaf.FlatClientProperties;
import com.formdev.flatlaf.ui.FlatUIUtils; import com.formdev.flatlaf.ui.FlatUIUtils;
import com.formdev.flatlaf.util.UIScale; import com.formdev.flatlaf.util.UIScale;
@@ -84,7 +88,6 @@ import com.formdev.flatlaf.util.UIScale;
public class FlatInspector public class FlatInspector
{ {
private static final Integer HIGHLIGHT_LAYER = 401; private static final Integer HIGHLIGHT_LAYER = 401;
private static final Integer TOOLTIP_LAYER = 402;
private static final int KEY_MODIFIERS_MASK = InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK | InputEvent.ALT_DOWN_MASK | InputEvent.META_DOWN_MASK; private static final int KEY_MODIFIERS_MASK = InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK | InputEvent.ALT_DOWN_MASK | InputEvent.META_DOWN_MASK;
@@ -92,6 +95,8 @@ public class FlatInspector
private final MouseMotionListener mouseMotionListener; private final MouseMotionListener mouseMotionListener;
private final AWTEventListener keyListener; private final AWTEventListener keyListener;
private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport( this ); private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport( this );
private final WindowListener windowListener;
private Window window;
private boolean enabled; private boolean enabled;
private Component lastComponent; private Component lastComponent;
@@ -101,7 +106,7 @@ public class FlatInspector
private boolean wasCtrlOrShiftKeyPressed; private boolean wasCtrlOrShiftKeyPressed;
private JComponent highlightFigure; private JComponent highlightFigure;
private JToolTip tip; private Popup popup;
/** /**
* Installs a key listener into the application that allows enabling and disabling * Installs a key listener into the application that allows enabling and disabling
@@ -191,6 +196,18 @@ public class FlatInspector
} }
} }
}; };
windowListener = new WindowAdapter() {
@Override
public void windowActivated( WindowEvent e ) {
update();
}
@Override
public void windowDeactivated( WindowEvent e ) {
hidePopup();
}
};
} }
private void uninstall() { private void uninstall() {
@@ -223,12 +240,26 @@ public class FlatInspector
rootPane.getGlassPane().setVisible( enabled ); rootPane.getGlassPane().setVisible( enabled );
// add/remove key listener
Toolkit toolkit = Toolkit.getDefaultToolkit(); Toolkit toolkit = Toolkit.getDefaultToolkit();
if( enabled ) if( enabled )
toolkit.addAWTEventListener( keyListener, AWTEvent.KEY_EVENT_MASK ); toolkit.addAWTEventListener( keyListener, AWTEvent.KEY_EVENT_MASK );
else else
toolkit.removeAWTEventListener( keyListener ); toolkit.removeAWTEventListener( keyListener );
// add/remove window listener
if( enabled ) {
window = SwingUtilities.windowForComponent( rootPane );
if( window != null )
window.addWindowListener( windowListener );
} else {
if( window != null ) {
window.removeWindowListener( windowListener );
window = null;
}
}
// show/hide popup
if( enabled ) { if( enabled ) {
Point pt = new Point( MouseInfo.getPointerInfo().getLocation() ); Point pt = new Point( MouseInfo.getPointerInfo().getLocation() );
SwingUtilities.convertPointFromScreen( pt, rootPane ); SwingUtilities.convertPointFromScreen( pt, rootPane );
@@ -244,14 +275,19 @@ public class FlatInspector
highlightFigure.getParent().remove( highlightFigure ); highlightFigure.getParent().remove( highlightFigure );
highlightFigure = null; highlightFigure = null;
if( tip != null ) hidePopup();
tip.getParent().remove( tip );
tip = null;
} }
propertyChangeSupport.firePropertyChange( "enabled", !enabled, enabled ); propertyChangeSupport.firePropertyChange( "enabled", !enabled, enabled );
} }
private void hidePopup() {
if( popup != null ) {
popup.hide();
popup = null;
}
}
public void update() { public void update() {
if( !rootPane.getGlassPane().isVisible() ) if( !rootPane.getGlassPane().isVisible() )
return; return;
@@ -305,7 +341,7 @@ public class FlatInspector
continue; continue;
// ignore highlight figure and tooltip // ignore highlight figure and tooltip
if( c == highlightFigure || c == tip ) if( c == highlightFigure )
continue; continue;
// ignore glass pane // ignore glass pane
@@ -348,8 +384,9 @@ public class FlatInspector
@Override @Override
protected void paintBorder( Graphics g ) { protected void paintBorder( Graphics g ) {
FlatUIUtils.setRenderingHints( (Graphics2D) g ); Object[] oldRenderingHints = FlatUIUtils.setRenderingHints( g );
super.paintBorder( g ); super.paintBorder( g );
FlatUIUtils.resetRenderingHints( g, oldRenderingHints );
} }
}; };
c.setBackground( new Color( 255, 0, 0, 32 ) ); c.setBackground( new Color( 255, 0, 0, 32 ) );
@@ -358,31 +395,24 @@ public class FlatInspector
} }
private void showToolTip( Component c, int x, int y, int parentLevel ) { private void showToolTip( Component c, int x, int y, int parentLevel ) {
if( c == null ) { hidePopup();
if( tip != null )
tip.setVisible( false ); if( c == null || (window != null && !window.isActive()) )
return; return;
}
if( tip == null ) {
tip = new JToolTip() {
@Override
public void updateUI() {
setUI( FlatToolTipUI.createUI( this ) );
}
};
rootPane.getLayeredPane().add( tip, TOOLTIP_LAYER );
} else
tip.setVisible( true );
JToolTip tip = new JToolTip();
tip.setTipText( buildToolTipText( c, parentLevel ) ); tip.setTipText( buildToolTipText( c, parentLevel ) );
tip.putClientProperty( FlatClientProperties.POPUP_FORCE_HEAVY_WEIGHT, true );
Point pt = new Point( x, y );
SwingUtilities.convertPointToScreen( pt, rootPane.getGlassPane() );
int tx = pt.x + UIScale.scale( 8 );
int ty = pt.y + UIScale.scale( 16 );
int tx = x + UIScale.scale( 8 );
int ty = y + UIScale.scale( 16 );
Dimension size = tip.getPreferredSize(); Dimension size = tip.getPreferredSize();
// position the tip in the visible area // position the tip in the visible area
Rectangle visibleRect = rootPane.getVisibleRect(); Rectangle visibleRect = rootPane.getGraphicsConfiguration().getBounds();
if( tx + size.width > visibleRect.x + visibleRect.width ) if( tx + size.width > visibleRect.x + visibleRect.width )
tx -= size.width + UIScale.scale( 16 ); tx -= size.width + UIScale.scale( 16 );
if( ty + size.height > visibleRect.y + visibleRect.height ) if( ty + size.height > visibleRect.y + visibleRect.height )
@@ -392,20 +422,25 @@ public class FlatInspector
if( ty < visibleRect.y ) if( ty < visibleRect.y )
ty = visibleRect.y; ty = visibleRect.y;
tip.setBounds( tx, ty, size.width, size.height ); PopupFactory popupFactory = PopupFactory.getSharedInstance();
tip.repaint(); popup = popupFactory.getPopup( c, tip, tx, ty );
popup.show();
} }
private static String buildToolTipText( Component c, int parentLevel ) { private static String buildToolTipText( Component c, int parentLevel ) {
StringBuilder buf = new StringBuilder( 1500 );
buf.append( "<html><style>" );
buf.append( "td { padding: 0 10 0 0; }" );
buf.append( "</style><table>" );
String name = c.getClass().getName(); String name = c.getClass().getName();
name = name.substring( name.lastIndexOf( '.' ) + 1 ); name = name.substring( name.lastIndexOf( '.' ) + 1 );
Package pkg = c.getClass().getPackage();
String text = appendRow( buf, "Class", name + " (" + (pkg != null ? pkg.getName() : "-") + ")" );
"Class: " + name + " (" + c.getClass().getPackage().getName() + ")\n" + appendRow( buf, "Size", c.getWidth() + ", " + c.getHeight() + "&nbsp;&nbsp; @ " + c.getX() + ", " + c.getY() );
"Size: " + c.getWidth() + ',' + c.getHeight() + " @ " + c.getX() + ',' + c.getY() + '\n';
if( c instanceof Container ) if( c instanceof Container )
text += "Insets: " + toString( ((Container)c).getInsets() ) + '\n'; appendRow( buf, "Insets", toString( ((Container)c).getInsets() ) );
Insets margin = null; Insets margin = null;
if( c instanceof AbstractButton ) if( c instanceof AbstractButton )
@@ -418,28 +453,28 @@ public class FlatInspector
margin = ((JToolBar) c).getMargin(); margin = ((JToolBar) c).getMargin();
if( margin != null ) if( margin != null )
text += "Margin: " + toString( margin ) + '\n'; appendRow( buf, "Margin", toString( margin ) );
Dimension prefSize = c.getPreferredSize(); Dimension prefSize = c.getPreferredSize();
Dimension minSize = c.getMinimumSize(); Dimension minSize = c.getMinimumSize();
Dimension maxSize = c.getMaximumSize(); Dimension maxSize = c.getMaximumSize();
text += "Pref size: " + prefSize.width + ',' + prefSize.height + '\n' + appendRow( buf, "Pref size", prefSize.width + ", " + prefSize.height );
"Min size: " + minSize.width + ',' + minSize.height + '\n' + appendRow( buf, "Min size", minSize.width + ", " + minSize.height );
"Max size: " + maxSize.width + ',' + maxSize.height + '\n'; appendRow( buf, "Max size", maxSize.width + ", " + maxSize.height );
if( c instanceof JComponent ) if( c instanceof JComponent )
text += "Border: " + toString( ((JComponent)c).getBorder() ) + '\n'; appendRow( buf, "Border", toString( ((JComponent)c).getBorder() ) );
text += "Background: " + toString( c.getBackground() ) + '\n' + appendRow( buf, "Background", toString( c.getBackground() ) );
"Foreground: " + toString( c.getForeground() ) + '\n' + appendRow( buf, "Foreground", toString( c.getForeground() ) );
"Font: " + toString( c.getFont() ) + '\n'; appendRow( buf, "Font", toString( c.getFont() ) );
if( c instanceof JComponent ) { if( c instanceof JComponent ) {
try { try {
Field f = JComponent.class.getDeclaredField( "ui" ); Field f = JComponent.class.getDeclaredField( "ui" );
f.setAccessible( true ); f.setAccessible( true );
Object ui = f.get( c ); Object ui = f.get( c );
text += "UI: " + (ui != null ? ui.getClass().getName() : "null") + '\n'; appendRow( buf, "UI", (ui != null ? ui.getClass().getName() : "null") );
} catch( NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException ex ) { } catch( NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException ex ) {
// ignore // ignore
} }
@@ -448,34 +483,46 @@ public class FlatInspector
if( c instanceof Container ) { if( c instanceof Container ) {
LayoutManager layout = ((Container)c).getLayout(); LayoutManager layout = ((Container)c).getLayout();
if( layout != null ) if( layout != null )
text += "Layout: " + layout.getClass().getName() + '\n'; appendRow( buf, "Layout", layout.getClass().getName() );
} }
text += "Enabled: " + c.isEnabled() + '\n'; appendRow( buf, "Enabled", String.valueOf( c.isEnabled() ) );
text += "Opaque: " + c.isOpaque() + (c instanceof JComponent && appendRow( buf, "Opaque", String.valueOf( c.isOpaque() )
FlatUIUtils.hasOpaqueBeenExplicitlySet( (JComponent) c ) ? " EXPLICIT" : "") + '\n'; + (c instanceof JComponent && FlatUIUtils.hasOpaqueBeenExplicitlySet( (JComponent) c ) ? " EXPLICIT" : "") );
if( c instanceof AbstractButton ) if( c instanceof AbstractButton )
text += "ContentAreaFilled: " + ((AbstractButton)c).isContentAreaFilled() + '\n'; appendRow( buf, "ContentAreaFilled", String.valueOf( ((AbstractButton)c).isContentAreaFilled() ) );
text += "Focusable: " + c.isFocusable() + '\n'; appendRow( buf, "Focusable", String.valueOf( c.isFocusable() ) );
text += "Left-to-right: " + c.getComponentOrientation().isLeftToRight() + '\n'; appendRow( buf, "Left-to-right", String.valueOf( c.getComponentOrientation().isLeftToRight() ) );
text += "Parent: " + (c.getParent() != null ? c.getParent().getClass().getName() : "null"); appendRow( buf, "Parent", (c.getParent() != null ? c.getParent().getClass().getName() : "null") );
buf.append( "<tr><td colspan=\"2\">" );
if( parentLevel > 0 )
buf.append( "<br>Parent level: " + parentLevel );
if( parentLevel > 0 ) if( parentLevel > 0 )
text += "\n\nParent level: " + parentLevel; buf.append( "<br>(press Ctrl/Shift to increase/decrease level)" );
if( parentLevel > 0 )
text += "\n(press Ctrl/Shift to increase/decrease level)";
else else
text += "\n\n(press Ctrl key to inspect parent)"; buf.append( "<br>(press Ctrl key to inspect parent)" );
return text; buf.append( "</td></tr>" );
buf.append( "</table></html>" );
return buf.toString();
}
private static void appendRow( StringBuilder buf, String key, String value ) {
buf.append( "<tr><td>" )
.append( key )
.append( ":</td><td>" )
.append( value )
.append( "</td></tr>" );
} }
private static String toString( Insets insets ) { private static String toString( Insets insets ) {
if( insets == null ) if( insets == null )
return "null"; return "null";
return insets.top + "," + insets.left + ',' + insets.bottom + ',' + insets.right return insets.top + ", " + insets.left + ", " + insets.bottom + ", " + insets.right
+ (insets instanceof UIResource ? " UI" : ""); + (insets instanceof UIResource ? " UI" : "");
} }
@@ -483,10 +530,29 @@ public class FlatInspector
if( c == null ) if( c == null )
return "null"; return "null";
String s = Long.toString( c.getRGB() & 0xffffffffl, 16 ); StringBuilder buf = new StringBuilder( 150 );
buf.append( "<tt>" ); // <tt> is similar to <code>, but uses same font size as body
buf.append( (c.getAlpha() != 255)
? String.format( "#%06x%02x", c.getRGB() & 0xffffff, (c.getRGB() >> 24) & 0xff )
: String.format( "#%06x", c.getRGB() & 0xffffff ) );
buf.append( "</tt>" );
if( c instanceof UIResource ) if( c instanceof UIResource )
s += " UI"; buf.append( " UI" );
return s;
// color preview
buf.append( "&nbsp; &nbsp;" )
.append( "<span style=\"background: " )
.append( String.format( "#%06x", c.getRGB() & 0xffffff ) ) // Java CSS does not support alpha; see CSS.hexToColor()
.append( ";\">" )
.append( "&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;" )
.append( "</span>" );
if( c.getAlpha() != 255 )
buf.append( " " ).append( Math.round( c.getAlpha() / 2.55f ) ).append( '%' );
return buf.toString();
} }
private static String toString( Font f ) { private static String toString( Font f ) {

View File

@@ -34,7 +34,7 @@ import com.kitfox.svg.SVGException;
* *
* @author Karl Tauber * @author Karl Tauber
*/ */
public class SVGUtils public class FlatSVGUtils
{ {
/** /**
* Creates from the given SVG a list of icon images with different sizes that * Creates from the given SVG a list of icon images with different sizes that
@@ -131,7 +131,7 @@ public class SVGUtils
*/ */
private static SVGDiagram loadSVG( String svgName ) { private static SVGDiagram loadSVG( String svgName ) {
try { try {
URL url = SVGUtils.class.getResource( svgName ); URL url = FlatSVGUtils.class.getResource( svgName );
return SVGCache.getSVGUniverse().getDiagram( url.toURI() ); return SVGCache.getSVGUniverse().getDiagram( url.toURI() );
} catch( URISyntaxException ex ) { } catch( URISyntaxException ex ) {
throw new RuntimeException( ex ); throw new RuntimeException( ex );

View File

@@ -17,18 +17,23 @@
package com.formdev.flatlaf.extras; package com.formdev.flatlaf.extras;
import java.awt.*; import java.awt.*;
import java.awt.datatransfer.StringSelection;
import java.awt.event.*; import java.awt.event.*;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Locale; import java.util.Locale;
import java.util.Properties;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.prefs.Preferences; import java.util.prefs.Preferences;
import java.util.regex.Pattern;
import javax.swing.*; import javax.swing.*;
import javax.swing.border.Border; import javax.swing.border.Border;
import javax.swing.border.EmptyBorder; import javax.swing.border.EmptyBorder;
@@ -44,6 +49,7 @@ import com.formdev.flatlaf.ui.FlatEmptyBorder;
import com.formdev.flatlaf.ui.FlatLineBorder; import com.formdev.flatlaf.ui.FlatLineBorder;
import com.formdev.flatlaf.ui.FlatMarginBorder; import com.formdev.flatlaf.ui.FlatMarginBorder;
import com.formdev.flatlaf.ui.FlatUIUtils; import com.formdev.flatlaf.ui.FlatUIUtils;
import com.formdev.flatlaf.util.DerivedColor;
import com.formdev.flatlaf.util.GrayFilter; import com.formdev.flatlaf.util.GrayFilter;
import com.formdev.flatlaf.util.HSLColor; import com.formdev.flatlaf.util.HSLColor;
import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.ScaledEmptyBorder;
@@ -66,12 +72,12 @@ public class FlatUIDefaultsInspector
{ {
private static final int KEY_MODIFIERS_MASK = InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK | InputEvent.ALT_DOWN_MASK | InputEvent.META_DOWN_MASK; private static final int KEY_MODIFIERS_MASK = InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK | InputEvent.ALT_DOWN_MASK | InputEvent.META_DOWN_MASK;
private static FlatUIDefaultsInspector inspector; private static JFrame inspectorFrame;
private final String title;
private final PropertyChangeListener lafListener = this::lafChanged; private final PropertyChangeListener lafListener = this::lafChanged;
private final PropertyChangeListener lafDefaultsListener = this::lafDefaultsChanged; private final PropertyChangeListener lafDefaultsListener = this::lafDefaultsChanged;
private boolean refreshPending; private boolean refreshPending;
private Properties derivedColorKeys;
/** /**
* Installs a key listener into the application that allows enabling and disabling * Installs a key listener into the application that allows enabling and disabling
@@ -92,27 +98,31 @@ public class FlatUIDefaultsInspector
} }
public static void show() { public static void show() {
if( inspector != null ) { if( inspectorFrame != null ) {
inspector.ensureOnScreen(); ensureOnScreen( inspectorFrame );
inspector.frame.toFront(); inspectorFrame.toFront();
return; return;
} }
inspector = new FlatUIDefaultsInspector(); inspectorFrame = new FlatUIDefaultsInspector().createFrame();
inspector.frame.setVisible( true ); inspectorFrame.setVisible( true );
} }
public static void hide() { public static void hide() {
if( inspector != null ) if( inspectorFrame != null )
inspector.frame.dispose(); inspectorFrame.dispose();
}
/**
* Creates a UI defaults inspector panel that can be embedded into any window.
*/
public static JComponent createInspectorPanel() {
return new FlatUIDefaultsInspector().panel;
} }
private FlatUIDefaultsInspector() { private FlatUIDefaultsInspector() {
initComponents(); initComponents();
title = frame.getTitle();
updateWindowTitle();
panel.setBorder( new ScaledEmptyBorder( 10, 10, 10, 10 ) ); panel.setBorder( new ScaledEmptyBorder( 10, 10, 10, 10 ) );
filterPanel.setBorder( new ScaledEmptyBorder( 0, 0, 10, 0 ) ); filterPanel.setBorder( new ScaledEmptyBorder( 0, 0, 10, 0 ) );
@@ -143,24 +153,21 @@ public class FlatUIDefaultsInspector
table.getRowSorter().setSortKeys( Collections.singletonList( table.getRowSorter().setSortKeys( Collections.singletonList(
new RowSorter.SortKey( 0, SortOrder.ASCENDING ) ) ); new RowSorter.SortKey( 0, SortOrder.ASCENDING ) ) );
// restore window bounds
Preferences prefs = getPrefs();
int x = prefs.getInt( "x", -1 );
int y = prefs.getInt( "y", -1 );
int width = prefs.getInt( "width", UIScale.scale( 600 ) );
int height = prefs.getInt( "height", UIScale.scale( 800 ) );
frame.setSize( width, height );
if( x != -1 && y != -1 ) {
frame.setLocation( x, y );
ensureOnScreen();
} else
frame.setLocationRelativeTo( null );
// restore column widths // restore column widths
Preferences prefs = getPrefs();
TableColumnModel columnModel = table.getColumnModel(); TableColumnModel columnModel = table.getColumnModel();
columnModel.getColumn( 0 ).setPreferredWidth( prefs.getInt( "column1width", 100 ) ); columnModel.getColumn( 0 ).setPreferredWidth( prefs.getInt( "column1width", 100 ) );
columnModel.getColumn( 1 ).setPreferredWidth( prefs.getInt( "column2width", 100 ) ); columnModel.getColumn( 1 ).setPreferredWidth( prefs.getInt( "column2width", 100 ) );
PropertyChangeListener columnWidthListener = e -> {
if( "width".equals( e.getPropertyName() ) ) {
prefs.putInt( "column1width", columnModel.getColumn( 0 ).getWidth() );
prefs.putInt( "column2width", columnModel.getColumn( 1 ).getWidth() );
}
};
columnModel.getColumn( 0 ).addPropertyChangeListener( columnWidthListener );
columnModel.getColumn( 1 ).addPropertyChangeListener( columnWidthListener );
// restore filter // restore filter
String filter = prefs.get( "filter", "" ); String filter = prefs.get( "filter", "" );
String valueType = prefs.get( "valueType", null ); String valueType = prefs.get( "valueType", null );
@@ -169,20 +176,66 @@ public class FlatUIDefaultsInspector
if( valueType != null ) if( valueType != null )
valueTypeField.setSelectedItem( valueType ); valueTypeField.setSelectedItem( valueType );
panel.addPropertyChangeListener( "ancestor", e -> {
if( e.getNewValue() != null ) {
UIManager.addPropertyChangeListener( lafListener ); UIManager.addPropertyChangeListener( lafListener );
UIManager.getDefaults().addPropertyChangeListener( lafDefaultsListener ); UIManager.getDefaults().addPropertyChangeListener( lafDefaultsListener );
} else {
UIManager.removePropertyChangeListener( lafListener );
UIManager.getDefaults().removePropertyChangeListener( lafDefaultsListener );
}
} );
// register F5 key to refresh // register F5 key to refresh
((JComponent)frame.getContentPane()).registerKeyboardAction( panel.registerKeyboardAction(
e -> refresh(), e -> refresh(),
KeyStroke.getKeyStroke( KeyEvent.VK_F5, 0, false ), KeyStroke.getKeyStroke( KeyEvent.VK_F5, 0, false ),
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT ); JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT );
}
private JFrame createFrame() {
JFrame frame = new JFrame();
frame.setTitle( "UI Defaults Inspector" );
frame.setDefaultCloseOperation( WindowConstants.DISPOSE_ON_CLOSE );
frame.addWindowListener( new WindowAdapter() {
@Override
public void windowClosed( WindowEvent e ) {
inspectorFrame = null;
}
@Override
public void windowClosing( WindowEvent e ) {
saveWindowBounds( frame );
}
@Override
public void windowDeactivated( WindowEvent e ) {
saveWindowBounds( frame );
}
} );
updateWindowTitle( frame );
frame.getContentPane().add( panel, BorderLayout.CENTER );
// restore window bounds
Preferences prefs = getPrefs();
int x = prefs.getInt( "x", -1 );
int y = prefs.getInt( "y", -1 );
int width = prefs.getInt( "width", UIScale.scale( 600 ) );
int height = prefs.getInt( "height", UIScale.scale( 800 ) );
frame.setSize( width, height );
if( x != -1 && y != -1 ) {
frame.setLocation( x, y );
ensureOnScreen( frame );
} else
frame.setLocationRelativeTo( null );
// register ESC key to close frame // register ESC key to close frame
((JComponent)frame.getContentPane()).registerKeyboardAction( ((JComponent)frame.getContentPane()).registerKeyboardAction(
e -> frame.dispose(), e -> frame.dispose(),
KeyStroke.getKeyStroke( KeyEvent.VK_ESCAPE, 0, false ), KeyStroke.getKeyStroke( KeyEvent.VK_ESCAPE, 0, false ),
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT ); JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT );
return frame;
} }
private void delegateKey( int keyCode, String actionKey ) { private void delegateKey( int keyCode, String actionKey ) {
@@ -202,7 +255,7 @@ public class FlatUIDefaultsInspector
} ); } );
} }
private void ensureOnScreen() { private static void ensureOnScreen( JFrame frame ) {
Rectangle frameBounds = frame.getBounds(); Rectangle frameBounds = frame.getBounds();
boolean onScreen = false; boolean onScreen = false;
for( GraphicsDevice screen : GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices() ) { for( GraphicsDevice screen : GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices() ) {
@@ -219,12 +272,12 @@ public class FlatUIDefaultsInspector
frame.setLocationRelativeTo( null ); frame.setLocationRelativeTo( null );
} }
void lafChanged( PropertyChangeEvent e ) { private void lafChanged( PropertyChangeEvent e ) {
if( "lookAndFeel".equals( e.getPropertyName() ) ) if( "lookAndFeel".equals( e.getPropertyName() ) )
refresh(); refresh();
} }
void lafDefaultsChanged( PropertyChangeEvent e ) { private void lafDefaultsChanged( PropertyChangeEvent e ) {
if( refreshPending ) if( refreshPending )
return; return;
@@ -235,11 +288,13 @@ public class FlatUIDefaultsInspector
} ); } );
} }
void refresh() { private void refresh() {
ItemsTableModel model = (ItemsTableModel) table.getModel(); ItemsTableModel model = (ItemsTableModel) table.getModel();
model.setItems( getUIDefaultsItems() ); model.setItems( getUIDefaultsItems() );
updateWindowTitle(); JFrame frame = (JFrame) SwingUtilities.getAncestorOfClass( JFrame.class, panel );
if( frame != null )
updateWindowTitle( frame );
} }
private Item[] getUIDefaultsItems() { private Item[] getUIDefaultsItems() {
@@ -249,6 +304,7 @@ public class FlatUIDefaultsInspector
Set<Entry<Object, Object>> defaultsSet = defaults.entrySet(); Set<Entry<Object, Object>> defaultsSet = defaults.entrySet();
ArrayList<Item> items = new ArrayList<>( defaultsSet.size() ); ArrayList<Item> items = new ArrayList<>( defaultsSet.size() );
HashSet<Object> keys = new HashSet<>( defaultsSet.size() ); HashSet<Object> keys = new HashSet<>( defaultsSet.size() );
Color[] pBaseColor = new Color[1];
for( Entry<Object,Object> e : defaultsSet ) { for( Entry<Object,Object> e : defaultsSet ) {
Object key = e.getKey(); Object key = e.getKey();
@@ -265,67 +321,150 @@ public class FlatUIDefaultsInspector
if( !keys.add( key ) ) if( !keys.add( key ) )
continue; continue;
// resolve derived color
Object info = null;
if( value instanceof DerivedColor ) {
Color resolvedColor = resolveDerivedColor( defaults, (String) key, (DerivedColor) value, pBaseColor );
if( resolvedColor != value )
info = new Color[] { resolvedColor, pBaseColor[0] };
}
// check whether key was overridden using UIManager.put(key,value) // check whether key was overridden using UIManager.put(key,value)
Object lafValue = null; Object lafValue = null;
if( defaults.containsKey( key ) ) if( defaults.containsKey( key ) )
lafValue = lafDefaults.get( key ); lafValue = lafDefaults.get( key );
// add item // add item
items.add( new Item( String.valueOf( key ), value, lafValue ) ); items.add( new Item( String.valueOf( key ), value, lafValue, info ) );
} }
return items.toArray( new Item[items.size()] ); return items.toArray( new Item[items.size()] );
} }
private void updateWindowTitle() { private Color resolveDerivedColor( UIDefaults defaults, String key, Color color, Color[] pBaseColor ) {
frame.setTitle( title + " - " + UIManager.getLookAndFeel().getName() ); if( pBaseColor != null )
pBaseColor[0] = null;
if( !(color instanceof DerivedColor) )
return color;
if( derivedColorKeys == null )
derivedColorKeys = loadDerivedColorKeys();
Object baseKey = derivedColorKeys.get( key );
if( baseKey == null )
return color;
// this is for keys that may be defined as derived colors, but do not derive them at runtime
if( "null".equals( baseKey ) )
return color;
Color baseColor = defaults.getColor( baseKey );
if( baseColor == null )
return color;
if( baseColor instanceof DerivedColor )
baseColor = resolveDerivedColor( defaults, (String) baseKey, baseColor, null );
if( pBaseColor != null )
pBaseColor[0] = baseColor;
Color newColor = FlatUIUtils.deriveColor( color, baseColor );
// creating a new color instance to drop Color.frgbvalue from newColor
// and avoid rounding issues/differences
return new Color( newColor.getRGB(), true );
} }
private void saveWindowBounds() { private Properties loadDerivedColorKeys() {
Properties properties = new Properties();
try( InputStream in = getClass().getResourceAsStream( "/com/formdev/flatlaf/extras/resources/DerivedColorKeys.properties" ) ) {
properties.load( in );
} catch( IOException ex ) {
ex.printStackTrace();
}
return properties;
}
private static void updateWindowTitle( JFrame frame ) {
String title = frame.getTitle();
String sep = " - ";
int sepIndex = title.indexOf( sep );
if( sepIndex >= 0 )
title = title.substring( 0, sepIndex );
frame.setTitle( title + sep + UIManager.getLookAndFeel().getName() );
}
private void saveWindowBounds( JFrame frame ) {
Preferences prefs = getPrefs(); Preferences prefs = getPrefs();
prefs.putInt( "x", frame.getX() ); prefs.putInt( "x", frame.getX() );
prefs.putInt( "y", frame.getY() ); prefs.putInt( "y", frame.getY() );
prefs.putInt( "width", frame.getWidth() ); prefs.putInt( "width", frame.getWidth() );
prefs.putInt( "height", frame.getHeight() ); prefs.putInt( "height", frame.getHeight() );
TableColumnModel columnModel = table.getColumnModel();
prefs.putInt( "column1width", columnModel.getColumn( 0 ).getWidth() );
prefs.putInt( "column2width", columnModel.getColumn( 1 ).getWidth() );
} }
private Preferences getPrefs() { private Preferences getPrefs() {
return Preferences.userRoot().node( "flatlaf-uidefaults-inspector" ); return Preferences.userRoot().node( "flatlaf-uidefaults-inspector" );
} }
private void windowClosed() {
UIManager.removePropertyChangeListener( lafListener );
UIManager.getDefaults().removePropertyChangeListener( lafDefaultsListener );
inspector = null;
}
private void filterChanged() { private void filterChanged() {
String filter = filterField.getText().trim(); String filter = filterField.getText().trim();
String valueType = (String) valueTypeField.getSelectedItem(); String valueType = (String) valueTypeField.getSelectedItem();
// split filter string on space characters // split filter string on space characters
String[] filters = filter.split( " +" ); String[] filters = !filter.isEmpty() ? filter.split( " +" ) : null;
for( int i = 0; i < filters.length; i++ ) Pattern[] patterns = (filters != null) ? new Pattern[filters.length] : null;
if( filters != null ) {
for( int i = 0; i < filters.length; i++ ) {
filters[i] = filters[i].toLowerCase( Locale.ENGLISH ); filters[i] = filters[i].toLowerCase( Locale.ENGLISH );
// simple wildcard matching
// - '*' matches any number of characters
// - '?' matches a single character
// - '^' beginning of line
// - '$' end of line
String f = filters[i];
boolean matchBeginning = f.startsWith( "^" );
boolean matchEnd = f.endsWith( "$" );
if( f.indexOf( '*' ) >= 0 || f.indexOf( '?' ) >= 0 || matchBeginning || matchEnd ) {
if( matchBeginning )
f = f.substring( 1 );
if( matchEnd )
f = f.substring( 0, f.length() - 1 );
String regex = ("\\Q" + f + "\\E").replace( "*", "\\E.*\\Q" ).replace( "?", "\\E.\\Q" );
if( !matchBeginning )
regex = ".*" + regex;
if( !matchEnd )
regex = regex + ".*";
patterns[i] = Pattern.compile( regex );
}
}
}
ItemsTableModel model = (ItemsTableModel) table.getModel(); ItemsTableModel model = (ItemsTableModel) table.getModel();
model.setFilter( item -> { model.setFilter( item -> {
if( valueType != null && if( valueType != null &&
!valueType.equals( "(any)" ) && !valueType.equals( "(any)" ) &&
!valueType.equals( typeOfValue( item.value ) ) ) !typeOfValue( item.value ).startsWith( valueType ) )
return false; return false;
if( filters == null )
return true;
String lkey = item.key.toLowerCase( Locale.ENGLISH ); String lkey = item.key.toLowerCase( Locale.ENGLISH );
String lvalue = item.getValueAsString().toLowerCase( Locale.ENGLISH ); String lvalue = item.getValueAsString().toLowerCase( Locale.ENGLISH );
for( String f : filters ) { for( int i = 0; i < filters.length; i++ ) {
Pattern p = patterns[i];
if( p != null ) {
if( p.matcher( lkey ).matches() || p.matcher( lvalue ).matches() )
return true;
} else {
String f = filters[i];
if( lkey.contains( f ) || lvalue.contains( f ) ) if( lkey.contains( f ) || lvalue.contains( f ) )
return true; return true;
} }
}
return false; return false;
} ); } );
@@ -339,8 +478,13 @@ public class FlatUIDefaultsInspector
return "Boolean"; return "Boolean";
if( value instanceof Border ) if( value instanceof Border )
return "Border"; return "Border";
if( value instanceof Color ) if( value instanceof Color ) {
if( ((Color)value).getAlpha() != 255 )
return "Color (\u03b1)";
if( value instanceof DerivedColor )
return "Color (\u0192)";
return "Color"; return "Color";
}
if( value instanceof Dimension ) if( value instanceof Dimension )
return "Dimension"; return "Dimension";
if( value instanceof Float ) if( value instanceof Float )
@@ -358,9 +502,51 @@ public class FlatUIDefaultsInspector
return "(other)"; return "(other)";
} }
private void tableMousePressed( MouseEvent e ) {
if( !SwingUtilities.isRightMouseButton( e ) )
return;
int row = table.rowAtPoint( e.getPoint() );
if( row >= 0 && !table.isRowSelected( row ) )
table.setRowSelectionInterval( row, row );
}
private void copyKey() {
copyToClipboard( 0 );
}
private void copyValue() {
copyToClipboard( 1 );
}
private void copyKeyAndValue() {
copyToClipboard( -1 );
}
private void copyToClipboard( int column ) {
int[] rows = table.getSelectedRows();
if( rows.length == 0 )
return;
StringBuilder buf = new StringBuilder();
for( int i = 0; i < rows.length; i++ ) {
if( i > 0 )
buf.append( '\n' );
if( column < 0 || column == 0 )
buf.append( table.getValueAt( rows[i], 0 ) );
if( column < 0 )
buf.append( " = " );
if( column < 0 || column == 1 )
buf.append( table.getValueAt( rows[i], 1 ) );
}
Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
new StringSelection( buf.toString() ), null );
}
private void initComponents() { private void initComponents() {
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents // JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents
frame = new JFrame();
panel = new JPanel(); panel = new JPanel();
filterPanel = new JPanel(); filterPanel = new JPanel();
flterLabel = new JLabel(); flterLabel = new JLabel();
@@ -369,27 +555,10 @@ public class FlatUIDefaultsInspector
valueTypeField = new JComboBox<>(); valueTypeField = new JComboBox<>();
scrollPane = new JScrollPane(); scrollPane = new JScrollPane();
table = new JTable(); table = new JTable();
tablePopupMenu = new JPopupMenu();
//======== frame ======== copyKeyMenuItem = new JMenuItem();
{ copyValueMenuItem = new JMenuItem();
frame.setTitle("UI Defaults Inspector"); copyKeyAndValueMenuItem = new JMenuItem();
frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
frame.addWindowListener(new WindowAdapter() {
@Override
public void windowClosed(WindowEvent e) {
FlatUIDefaultsInspector.this.windowClosed();
}
@Override
public void windowClosing(WindowEvent e) {
saveWindowBounds();
}
@Override
public void windowDeactivated(WindowEvent e) {
saveWindowBounds();
}
});
Container frameContentPane = frame.getContentPane();
frameContentPane.setLayout(new BorderLayout());
//======== panel ======== //======== panel ========
{ {
@@ -431,6 +600,8 @@ public class FlatUIDefaultsInspector
"Boolean", "Boolean",
"Border", "Border",
"Color", "Color",
"Color (\u03b1)",
"Color (\u0192)",
"Dimension", "Dimension",
"Float", "Float",
"Font", "Font",
@@ -452,17 +623,40 @@ public class FlatUIDefaultsInspector
//---- table ---- //---- table ----
table.setAutoCreateRowSorter(true); table.setAutoCreateRowSorter(true);
table.setComponentPopupMenu(tablePopupMenu);
table.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
tableMousePressed(e);
}
});
scrollPane.setViewportView(table); scrollPane.setViewportView(table);
} }
panel.add(scrollPane, BorderLayout.CENTER); panel.add(scrollPane, BorderLayout.CENTER);
} }
frameContentPane.add(panel, BorderLayout.CENTER);
//======== tablePopupMenu ========
{
//---- copyKeyMenuItem ----
copyKeyMenuItem.setText("Copy Key");
copyKeyMenuItem.addActionListener(e -> copyKey());
tablePopupMenu.add(copyKeyMenuItem);
//---- copyValueMenuItem ----
copyValueMenuItem.setText("Copy Value");
copyValueMenuItem.addActionListener(e -> copyValue());
tablePopupMenu.add(copyValueMenuItem);
//---- copyKeyAndValueMenuItem ----
copyKeyAndValueMenuItem.setText("Copy Key and Value");
copyKeyAndValueMenuItem.addActionListener(e -> copyKeyAndValue());
tablePopupMenu.add(copyKeyAndValueMenuItem);
} }
// JFormDesigner - End of component initialization //GEN-END:initComponents // JFormDesigner - End of component initialization //GEN-END:initComponents
} }
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables // JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables
private JFrame frame;
private JPanel panel; private JPanel panel;
private JPanel filterPanel; private JPanel filterPanel;
private JLabel flterLabel; private JLabel flterLabel;
@@ -471,6 +665,10 @@ public class FlatUIDefaultsInspector
private JComboBox<String> valueTypeField; private JComboBox<String> valueTypeField;
private JScrollPane scrollPane; private JScrollPane scrollPane;
private JTable table; private JTable table;
private JPopupMenu tablePopupMenu;
private JMenuItem copyKeyMenuItem;
private JMenuItem copyValueMenuItem;
private JMenuItem copyKeyAndValueMenuItem;
// JFormDesigner - End of variables declaration //GEN-END:variables // JFormDesigner - End of variables declaration //GEN-END:variables
//---- class Item --------------------------------------------------------- //---- class Item ---------------------------------------------------------
@@ -479,35 +677,35 @@ public class FlatUIDefaultsInspector
final String key; final String key;
final Object value; final Object value;
final Object lafValue; final Object lafValue;
final Object info;
private String valueStr; private String valueStr;
Item( String key, Object value, Object lafValue ) { Item( String key, Object value, Object lafValue, Object info ) {
this.key = key; this.key = key;
this.value = value; this.value = value;
this.lafValue = lafValue; this.lafValue = lafValue;
this.info = info;
} }
String getValueAsString() { String getValueAsString() {
if( valueStr == null ) if( valueStr == null )
valueStr = valueAsString( value ); valueStr = valueAsString( value, info );
return valueStr; return valueStr;
} }
static String valueAsString( Object value ) { static String valueAsString( Object value, Object info ) {
if( value instanceof Color ) { if( value instanceof Color ) {
Color color = (Color) value; Color color = (info instanceof Color[]) ? ((Color[])info)[0] : (Color) value;
HSLColor hslColor = new HSLColor( color ); HSLColor hslColor = new HSLColor( color );
if( color.getAlpha() == 255 ) { if( color.getAlpha() == 255 ) {
return String.format( "%s rgb(%d, %d, %d) hsl(%d, %d, %d)", return String.format( "%-9s HSL %3d %3d %3d",
color2hex( color ), color2hex( color ),
color.getRed(), color.getGreen(), color.getBlue(),
(int) hslColor.getHue(), (int) hslColor.getSaturation(), (int) hslColor.getHue(), (int) hslColor.getSaturation(),
(int) hslColor.getLuminance() ); (int) hslColor.getLuminance() );
} else { } else {
return String.format( "%s rgba(%d, %d, %d, %d) hsla(%d, %d, %d, %d)", return String.format( "%-9s HSL %3d %3d %3d %2d",
color2hex( color ), color2hex( color ),
color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha(),
(int) hslColor.getHue(), (int) hslColor.getSaturation(), (int) hslColor.getHue(), (int) hslColor.getSaturation(),
(int) hslColor.getLuminance(), (int) (hslColor.getAlpha() * 100) ); (int) hslColor.getLuminance(), (int) (hslColor.getAlpha() * 100) );
} }
@@ -532,15 +730,15 @@ public class FlatUIDefaultsInspector
Border border = (Border) value; Border border = (Border) value;
if( border instanceof FlatLineBorder ) { if( border instanceof FlatLineBorder ) {
FlatLineBorder lineBorder = (FlatLineBorder) border; FlatLineBorder lineBorder = (FlatLineBorder) border;
return valueAsString( lineBorder.getUnscaledBorderInsets() ) return valueAsString( lineBorder.getUnscaledBorderInsets(), null )
+ " " + Item.color2hex( lineBorder.getLineColor() ) + " " + color2hex( lineBorder.getLineColor() )
+ " " + lineBorder.getLineThickness() + " " + lineBorder.getLineThickness()
+ " " + border.getClass().getName(); + " " + border.getClass().getName();
} else if( border instanceof EmptyBorder ) { } else if( border instanceof EmptyBorder ) {
Insets insets = (border instanceof FlatEmptyBorder) Insets insets = (border instanceof FlatEmptyBorder)
? ((FlatEmptyBorder)border).getUnscaledBorderInsets() ? ((FlatEmptyBorder)border).getUnscaledBorderInsets()
: ((EmptyBorder)border).getBorderInsets(); : ((EmptyBorder)border).getBorderInsets();
return valueAsString( insets ) + " " + border.getClass().getName(); return valueAsString( insets, null ) + " " + border.getClass().getName();
} else if( border instanceof FlatBorder || border instanceof FlatMarginBorder ) } else if( border instanceof FlatBorder || border instanceof FlatMarginBorder )
return border.getClass().getName(); return border.getClass().getName();
else else
@@ -816,8 +1014,8 @@ public class FlatUIDefaultsInspector
super.getTableCellRendererComponent( table, value, isSelected, hasFocus, row, column ); super.getTableCellRendererComponent( table, value, isSelected, hasFocus, row, column );
if( item.value instanceof Color ) { if( item.value instanceof Color ) {
Color color = (Color) item.value; Color color = (item.info instanceof Color[]) ? ((Color[])item.info)[0] : (Color) item.value;
boolean isDark = new HSLColor( color ).getLuminance() < 70; boolean isDark = new HSLColor( color ).getLuminance() < 70 && color.getAlpha() >= 128;
setBackground( color ); setBackground( color );
setForeground( isDark ? Color.white : Color.black ); setForeground( isDark ? Color.white : Color.black );
} else if( item.value instanceof Icon ) { } else if( item.value instanceof Icon ) {
@@ -826,10 +1024,12 @@ public class FlatUIDefaultsInspector
} }
// set tooltip // set tooltip
String toolTipText = String.valueOf( item.value ); String toolTipText = (item.value instanceof Object[])
? Arrays.toString( (Object[]) item.value ).replace( ", ", ",\n" )
: String.valueOf( item.value );
if( item.lafValue != null ) { if( item.lafValue != null ) {
toolTipText += " \n\nLaF UI default value was overridden with UIManager.put(key,value):\n " toolTipText += " \n\nLaF UI default value was overridden with UIManager.put(key,value):\n "
+ Item.valueAsString( item.lafValue ) + "\n " + String.valueOf( item.lafValue ); + Item.valueAsString( item.lafValue, null ) + "\n " + String.valueOf( item.lafValue );
} }
setToolTipText( toolTipText ); setToolTipText( toolTipText );
@@ -839,9 +1039,30 @@ public class FlatUIDefaultsInspector
@Override @Override
protected void paintComponent( Graphics g ) { protected void paintComponent( Graphics g ) {
if( item.value instanceof Color ) { if( item.value instanceof Color ) {
// fill background int width = getWidth();
g.setColor( getBackground() ); int height = getHeight();
g.fillRect( 0, 0, getWidth(), getHeight() ); Color background = getBackground();
// paint color
fillRect( g, background, 0, 0, width, height );
if( item.info instanceof Color[] ) {
// paint base color
int width2 = height * 2;
fillRect( g, ((Color[])item.info)[1], width - width2, 0, width2, height );
// paint default color
Color defaultColor = (Color) item.value;
if( defaultColor != null && !defaultColor.equals( background ) ) {
int width3 = height / 2;
fillRect( g, defaultColor, width - width3, 0, width3, height );
}
// paint "derived color" indicator
int width4 = height / 4;
g.setColor( Color.magenta );
g.fillRect( width - width4, 0, width4, height );
}
// layout text // layout text
FontMetrics fm = getFontMetrics( getFont() ); FontMetrics fm = getFontMetrics( getFont() );
@@ -853,18 +1074,14 @@ public class FlatUIDefaultsInspector
g.setColor( getForeground() ); g.setColor( getForeground() );
// paint rgb() and hsl() horizontally aligned // paint hsl horizontally aligned
int rgbIndex = text.indexOf( "rgb" ); int hslIndex = text.indexOf( "HSL" );
int hslIndex = text.indexOf( "hsl" ); if( hslIndex > 0 ) {
if( rgbIndex > 0 && hslIndex > rgbIndex ) { String hexText = text.substring( 0, hslIndex );
String hexText = text.substring( 0, rgbIndex );
String rgbText = text.substring( rgbIndex, hslIndex );
String hslText = text.substring( hslIndex ); String hslText = text.substring( hslIndex );
int hexWidth = Math.max( fm.stringWidth( hexText ), fm.stringWidth( "#DDDDDD " ) ); int hexWidth = Math.max( fm.stringWidth( hexText ), fm.stringWidth( "#12345678 " ) );
int rgbWidth = Math.max( fm.stringWidth( rgbText ), fm.stringWidth( "rgb(444, 444, 444) " ) );
FlatUIUtils.drawString( this, g, hexText, x, y ); FlatUIUtils.drawString( this, g, hexText, x, y );
FlatUIUtils.drawString( this, g, rgbText, x + hexWidth, y ); FlatUIUtils.drawString( this, g, hslText, x + hexWidth, y );
FlatUIUtils.drawString( this, g, hslText, x + hexWidth + rgbWidth, y );
} else } else
FlatUIUtils.drawString( this, g, text, x, y ); FlatUIUtils.drawString( this, g, text, x, y );
} else } else
@@ -872,6 +1089,17 @@ public class FlatUIDefaultsInspector
paintSeparator( g ); paintSeparator( g );
} }
private void fillRect( Graphics g, Color color, int x, int y, int width, int height ) {
// fill white if color is translucent
if( color.getAlpha() != 255 ) {
g.setColor( Color.white );
g.fillRect( x, y, width, height );
}
g.setColor( color );
g.fillRect( x, y, width, height );
}
} }
//---- class SafeIcon ----------------------------------------------------- //---- class SafeIcon -----------------------------------------------------

View File

@@ -1,17 +1,8 @@
JFDML JFormDesigner: "7.0.2.0.298" Java: "14" encoding: "UTF-8" JFDML JFormDesigner: "7.0.3.1.342" Java: "15" encoding: "UTF-8"
new FormModel { new FormModel {
contentType: "form/swing" contentType: "form/swing"
root: new FormRoot { root: new FormRoot {
add( new FormWindow( "javax.swing.JFrame", new FormLayoutManager( class java.awt.BorderLayout ) ) {
name: "frame"
"title": "UI Defaults Inspector"
"defaultCloseOperation": 2
"$sizePolicy": 2
"$locationPolicy": 2
addEvent( new FormEvent( "java.awt.event.WindowListener", "windowClosed", "windowClosed", false ) )
addEvent( new FormEvent( "java.awt.event.WindowListener", "windowClosing", "saveWindowBounds", false ) )
addEvent( new FormEvent( "java.awt.event.WindowListener", "windowDeactivated", "saveWindowBounds", false ) )
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
name: "panel" name: "panel"
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.GridBagLayout ) { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.GridBagLayout ) {
@@ -51,6 +42,8 @@ new FormModel {
addElement( "Boolean" ) addElement( "Boolean" )
addElement( "Border" ) addElement( "Border" )
addElement( "Color" ) addElement( "Color" )
addElement( "Color (α)" )
addElement( "Color (ƒ)" )
addElement( "Dimension" ) addElement( "Dimension" )
addElement( "Float" ) addElement( "Float" )
addElement( "Font" ) addElement( "Font" )
@@ -75,9 +68,8 @@ new FormModel {
add( new FormComponent( "javax.swing.JTable" ) { add( new FormComponent( "javax.swing.JTable" ) {
name: "table" name: "table"
"autoCreateRowSorter": true "autoCreateRowSorter": true
} ) "componentPopupMenu": new FormReference( "tablePopupMenu" )
}, new FormLayoutConstraints( class java.lang.String ) { addEvent( new FormEvent( "java.awt.event.MouseListener", "mousePressed", "tableMousePressed", true ) )
"value": "Center"
} ) } )
}, new FormLayoutConstraints( class java.lang.String ) { }, new FormLayoutConstraints( class java.lang.String ) {
"value": "Center" "value": "Center"
@@ -86,5 +78,25 @@ new FormModel {
"location": new java.awt.Point( 0, 0 ) "location": new java.awt.Point( 0, 0 )
"size": new java.awt.Dimension( 400, 300 ) "size": new java.awt.Dimension( 400, 300 )
} ) } )
add( new FormContainer( "javax.swing.JPopupMenu", new FormLayoutManager( class javax.swing.JPopupMenu ) ) {
name: "tablePopupMenu"
add( new FormComponent( "javax.swing.JMenuItem" ) {
name: "copyKeyMenuItem"
"text": "Copy Key"
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "copyKey", false ) )
} )
add( new FormComponent( "javax.swing.JMenuItem" ) {
name: "copyValueMenuItem"
"text": "Copy Value"
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "copyValue", false ) )
} )
add( new FormComponent( "javax.swing.JMenuItem" ) {
name: "copyKeyAndValueMenuItem"
"text": "Copy Key and Value"
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "copyKeyAndValue", false ) )
} )
}, new FormLayoutConstraints( null ) {
"location": new java.awt.Point( 0, 370 )
} )
} }
} }

View File

@@ -1,141 +0,0 @@
/*
* Copyright 2019 FormDev Software GmbH
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.formdev.flatlaf.extras;
import java.awt.Color;
import java.awt.Graphics;
import java.awt.event.ItemEvent;
import javax.swing.JCheckBox;
import javax.swing.LookAndFeel;
import javax.swing.UIManager;
import com.formdev.flatlaf.FlatLaf;
/**
* A tri-state check box.
* <p>
* To display the third state, this component requires an LaF that supports painting
* the indeterminate state if client property {@code "JButton.selectedState"} has the
* value {@code "indeterminate"}.
* <p>
* FlatLaf and Mac Aqua LaF support the third state.
* For other LaFs a magenta rectangle is painted around the component for the third state.
*
* @author Karl Tauber
*/
public class TriStateCheckBox
extends JCheckBox
{
public enum State { INDETERMINATE, SELECTED, UNSELECTED }
private State state;
private boolean thirdStateEnabled = true;
public TriStateCheckBox() {
this( null );
}
public TriStateCheckBox( String text ) {
this( text, State.INDETERMINATE );
}
public TriStateCheckBox( String text, State initialState ) {
super( text );
setModel( new ToggleButtonModel() {
@Override
public boolean isSelected() {
return state != State.UNSELECTED;
}
@Override
public void setSelected( boolean b ) {
switch( state ) {
case INDETERMINATE: setState( State.SELECTED ); break;
case SELECTED: setState( State.UNSELECTED ); break;
case UNSELECTED: setState( thirdStateEnabled ? State.INDETERMINATE : State.SELECTED ); break;
}
fireStateChanged();
fireItemStateChanged( new ItemEvent( this, ItemEvent.ITEM_STATE_CHANGED, this,
isSelected() ? ItemEvent.SELECTED : ItemEvent.DESELECTED ) );
}
} );
setState( initialState );
}
public State getState() {
return state;
}
public void setState( State state ) {
if( this.state == state )
return;
State oldState = this.state;
this.state = state;
putClientProperty( "JButton.selectedState", state == State.INDETERMINATE ? "indeterminate" : null );
firePropertyChange( "state", oldState, state );
repaint();
}
public Boolean getValue() {
switch( state ) {
default:
case INDETERMINATE: return null;
case SELECTED: return true;
case UNSELECTED: return false;
}
}
public void setValue( Boolean value ) {
setState( value == null ? State.INDETERMINATE : (value ? State.SELECTED : State.UNSELECTED) );
}
public boolean isThirdStateEnabled() {
return thirdStateEnabled;
}
public void setThirdStateEnabled( boolean thirdStateEnabled ) {
this.thirdStateEnabled = thirdStateEnabled;
if( state == State.INDETERMINATE )
setState( State.UNSELECTED );
}
@Override
public void setSelected( boolean b ) {
setState( b ? State.SELECTED : State.UNSELECTED );
}
@Override
protected void paintComponent( Graphics g ) {
super.paintComponent( g );
if( state == State.INDETERMINATE && !isThirdStateSupported() ) {
g.setColor( Color.magenta );
g.drawRect( 0, 0, getWidth() - 1, getHeight() - 1 );
}
}
private boolean isThirdStateSupported() {
LookAndFeel laf = UIManager.getLookAndFeel();
return laf instanceof FlatLaf || laf.getClass().getName().equals( "com.apple.laf.AquaLookAndFeel" );
}
}

Some files were not shown because too many files have changed in this diff Show More