angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-11 06:27:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

IntelliJ Themes: fixed ComboBox backgrounds in all "Material UI Lite" themes and in some other themes

Browse Source
This commit is contained in:
Karl Tauber
2023-08-04 11:18:28 +02:00
parent 2b640e2129
commit f03725ae36
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@@ -34,16 +34,17 @@ FlatLaf Change Log
- "Monocai" theme: Fixed unreadable text color of default buttons. (issue - "Monocai" theme: Fixed unreadable text color of default buttons. (issue
#693) #693)
- "Vuesion" theme: Fixed foreground colors of disabled text. - "Vuesion" theme: Fixed foreground colors of disabled text.
- "Material UI Lite" themes: Fixed non-editable ComboBox button background.
- CheckBox and RadioButton: Fixed unselected icon colors for themes "Atom One - CheckBox and RadioButton: Fixed unselected icon colors for themes "Atom One
Light", "Cyan Light", "GitHub", "Light Owl", "Material Lighter" and Light", "Cyan Light", "GitHub", "Light Owl", "Material Lighter" and
"Solarized Light". "Solarized Light".
- TabbedPane: Fixed focused tab background color for themes "Arc *", "Material - TabbedPane: Fixed focused tab background color for themes "Arc *", "Material
Design Dark", "Monocai", "One Dark", "Spacegray" and "Xcode-Dark". (issue Design Dark", "Monocai", "One Dark", "Spacegray" and "Xcode-Dark". (issue
#697) #697)
- TextComponents: Fixed background colors of enabled text components, to - TextComponents, ComboBox and Spinner: Fixed background colors of enabled
distinguish from disabled, for themes "Carbon", "Cobalt 2", "Gradianto *", text components, to distinguish from disabled, for themes "Carbon", "Cobalt
"Gruvbox *", "Monocai", "Spacegray", "Vuesion", "Xcode-Dark", "GitHub", and 2", "Gradianto *", "Gruvbox *", "Monocai", "Spacegray", "Vuesion",
"Light Owl". (issue #528) "Xcode-Dark", "GitHub", and "Light Owl". (issue #528)
- Native Windows libraries: Fixed crash when running in Java 8 and newer Java - Native Windows libraries: Fixed crash when running in Java 8 and newer Java
version is installed in `PATH` environment variable and using class version is installed in `PATH` environment variable and using class
`SystemInfo` before AWT initialization. (issue #673) `SystemInfo` before AWT initialization. (issue #673)

1
flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java
View File

@@ -673,6 +673,7 @@ public class IntelliJTheme
// ComboBox // ComboBox
uiKeyMapping.put( "ComboBox.background", "" ); // ignore uiKeyMapping.put( "ComboBox.background", "" ); // ignore
uiKeyMapping.put( "ComboBox.buttonBackground", "" ); // ignore
uiKeyMapping.put( "ComboBox.nonEditableBackground", "ComboBox.background" ); uiKeyMapping.put( "ComboBox.nonEditableBackground", "ComboBox.background" );
uiKeyMapping.put( "ComboBox.ArrowButton.background", "ComboBox.buttonEditableBackground" ); uiKeyMapping.put( "ComboBox.ArrowButton.background", "ComboBox.buttonEditableBackground" );
uiKeyMapping.put( "ComboBox.ArrowButton.disabledIconColor", "ComboBox.buttonDisabledArrowColor" ); uiKeyMapping.put( "ComboBox.ArrowButton.disabledIconColor", "ComboBox.buttonDisabledArrowColor" );

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

@@ -152,6 +152,8 @@ ToggleButton.endBackground = $ToggleButton.background
[Cobalt_2]CheckBox.icon.checkmarkColor = #002946 [Cobalt_2]CheckBox.icon.checkmarkColor = #002946
[Cobalt_2]MenuItem.checkBackground = @ijMenuCheckBackgroundL10 [Cobalt_2]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
[Cobalt_2]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10 [Cobalt_2]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
[Cobalt_2]ComboBox.background = @ijTextBackgroundL3
[Cobalt_2]ComboBox.buttonBackground = @ijTextBackgroundL3
[Cobalt_2]TextField.background = @ijTextBackgroundL3 [Cobalt_2]TextField.background = @ijTextBackgroundL3
[Cyan_light]MenuItem.checkBackground = @ijMenuCheckBackgroundL20 [Cyan_light]MenuItem.checkBackground = @ijMenuCheckBackgroundL20
@@ -180,11 +182,15 @@ ToggleButton.endBackground = $ToggleButton.background
[Gruvbox_Dark_Hard]Component.accentColor = lazy(TabbedPane.underlineColor) [Gruvbox_Dark_Hard]Component.accentColor = lazy(TabbedPane.underlineColor)
[Gruvbox_Dark_Hard]ToggleButton.selectedBackground = $ToggleButton.selectedBackground [Gruvbox_Dark_Hard]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
[Gruvbox_Dark_Hard]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground [Gruvbox_Dark_Hard]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground
[Gruvbox_Dark_Hard]ComboBox.background = @ijTextBackgroundL3
[Gruvbox_Dark_Hard]ComboBox.buttonBackground = @ijTextBackgroundL3
[Gruvbox_Dark_Hard]TextField.background = @ijTextBackgroundL3 [Gruvbox_Dark_Hard]TextField.background = @ijTextBackgroundL3
[Gruvbox_Dark_Medium]Component.accentColor = lazy(TabbedPane.underlineColor) [Gruvbox_Dark_Medium]Component.accentColor = lazy(TabbedPane.underlineColor)
[Gruvbox_Dark_Medium]ToggleButton.selectedBackground = $ToggleButton.selectedBackground [Gruvbox_Dark_Medium]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
[Gruvbox_Dark_Medium]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground [Gruvbox_Dark_Medium]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground
[Gruvbox_Dark_Medium]ComboBox.background = @ijTextBackgroundL3
[Gruvbox_Dark_Medium]ComboBox.buttonBackground = @ijTextBackgroundL3
[Gruvbox_Dark_Medium]TextField.background = @ijTextBackgroundL3 [Gruvbox_Dark_Medium]TextField.background = @ijTextBackgroundL3
[Gruvbox_Dark_Soft]Component.accentColor = lazy(TabbedPane.underlineColor) [Gruvbox_Dark_Soft]Component.accentColor = lazy(TabbedPane.underlineColor)
@@ -192,6 +198,8 @@ ToggleButton.endBackground = $ToggleButton.background
[Gruvbox_Dark_Soft]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10 [Gruvbox_Dark_Soft]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
[Gruvbox_Dark_Soft]ToggleButton.selectedBackground = $ToggleButton.selectedBackground [Gruvbox_Dark_Soft]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
[Gruvbox_Dark_Soft]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground [Gruvbox_Dark_Soft]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground
[Gruvbox_Dark_Soft]ComboBox.background = @ijTextBackgroundL3
[Gruvbox_Dark_Soft]ComboBox.buttonBackground = @ijTextBackgroundL3
[Gruvbox_Dark_Soft]TextField.background = @ijTextBackgroundL3 [Gruvbox_Dark_Soft]TextField.background = @ijTextBackgroundL3
[Hiberbee_Dark]TabbedPane.focusColor = #5A5A5A [Hiberbee_Dark]TabbedPane.focusColor = #5A5A5A
@@ -214,6 +222,8 @@ ToggleButton.endBackground = $ToggleButton.background
[Light_Flat]CheckBox.icon[filled].background = #fff [Light_Flat]CheckBox.icon[filled].background = #fff
[Light_Flat]CheckBox.icon[filled].checkmarkColor = #fff [Light_Flat]CheckBox.icon[filled].checkmarkColor = #fff
[Light_Flat]Component.accentColor = lazy(TabbedPane.underlineColor) [Light_Flat]Component.accentColor = lazy(TabbedPane.underlineColor)
[Light_Flat]ComboBox.background = lazy(ComboBox.editableBackground)
[Light_Flat]ComboBox.buttonBackground = lazy(ComboBox.editableBackground)
[Light_Flat]TableHeader.background = #E5E5E9 [Light_Flat]TableHeader.background = #E5E5E9
[Monocai]Button.default.foreground = #2D2A2F [Monocai]Button.default.foreground = #2D2A2F
@@ -239,11 +249,15 @@ ToggleButton.endBackground = $ToggleButton.background
[One_Dark]Slider.focusedColor = fade(#568af2,40%) [One_Dark]Slider.focusedColor = fade(#568af2,40%)
[Solarized_Dark---4lex4]Component.accentColor = lazy(TabbedPane.underlineColor) [Solarized_Dark---4lex4]Component.accentColor = lazy(TabbedPane.underlineColor)
[Solarized_Dark---4lex4]ComboBox.background = lazy(ComboBox.editableBackground)
[Solarized_Dark---4lex4]ComboBox.buttonBackground = lazy(ComboBox.editableBackground)
[Solarized_Dark---4lex4]Slider.focusedColor = fade($Component.focusColor,80%,derived) [Solarized_Dark---4lex4]Slider.focusedColor = fade($Component.focusColor,80%,derived)
[Solarized_Light---4lex4]Button.default.hoverBackground = darken($Button.default.background,3%,derived) [Solarized_Light---4lex4]Button.default.hoverBackground = darken($Button.default.background,3%,derived)
[Solarized_Light---4lex4]Component.accentColor = lazy(TabbedPane.underlineColor) [Solarized_Light---4lex4]Component.accentColor = lazy(TabbedPane.underlineColor)
[Spacegray]ComboBox.background = @ijTextBackgroundL4
[Spacegray]ComboBox.buttonBackground = @ijTextBackgroundL4
[Spacegray]TextField.background = @ijTextBackgroundL4 [Spacegray]TextField.background = @ijTextBackgroundL4
[vuesion-theme]*.disabledForeground = #8C8C8C [vuesion-theme]*.disabledForeground = #8C8C8C
@@ -256,6 +270,8 @@ ToggleButton.endBackground = $ToggleButton.background
[vuesion-theme]Slider.trackColor = #303a45 [vuesion-theme]Slider.trackColor = #303a45
[vuesion-theme]Slider.thumbColor = #ececee [vuesion-theme]Slider.thumbColor = #ececee
[vuesion-theme]Slider.focusedColor = fade(#ececee,20%) [vuesion-theme]Slider.focusedColor = fade(#ececee,20%)
[vuesion-theme]ComboBox.background = @ijTextBackgroundL4
[vuesion-theme]ComboBox.buttonBackground = @ijTextBackgroundL4
[vuesion-theme]TextField.background = @ijTextBackgroundL4 [vuesion-theme]TextField.background = @ijTextBackgroundL4
[Xcode-Dark]TextField.background = @ijTextBackgroundL4 [Xcode-Dark]TextField.background = @ijTextBackgroundL4