diff --git a/app/src/processing/app/laf/FlatLaf.properties b/app/src/processing/app/laf/FlatLaf.properties index 21313b4fd..01a3fcbbd 100644 --- a/app/src/processing/app/laf/FlatLaf.properties +++ b/app/src/processing/app/laf/FlatLaf.properties @@ -1,18 +1,26 @@ +# TODO sort out how to import this via the language properties +# (probably needs to be set programmatically instead) defaultFont = 14 "Processing Sans Pro", "Open Sans", "Noto Sans", Roboto, Arial -ScrollBar.width = 24 -[mac]@background = #1e1e1e -[mac]@foreground = #e0e0e0 -[mac]@accentColor = #107aff -[mac]@accentFocusColor = #176896 +# The default is 8, which creates tiny nubby scroll bars +ScrollBar.width = 16 -[mac]Component.arrowType = chevron -[mac]CheckBox.icon.style = filled -[mac]CheckBox.icon[filled].selectedBorderColor = @accentColor -[mac]CheckBox.icon[filled].selectedBackground = @accentColor -[mac]CheckBox.icon[filled].checkmarkColor = @foreground +# Better matched for macOS dark mode (but using everywhere) +# https://github.com/JFormDesigner/FlatLaf/issues/497 -[mac]RadioButton.icon.style = filled -[mac]RadioButton.icon[filled].centerDiameter = 6 \ No newline at end of file +[dark]@background = #1e1e1e +[dark]@foreground = #e0e0e0 +[dark]@accentColor = #107aff +[dark]@accentFocusColor = #176896 + +[dark]Component.arrowType = chevron + +[dark]CheckBox.icon.style = filled +[dark]CheckBox.icon[filled].selectedBorderColor = @accentColor +[dark]CheckBox.icon[filled].selectedBackground = @accentColor +[dark]CheckBox.icon[filled].checkmarkColor = @foreground + +[dark]RadioButton.icon.style = filled +[dark]RadioButton.icon[filled].centerDiameter = 6 \ No newline at end of file diff --git a/todo.txt b/todo.txt index 5324c9809..3bb4f1203 100755 --- a/todo.txt +++ b/todo.txt @@ -24,12 +24,15 @@ X add manager.panel constants for colors X status panel not updating in updateTheme() X StatusPanel.getBodyStyle() has hard-coded fonts/sizes X accent color and light/dark mode into the theme, and use with flatlaf +_ rearrange item order in PreferencesFrame +_ remove extra space between prefs lines _ monochrome icon for foundation _ icons for contrib manager list entries (green/orange PNGs won't do) _ remove ability to rearrange columns in contrib manager _ update lib/theme.txt to clean up current Frankenstein status +_ -_ how to override flatlaf for components (search, buttons, dropdown menu) in manager +_ override flatlaf for components (search, buttons, dropdown menu) in manager _ Color Selector buttons misaligned