diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java index 58cf32af..bfa19efe 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java @@ -653,26 +653,27 @@ public class IntelliJTheme uiKeyExcludes = new HashSet<>( Arrays.asList( "ActionButton.", "ActionToolbar.", "ActionsList.", "AppInspector.", "AssignedMnemonic.", "Autocomplete.", "AvailableMnemonic.", - "BigSpinner.", "Bookmark.", "BookmarkIcon.", "BookmarkMnemonicAssigned.", "BookmarkMnemonicAvailable.", + "Badge.", "BigSpinner.", "Bookmark.", "BookmarkIcon.", "BookmarkMnemonicAssigned.", "BookmarkMnemonicAvailable.", "BookmarkMnemonicCurrent.", "BookmarkMnemonicIcon.", "Borders.", "Breakpoint.", - "Canvas.", "CodeWithMe.", "ComboBoxButton.", "CompletionPopup.", "ComplexPopup.", "Content.", - "CurrentMnemonic.", "Counter.", - "Debugger.", "DebuggerPopup.", "DebuggerTabs.", "DefaultTabs.", "Dialog.", "DialogWrapper.", "DragAndDrop.", + "Canvas.", "Code.", "CodeWithMe.", "CombinedDiff.", "ComboBoxButton.", "CompilationCharts.", + "CompletionPopup.", "ComplexPopup.", "Content.", "ContextHelp.", "CurrentMnemonic.", "Counter.", + "Debugger.", "DebuggerPopup.", "DebuggerTabs.", "DefaultTabs.", "Dialog.", "DialogWrapper.", + "DisclosureButton.", "DragAndDrop.", "Editor.", "EditorGroupsTabs.", "EditorTabs.", "FileColor.", "FlameGraph.", "Focus.", "Git.", "Github.", "GotItTooltip.", "Group.", "Gutter.", "GutterTooltip.", "HeaderColor.", "HelpTooltip.", "Hg.", "IconBadge.", "InformationHint.", "InplaceRefactoringPopup.", - "Lesson.", "Link.", "LiveIndicator.", + "Lesson.", "LineProfiler.", "Link.", "LiveIndicator.", "MainMenu.", "MainToolbar.", "MemoryIndicator.", "MlModelBinding.", "MnemonicIcon.", "NavBar.", "NewClass.", "NewPSD.", "Notification.", "Notifications.", "NotificationsToolwindow.", "OnePixelDivider.", "OptionButton.", "Outline.", - "ParameterInfo.", "Plugins.", "ProgressIcon.", "PsiViewer.", + "ParameterInfo.", "Plugins.", "Profiler.", "ProgressIcon.", "PsiViewer.", "ReviewList.", "RunWidget.", "ScreenView.", "SearchEverywhere.", "SearchFieldWithExtension.", "SearchMatch.", "SearchOption.", "SearchResults.", "SegmentedButton.", "Settings.", "SidePanel.", "Space.", "SpeedSearch.", "StateWidget.", "StatusBar.", - "Tag.", "TipOfTheDay.", "ToolbarComboWidget.", "ToolWindow.", + "Tag.", "TipOfTheDay.", "ToolbarComboWidget.", "ToolWindow.", "TrialWidget.", "UIDesigner.", "UnattendedHostStatus.", "ValidationTooltip.", "VersionControl.", "WelcomeScreen.", diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties index d31c0cf6..3e7c19f9 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties @@ -243,16 +243,18 @@ ToggleButton.endBackground = $ToggleButton.background [Hiberbee_Dark]Tree.selectionBackground = lazy(List.selectionBackground) [Hiberbee_Dark]Tree.selectionInactiveBackground = lazy(List.selectionInactiveBackground) -[High_contrast]Component.accentColor = lazy(Component.focusColor) -[High_contrast]ToggleButton.selectedBackground = #fff -[High_contrast]ToggleButton.selectedForeground = #000 -[High_contrast]ToggleButton.disabledSelectedBackground = #444 -[High_contrast]ToggleButton.toolbar.selectedBackground = #fff -[High_contrast][style]Button.inTextField = \ +[High_Contrast]Component.accentColor = lazy(Component.focusColor) +[High_Contrast]Button.hoverBorderColor = #1AEBFF +[High_Contrast]HelpButton.hoverBorderColor = #1AEBFF +[High_Contrast]ToggleButton.selectedBackground = #fff +[High_Contrast]ToggleButton.selectedForeground = #000 +[High_Contrast]ToggleButton.disabledSelectedBackground = #444 +[High_Contrast]ToggleButton.toolbar.selectedBackground = #3333FF +[High_Contrast][style]Button.inTextField = \ toolbar.hoverBackground: #444; \ toolbar.pressedBackground: #666; \ toolbar.selectedBackground: #fff -[High_contrast][style]ToggleButton.inTextField = $[High_contrast][style]Button.inTextField +[High_Contrast][style]ToggleButton.inTextField = $[High_Contrast][style]Button.inTextField [Light_Flat]*.disabledForeground = #8C8C8C [Light_Flat]*.inactiveForeground = #8C8C8C diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json index 251a0911..94ea24ed 100644 --- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json +++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json @@ -167,12 +167,12 @@ "sourceCodePath": "blob/latest/src/intellij/src/main/resources/themes/HiberbeeDark.theme.json" }, "HighContrast.theme.json": { - "name": "High contrast", + "name": "High Contrast", "dark": true, - "license": "MIT", + "license": "Apache License 2.0", "licenseFile": "HighContrast.LICENSE.txt", - "sourceCodeUrl": "https://github.com/OlyaB/HighContrastTheme", - "sourceCodePath": "blob/master/src/HighContrast.theme.json" + "sourceCodeUrl": "https://github.com/JetBrains/intellij-community", + "sourceCodePath": "blob/master/platform/platform-resources/src/themes/HighContrast.theme.json" }, "LightFlatTheme.theme.json": { "name": "Light Flat", diff --git a/flatlaf-intellij-themes/README.md b/flatlaf-intellij-themes/README.md index de7b05c7..de3aa234 100644 --- a/flatlaf-intellij-themes/README.md +++ b/flatlaf-intellij-themes/README.md @@ -61,12 +61,12 @@ Name | Class [Gruvbox Dark Medium](https://github.com/Vincent-P/gruvbox-intellij-theme) | `com.formdev.flatlaf.intellijthemes.FlatGruvboxDarkMediumIJTheme` [Gruvbox Dark Soft](https://github.com/Vincent-P/gruvbox-intellij-theme) | `com.formdev.flatlaf.intellijthemes.FlatGruvboxDarkSoftIJTheme` [Hiberbee Dark](https://github.com/Hiberbee/themes) | `com.formdev.flatlaf.intellijthemes.FlatHiberbeeDarkIJTheme` -[High contrast](https://github.com/OlyaB/HighContrastTheme) | `com.formdev.flatlaf.intellijthemes.FlatHighContrastIJTheme` +[High Contrast](https://github.com/JetBrains/intellij-community) | `com.formdev.flatlaf.intellijthemes.FlatHighContrastIJTheme` [Light Flat](https://github.com/nerzhulart/LightFlatTheme) | `com.formdev.flatlaf.intellijthemes.FlatLightFlatIJTheme` [Material Design Dark](https://github.com/xinkunZ/NotReallyMDTheme) | `com.formdev.flatlaf.intellijthemes.FlatMaterialDesignDarkIJTheme` -[Monocai](https://github.com/bmikaili/intellij-monocai-theme) | `com.formdev.flatlaf.intellijthemes.FlatMonocaiIJTheme` +[Monocai](https://github.com/TheEggi/intellij-monocai-theme) | `com.formdev.flatlaf.intellijthemes.FlatMonocaiIJTheme` [Monokai Pro](https://github.com/subtheme-dev/monokai-pro) | `com.formdev.flatlaf.intellijthemes.FlatMonokaiProIJTheme` -[Nord](https://github.com/arcticicestudio/nord-jetbrains) | `com.formdev.flatlaf.intellijthemes.FlatNordIJTheme` +[Nord](https://github.com/nordtheme/jetbrains) | `com.formdev.flatlaf.intellijthemes.FlatNordIJTheme` [One Dark](https://github.com/one-dark/jetbrains-one-dark-theme) | `com.formdev.flatlaf.intellijthemes.FlatOneDarkIJTheme` [Solarized Dark](https://github.com/4lex4/intellij-platform-solarized) | `com.formdev.flatlaf.intellijthemes.FlatSolarizedDarkIJTheme` [Solarized Light](https://github.com/4lex4/intellij-platform-solarized) | `com.formdev.flatlaf.intellijthemes.FlatSolarizedLightIJTheme` @@ -78,20 +78,20 @@ Material Theme UI Lite: Name | Class -----|------ -[Arc Dark (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatArcDarkIJTheme` -[Atom One Dark (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatAtomOneDarkIJTheme` -[Atom One Light (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatAtomOneLightIJTheme` -[Dracula (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatDraculaIJTheme` -[GitHub (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatGitHubIJTheme` -[GitHub Dark (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatGitHubDarkIJTheme` -[Light Owl (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatLightOwlIJTheme` -[Material Darker (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMaterialDarkerIJTheme` -[Material Deep Ocean (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMaterialDeepOceanIJTheme` -[Material Lighter (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMaterialLighterIJTheme` -[Material Oceanic (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMaterialOceanicIJTheme` -[Material Palenight (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMaterialPalenightIJTheme` -[Monokai Pro (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMonokaiProIJTheme` -[Moonlight (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMoonlightIJTheme` -[Night Owl (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatNightOwlIJTheme` -[Solarized Dark (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatSolarizedDarkIJTheme` -[Solarized Light (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatSolarizedLightIJTheme` +[Arc Dark (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatArcDarkIJTheme` +[Atom One Dark (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatAtomOneDarkIJTheme` +[Atom One Light (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatAtomOneLightIJTheme` +[Dracula (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatDraculaIJTheme` +[GitHub (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatGitHubIJTheme` +[GitHub Dark (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatGitHubDarkIJTheme` +[Light Owl (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatLightOwlIJTheme` +[Material Darker (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMaterialDarkerIJTheme` +[Material Deep Ocean (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMaterialDeepOceanIJTheme` +[Material Lighter (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMaterialLighterIJTheme` +[Material Oceanic (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMaterialOceanicIJTheme` +[Material Palenight (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMaterialPalenightIJTheme` +[Monokai Pro (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMonokaiProIJTheme` +[Moonlight (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMoonlightIJTheme` +[Night Owl (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatNightOwlIJTheme` +[Solarized Dark (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatSolarizedDarkIJTheme` +[Solarized Light (Material)](https://github.com/AtomMaterialUI/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatSolarizedLightIJTheme` diff --git a/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java index 4243b88b..aeed6c5f 100644 --- a/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java +++ b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java @@ -48,7 +48,7 @@ public class FlatAllIJThemes new FlatIJLookAndFeelInfo( "Gruvbox Dark Medium", "com.formdev.flatlaf.intellijthemes.FlatGruvboxDarkMediumIJTheme", true ), new FlatIJLookAndFeelInfo( "Gruvbox Dark Soft", "com.formdev.flatlaf.intellijthemes.FlatGruvboxDarkSoftIJTheme", true ), new FlatIJLookAndFeelInfo( "Hiberbee Dark", "com.formdev.flatlaf.intellijthemes.FlatHiberbeeDarkIJTheme", true ), - new FlatIJLookAndFeelInfo( "High contrast", "com.formdev.flatlaf.intellijthemes.FlatHighContrastIJTheme", true ), + new FlatIJLookAndFeelInfo( "High Contrast", "com.formdev.flatlaf.intellijthemes.FlatHighContrastIJTheme", true ), new FlatIJLookAndFeelInfo( "Light Flat", "com.formdev.flatlaf.intellijthemes.FlatLightFlatIJTheme", false ), new FlatIJLookAndFeelInfo( "Material Design Dark", "com.formdev.flatlaf.intellijthemes.FlatMaterialDesignDarkIJTheme", true ), new FlatIJLookAndFeelInfo( "Monocai", "com.formdev.flatlaf.intellijthemes.FlatMonocaiIJTheme", true ), diff --git a/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatHighContrastIJTheme.java b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatHighContrastIJTheme.java index 7fe86eb3..cdaa7b96 100644 --- a/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatHighContrastIJTheme.java +++ b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatHighContrastIJTheme.java @@ -29,7 +29,7 @@ import com.formdev.flatlaf.IntelliJTheme; public class FlatHighContrastIJTheme extends IntelliJTheme.ThemeLaf { - public static final String NAME = "High contrast"; + public static final String NAME = "High Contrast"; public static boolean setup() { try { diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HighContrast.LICENSE.txt b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HighContrast.LICENSE.txt index 98783834..d6456956 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HighContrast.LICENSE.txt +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HighContrast.LICENSE.txt @@ -1,21 +1,202 @@ -The MIT License (MIT) -Copyright (c) 2016 CloudCannon + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + 1. Definitions. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HighContrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HighContrast.theme.json index 5940db53..8745a419 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HighContrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HighContrast.theme.json @@ -1,16 +1,17 @@ { - "name": "High contrast", + "name": "High Contrast", "dark": true, "author": "JetBrains", - - "editorScheme": "/themes/highContrastScheme.xml", - + "parentTheme": "Darcula", + "nameKey": "high.contrast.theme.name", + "editorScheme": "High contrast", "ui": { "*": { "background": "#000000", "foreground": "#FFFFFF", "infoForeground": "#E0861F", + "successForeground": "#50A661", "selectionBackground": "#3333FF", "selectionForeground": "#FFFFFF", @@ -45,6 +46,11 @@ "pressedBackground": "#000000" }, + "Badge": { + "greenOutlineForeground": "#16F334", + "greenOutlineBorderColor": "#0DA522" + }, + "Button": { "startBackground": "#000000", "endBackground": "#000000", @@ -61,6 +67,19 @@ } }, + "SegmentedButton": { + "selectedStartBorderColor": "#1AEBFF", + "selectedEndBorderColor": "#1AEBFF", + "selectedButtonColor": "#000000", + "focusedSelectedButtonColor": "#0f6780" + }, + + "DisclosureButton": { + "defaultBackground": "#281A33", + "hoverOverlay": "#450073", + "pressedOverlay": "#54008c" + }, + "Borders": { "color": "#b3b3b3", "ContrastBorderColor": "#B3B3B3" @@ -76,6 +95,26 @@ } }, + "Code": { + "Inline": { + "backgroundColor": "#000000", + "backgroundOpacity": 60, + "borderColor": "#777", + "borderWidth": 1 + }, + "Block": { + "backgroundColor": "#000000", + "backgroundOpacity": 100, + "borderColor": "#777", + "borderWidth": 1, + "EditorPane": { + "borderColor": "#777", + "backgroundColor": "#000000", + "backgroundOpacity": 100 + } + } + }, + "ComboPopup.border": "1,1,1,1,E6E6E6", "CompletionPopup": { @@ -83,9 +122,8 @@ "matchSelectionForeground": "#ED94FF" }, - - "Component": { + "focusedBorderColor": "#000000", "errorFocusColor": "#E6194B", "inactiveErrorFocusColor": "#800002", "warningFocusColor": "#F58231", @@ -94,6 +132,12 @@ "hoverIconColor": "#FFFFFF" }, + "ContextHelp": { + "fontSizeOffset": { + "os.windows": 0 + } + }, + "Counter": { "background": "#FFFFFF", "foreground": "#000000" @@ -111,8 +155,10 @@ }, "DragAndDrop": { + "borderColor": "#3366FF", + "rowBackground": "#3366FF80", "areaForeground": "#FFFFFF", - "areaBackground": "#00838f", + "areaBackground": "#00EAFF7F", "areaBorderColor": "#1AEBFF" }, @@ -142,7 +188,8 @@ "Blue": "#00004D", "Violet": "#471747", "Orange": "#733000", - "Rose": "#4D0F22" + "Rose": "#4D0F22", + "Gray": "#062329" }, "FlameGraph": { @@ -169,6 +216,17 @@ "parentFocusedFrameForeground": "#FFFFFF" }, + "IconBadge": { + "borderWidth": 1.5, + "dotRadius": 3.5, + "dotX": 16.5, + "dotY": 3.5, + "errorBackground": "Actions.Red", + "warningBackground": "Actions.Yellow", + "infoBackground": "Actions.Blue", + "successBackground": "Actions.Green" + }, + "InplaceRefactoringPopup": { "background": "#450073", "borderColor": "#E6E6E6" @@ -191,6 +249,7 @@ "Notification": { "background": "#000080", + "iconHoverBackground": "#000000", "errorForeground": "#FFFFFF", "errorBackground": "#800002", @@ -213,6 +272,18 @@ } }, + "NotificationsToolwindow": { + "newNotification.background": "#450073", + "newNotification.hoverBackground": "#450073" + }, + + "OptionButton" : { + "default.separatorColor": "#000000", + "separatorColor": "#FFFFFF" + }, + + "Panel.mouseShortcutBackground": "#000000", + "ParameterInfo": { "background": "#281A33", "foreground": "#CCCCCC", @@ -260,7 +331,7 @@ "PopupMenu": { "borderWidth": 1, - "borderInsets": "4,1,4,1" + "borderInsets": "8,1,8,1" }, "ProgressBar": { @@ -274,6 +345,31 @@ "passedEndColor": "#15451E" }, + "BookmarkMnemonicAvailable": { + "foreground": "#FFFFFF", + "background": "#000000", + "borderColor": "#FFFFFF" + }, + "BookmarkMnemonicAssigned": { + "foreground": "#000000", + "background": "#FF8C21", + "borderColor": "#FF8C21" + }, + "BookmarkMnemonicCurrent": { + "foreground": "#FFFFFF", + "background": "#3333FF", + "borderColor": "#3333FF" + }, + + "Bookmark": { + "iconBackground": "#E0861F", + "Mnemonic": { + "iconForeground": "#FFFFFF", + "iconBackground": "#000000", + "iconBorderColor": "#E0861F" + } + }, + "ScrollBar": { "Transparent": { "thumbColor": "#b3b3b3", @@ -323,10 +419,11 @@ "endBackground": "#FFD333FF" }, - "SpeedSearch": { - "foreground": "#000000", - "borderColor": "#000000", - "background": "#1AEBFF" + "Slider": { + "buttonColor": "#FFFFFF", + "buttonBorderColor": "#000000", + "tickColor": "#FFFFFF", + "trackColor": "#8c8c8c" }, "StatusBar.borderColor": "#b3b3b3", @@ -394,6 +491,41 @@ "Tree.modifiedItemForeground": "#4FF0FF", + "TrialWidget": { + "Default": { + "foreground": "#FFFFFF", + "background": "#000000", + "borderColor": "#FFFFFF", + "hoverForeground": "#000000", + "hoverBackground": "#FFFFFF", + "hoverBorderColor": "#FFFFFF" + }, + "Active": { + "foreground": "#00E61F", + "background": "#000000", + "borderColor": "#00E61F", + "hoverForeground": "#FFFFFF", + "hoverBackground": "#00E61F", + "hoverBorderColor": "#00E61F" + }, + "Alert": { + "foreground": "#F58231", + "background": "#000000", + "borderColor": "#F58231", + "hoverForeground": "#FFFFFF", + "hoverBackground": "#F58231", + "hoverBorderColor": "#F58231" + }, + "Expiring": { + "foreground": "#FFFFFF", + "background": "#E6194B", + "borderColor": "#E6194B", + "hoverForeground": "#FFFFFF", + "hoverBackground": "#800002", + "hoverBorderColor": "#800002" + } + }, + "ValidationTooltip": { "errorBackground": "#800002", "errorBorderColor": "#E6194B", @@ -413,12 +545,150 @@ "FileHistory.Commit.selectedBranchBackground": "#0D0D40" }, + "CombinedDiff": { + "BlockBorder": { + "selectedActiveColor": "#1AEBFF" + } + }, + + "Lesson": { + "shortcutBackground": "#333638", + "stepNumberForeground": "#FEFEFE", + "Badge.newLessonBackground": "#00E61F", + "Badge.newLessonForeground": "#000000" + }, + + "GotItTooltip": { + "codeBackground": "#000000", + "shortcutBackground": "#000000", + "shortcutBorderColor": "#1AEBFF" + }, + + "Tooltip.Learning": { + "background": "#000080", + "borderColor": "#FFFFFF", + "spanBackground": "#1AEBFF", + "spanForeground": "#000000", + "foreground": "#FFFFFF", + "stepNumberForeground": "#FFFFFF", + "secondaryActionForeground": "#FFFFFF", + "iconFillColor": "#35538F", + "iconBorderColor": "#FFFFFF" + }, + "WelcomeScreen": { "Projects.selectionInactiveBackground": "#3333FF", "separatorColor": "#e6e6e6" }, - "Window.border" : "1,1,1,1,E6E6E6" + "MainToolbar": { + "Icon": { + "borderInsets": "10,10,10,10", + "background": "#000000", + "hoverBackground": "#3333FF", + "pressedBackground": "#3333FF" + }, + "Dropdown": { + "borderInsets": "12,6,12,6", + "background": "#000000", + "hoverBackground": "#3333FF", + "pressedBackground": "#3333FF", + "transparentHoverBackground": "#3333FF" + } + }, + + "TitlePane.Button.hoverBackground": "#3333FF", + + "Window.border" : "1,1,1,1,E6E6E6", + + "textInactiveText" : "#E0861F", + + "RunWidget" : { + "foreground": "#ffffff", + "runningBackground": "#599e5e", + "hoverBackground": "#00000019", + "pressedBackground": "#00000028" + }, + "Profiler": { + "ChartSlider": { + "foreground": "#FEFEFE", + "lineColor": "#1AEBFF" + }, + "CpuChart": { + "background": "#6296554D", + "borderColor": "#629655", + "inactiveBackground": "#62965533", + "inactiveBorderColor": "#314B2A", + "pointBackground": "#629625", + "pointBorderColor": "#FFFFFF" + }, + "MemoryChart": { + "background": "#589DF680", + "borderColor": "#589DF6", + "inactiveBackground": "#589DF633", + "inactiveBorderColor": "#2C4E7B", + "pointBackground": "#196AD0", + "pointBorderColor": "#FFFFFF" + }, + "Timer": { + "foreground": "#FFFFFF", + "disabledForeground": "#6E6E6E", + "background": "#323232" + }, + "LiveChart": { + "horizontalAxisColor": "#E6E6E6" + } + }, + "CompilationCharts": { + "background": { + "odd": "#000000", + "even": "#1A1A1A", + "default": "#000000" + }, + "test": { + "enabled": "#3E8E41", + "disabled": "#2B5931", + "stroke": "#6FAF6D", + "selected": "#5E9E57" + }, + "production": { + "enabled": "#3F88C5", + "disabled": "#2D5D87", + "stroke": "#6EA7C9", + "selected": "#6EB8DF" + }, + "memory": { + "background": "#3F88C5", + "stroke": "#6EB8DF" + }, + "cpu": { + "background": "#3E8E41", + "stroke": "#5E9E57" + }, + "lineColor": "#FFFFFF", + "textColor": "#FFFFFF" + }, + "FlameGraph.Tooltip": { + "scaleBackground": "#555454", + "scaleColor": "#402FF6", + "foreground": "#FFFFFF" + }, + "LineProfiler" : { + "Line" : { + "labelBackground" : "#43474A", + "foreground" : "#787878", + "hoverBackground" : "#4A4E52" + }, + "HotLine" : { + "labelBackground" : "#593D41", + "foreground" : "#FF5261", + "hoverBackground" : "#704745" + }, + "IgnoredLine" : { + "labelBackground" : "#43474A", + "foreground" : "#5F5F5F" + } + } }, "icons": {