From c36b900e8379261a44068a178da32ccbfe235e99 Mon Sep 17 00:00:00 2001 From: weisj Date: Sat, 19 Oct 2019 01:15:37 +0200 Subject: [PATCH] Added SolarizedLightTheme. Fixed issue where the tooltip would not correctly resize if the pointer changed. Fixed some color values. --- .../java/com/weis/darklaf/LafManager.java | 4 +- .../com/weis/darklaf/theme/IntelliJTheme.java | 7 + .../darklaf/theme/SolarizedDarkTheme.java | 12 ++ .../darklaf/theme/SolarizedLightTheme.java | 19 +- .../colorchooser/DarkColorChooserPanel.java | 44 ++-- .../ui/tabbedpane/DarkTabbedPaneUI.java | 1 - .../darklaf/ui/tooltip/DarkTooltipBorder.java | 14 +- .../darklaf/ui/tooltip/DarkTooltipUI.java | 3 + .../theme/darcula/darcula_defaults.properties | 1 + .../intellij/intellij_defaults.properties | 3 +- .../theme/intellij/intellij_ui.properties | 25 +++ .../solarized_dark_defaults.properties | 3 +- .../solarized_dark_styleSheet.css | 30 ++- .../solarized_dark_ui.properties | 25 +++ .../solarized_light_defaults.properties | 203 +++++++++--------- .../solarized_light_styleSheet.css | 2 +- .../solarized_light_ui.properties | 27 +++ src/test/java/ToolTipDemo.java | 1 + 18 files changed, 283 insertions(+), 141 deletions(-) create mode 100644 src/main/resources/com/weis/darklaf/theme/intellij/intellij_ui.properties create mode 100644 src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_ui.properties create mode 100644 src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_ui.properties diff --git a/src/main/java/com/weis/darklaf/LafManager.java b/src/main/java/com/weis/darklaf/LafManager.java index 9dacd6b0..b6b68994 100644 --- a/src/main/java/com/weis/darklaf/LafManager.java +++ b/src/main/java/com/weis/darklaf/LafManager.java @@ -24,7 +24,7 @@ package com.weis.darklaf; import com.weis.darklaf.theme.DarculaTheme; -import com.weis.darklaf.theme.SolarizedDarkTheme; +import com.weis.darklaf.theme.IntelliJTheme; import com.weis.darklaf.theme.Theme; import org.jetbrains.annotations.NotNull; @@ -80,7 +80,7 @@ public final class LafManager { */ public static Theme getTheme() { if (theme == null) { - theme = new SolarizedDarkTheme(); + theme = new IntelliJTheme(); } return theme; } diff --git a/src/main/java/com/weis/darklaf/theme/IntelliJTheme.java b/src/main/java/com/weis/darklaf/theme/IntelliJTheme.java index 2c16404e..e817991f 100644 --- a/src/main/java/com/weis/darklaf/theme/IntelliJTheme.java +++ b/src/main/java/com/weis/darklaf/theme/IntelliJTheme.java @@ -34,4 +34,11 @@ public class IntelliJTheme extends Theme { public String getName() { return "intellij"; } + + @Override + public void loadUIProperties(final Properties properties, final UIDefaults currentDefaults) { + super.loadUIProperties(properties, currentDefaults); + var name = getResourcePath() + getName() + "_ui.properties"; + PropertyLoader.putProperties(load(name), properties, currentDefaults); + } } diff --git a/src/main/java/com/weis/darklaf/theme/SolarizedDarkTheme.java b/src/main/java/com/weis/darklaf/theme/SolarizedDarkTheme.java index b87783fb..6d10f451 100644 --- a/src/main/java/com/weis/darklaf/theme/SolarizedDarkTheme.java +++ b/src/main/java/com/weis/darklaf/theme/SolarizedDarkTheme.java @@ -23,6 +23,11 @@ */ package com.weis.darklaf.theme; +import com.weis.darklaf.util.PropertyLoader; + +import javax.swing.*; +import java.util.Properties; + public class SolarizedDarkTheme extends Theme { @Override @@ -39,4 +44,11 @@ public class SolarizedDarkTheme extends Theme { public boolean isDark() { return true; } + + @Override + public void loadUIProperties(final Properties properties, final UIDefaults currentDefaults) { + super.loadUIProperties(properties, currentDefaults); + var name = getResourcePath() + getName() + "_ui.properties"; + PropertyLoader.putProperties(load(name), properties, currentDefaults); + } } diff --git a/src/main/java/com/weis/darklaf/theme/SolarizedLightTheme.java b/src/main/java/com/weis/darklaf/theme/SolarizedLightTheme.java index 694d77ee..b0352e60 100644 --- a/src/main/java/com/weis/darklaf/theme/SolarizedLightTheme.java +++ b/src/main/java/com/weis/darklaf/theme/SolarizedLightTheme.java @@ -23,12 +23,12 @@ */ package com.weis.darklaf.theme; -public class SolarizedLightTheme extends Theme { +import com.weis.darklaf.util.PropertyLoader; - @Override - public void beforeInstall() { - throw new UnsupportedThemeException("Currently not finished"); - } +import javax.swing.*; +import java.util.Properties; + +public class SolarizedLightTheme extends Theme { @Override protected String getResourcePath() { @@ -40,8 +40,15 @@ public class SolarizedLightTheme extends Theme { return "solarized_light"; } + @Override + public void loadUIProperties(final Properties properties, final UIDefaults currentDefaults) { + super.loadUIProperties(properties, currentDefaults); + var name = getResourcePath() + getName() + "_ui.properties"; + PropertyLoader.putProperties(load(name), properties, currentDefaults); + } + @Override public boolean isDark() { - return true; + return false; } } diff --git a/src/main/java/com/weis/darklaf/ui/colorchooser/DarkColorChooserPanel.java b/src/main/java/com/weis/darklaf/ui/colorchooser/DarkColorChooserPanel.java index 5b57d222..16f70347 100644 --- a/src/main/java/com/weis/darklaf/ui/colorchooser/DarkColorChooserPanel.java +++ b/src/main/java/com/weis/darklaf/ui/colorchooser/DarkColorChooserPanel.java @@ -34,6 +34,8 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.colorchooser.AbstractColorChooserPanel; import javax.swing.event.AncestorEvent; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; import java.awt.*; import java.awt.event.KeyEvent; @@ -181,18 +183,36 @@ public class DarkColorChooserPanel extends AbstractColorChooserPanel implements } }); } else { - field.addPropertyChangeListener(e -> { - if ("value".equals(e.getPropertyName())) { - if (isChanging) return; - var hexStr = e.getNewValue().toString(); - var alpha = isColorTransparencySelectionEnabled() - ? Integer.valueOf(hexStr.substring(6, 8), 16) : 255; - var c = new Color( - Integer.valueOf(hexStr.substring(0, 2), 16), - Integer.valueOf(hexStr.substring(2, 4), 16), - Integer.valueOf(hexStr.substring(4, 6), 16), - alpha); - colorWheelPanel.setColor(c, textHex); + field.getDocument().addDocumentListener(new DocumentListener() { + @Override + public void insertUpdate(final DocumentEvent e) { + update(); + } + + @Override + public void removeUpdate(final DocumentEvent e) { + update(); + } + + @Override + public void changedUpdate(final DocumentEvent e) { + } + + protected void update() { + try { + if (isChanging) return; + System.out.println("here"); + var hexStr = String.format("%1$-" + 8 + "s", field.getText()).replaceAll(" ", "F"); + var alpha = isColorTransparencySelectionEnabled() + ? Integer.valueOf(hexStr.substring(6, 8), 16) : 255; + var c = new Color( + Integer.valueOf(hexStr.substring(0, 2), 16), + Integer.valueOf(hexStr.substring(2, 4), 16), + Integer.valueOf(hexStr.substring(4, 6), 16), + alpha); + System.out.println(c); + colorWheelPanel.setColor(c, textHex); + } catch (NumberFormatException | IndexOutOfBoundsException ignore) {} } }); } diff --git a/src/main/java/com/weis/darklaf/ui/tabbedpane/DarkTabbedPaneUI.java b/src/main/java/com/weis/darklaf/ui/tabbedpane/DarkTabbedPaneUI.java index 7ed406cf..4657884b 100644 --- a/src/main/java/com/weis/darklaf/ui/tabbedpane/DarkTabbedPaneUI.java +++ b/src/main/java/com/weis/darklaf/ui/tabbedpane/DarkTabbedPaneUI.java @@ -372,7 +372,6 @@ public class DarkTabbedPaneUI extends DarkTabbedPaneUIBridge { protected void paintTabAreaBackground(@NotNull final Graphics g, final int tabPlacement) { g.setColor(getTabAreaBackground()); - g.setColor(Color.RED); var b = getTabAreaBounds(); if (scrollableTabLayoutEnabled()) { b.setLocation(0, 0); diff --git a/src/main/java/com/weis/darklaf/ui/tooltip/DarkTooltipBorder.java b/src/main/java/com/weis/darklaf/ui/tooltip/DarkTooltipBorder.java index 77d21ee5..67bd1760 100644 --- a/src/main/java/com/weis/darklaf/ui/tooltip/DarkTooltipBorder.java +++ b/src/main/java/com/weis/darklaf/ui/tooltip/DarkTooltipBorder.java @@ -55,6 +55,8 @@ public class DarkTooltipBorder implements Border, UIResource { return; } if (c instanceof JToolTip && ((JToolTip) c).getTipText() == null) return; + g.setColor(Color.RED); + g.drawRect(x, y, width, height); var ins = shadowBorder.getBorderInsets(c); adjustInsets(ins); var bubbleArea = bubbleBorder.getInnerArea(x + ins.left, y + ins.top, @@ -67,7 +69,9 @@ public class DarkTooltipBorder implements Border, UIResource { int bw = bubbleBorder.getThickness(); int off = 0; var pointerSide = bubbleBorder.getPointerSide(); - if (pointerSide != Alignment.WEST && pointerSide != Alignment.EAST) { + if (pointerSide == Alignment.NORTH + || pointerSide == Alignment.NORTH_EAST + || pointerSide == Alignment.NORTH_WEST) { off = bubbleBorder.getPointerSize(); } shadowBorder.paintBorder(c, g, x + bw, y + bw + off, width - 2 * bw, height - 2 * bw - off); @@ -101,10 +105,10 @@ public class DarkTooltipBorder implements Border, UIResource { ins.right = Math.max(bi.right, si.right); ins.top = Math.max(bi.top, si.top); var uIns = getUserInsets(c); - ins.left += 5 + si.left + uIns.left; - ins.top += 2 + si.top + uIns.top; - ins.right += 5 + si.right + uIns.right; - ins.bottom += 2 + si.bottom + uIns.bottom; + ins.left += 5 + uIns.left; + ins.top += 2 + uIns.top; + ins.right += 5 + uIns.right; + ins.bottom += 2 + uIns.bottom; return ins; } diff --git a/src/main/java/com/weis/darklaf/ui/tooltip/DarkTooltipUI.java b/src/main/java/com/weis/darklaf/ui/tooltip/DarkTooltipUI.java index 65fe8c52..c3192536 100644 --- a/src/main/java/com/weis/darklaf/ui/tooltip/DarkTooltipUI.java +++ b/src/main/java/com/weis/darklaf/ui/tooltip/DarkTooltipUI.java @@ -112,14 +112,17 @@ public class DarkTooltipUI extends BasicToolTipUI implements PropertyChangeListe } else { border.setPointerLocation(Alignment.CENTER); } + tooltip.setComponent(tooltip.getComponent()); } else if ("JToolTip.pointerHeight".equals(key)) { if (newVal instanceof Integer) { border.setPointerHeight((Integer) newVal); } + tooltip.setComponent(tooltip.getComponent()); } else if ("JToolTip.pointerWidth".equals(key)) { if (newVal instanceof Integer) { border.setPointerWidth((Integer) newVal); } + tooltip.setComponent(tooltip.getComponent()); } } } diff --git a/src/main/resources/com/weis/darklaf/theme/darcula/darcula_defaults.properties b/src/main/resources/com/weis/darklaf/theme/darcula/darcula_defaults.properties index 64668202..0694d90b 100644 --- a/src/main/resources/com/weis/darklaf/theme/darcula/darcula_defaults.properties +++ b/src/main/resources/com/weis/darklaf/theme/darcula/darcula_defaults.properties @@ -19,6 +19,7 @@ #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. +# # suppress inspection "UnusedProperty" for whole file ####Background#### %background = 3c3f41 diff --git a/src/main/resources/com/weis/darklaf/theme/intellij/intellij_defaults.properties b/src/main/resources/com/weis/darklaf/theme/intellij/intellij_defaults.properties index af76b4ae..0b66e165 100644 --- a/src/main/resources/com/weis/darklaf/theme/intellij/intellij_defaults.properties +++ b/src/main/resources/com/weis/darklaf/theme/intellij/intellij_defaults.properties @@ -22,6 +22,7 @@ # SOFTWARE. # # suppress inspection "UnusedProperty" for whole file +####Background#### %background = F2F2F2 %backgroundAlternative = F2F5F9 %backgroundColorful = E6EBF0 @@ -120,7 +121,7 @@ %hyperlink = 589df6 ####Misc#### -%shadow = 808080 +%shadow = 000000 %glowFocus = 3d94f2 %glowFocusLine = 7B9FC7 diff --git a/src/main/resources/com/weis/darklaf/theme/intellij/intellij_ui.properties b/src/main/resources/com/weis/darklaf/theme/intellij/intellij_ui.properties new file mode 100644 index 00000000..f6273ae8 --- /dev/null +++ b/src/main/resources/com/weis/darklaf/theme/intellij/intellij_ui.properties @@ -0,0 +1,25 @@ +# +# MIT License +# +# Copyright (c) 2019 Jannis Weis +# +# 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: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# 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. +# +# suppress inspection "UnusedProperty" for whole file +Button.shadow = 808080 \ No newline at end of file diff --git a/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_defaults.properties b/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_defaults.properties index 643fe1b7..d6283c65 100644 --- a/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_defaults.properties +++ b/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_defaults.properties @@ -19,6 +19,7 @@ #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. +# # suppress inspection "UnusedProperty" for whole file ####Background#### %background = 0E3C4A @@ -44,7 +45,7 @@ %borderSecondary = 11333C %borderTertiary = 5B5D5F %borderFocus = 1D8AD1 -%gridLine = 093640 +%gridLine = 254E5A ####Highlight#### %hoverHighlight = 264F5B diff --git a/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_styleSheet.css b/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_styleSheet.css index 772fbaa0..fbf1cc82 100644 --- a/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_styleSheet.css +++ b/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_styleSheet.css @@ -1,17 +1,25 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * MIT License * - * 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 + * Copyright (c) 2019 Jannis Weis * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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: * - * 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. + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * 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. */ body { font-size: 14pt; @@ -19,7 +27,7 @@ body { font-weight: normal; margin-left: 0; margin-right: 0; - color: #bbbbbb; + color: #A7B6BA; } p { diff --git a/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_ui.properties b/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_ui.properties new file mode 100644 index 00000000..253c6651 --- /dev/null +++ b/src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_ui.properties @@ -0,0 +1,25 @@ +# +# MIT License +# +# Copyright (c) 2019 Jannis Weis +# +# 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: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# 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. +# +# suppress inspection "UnusedProperty" for whole file +ColorChooser.swatchesDefaultRecentColor = EAEEEF diff --git a/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_defaults.properties b/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_defaults.properties index 64668202..7120b515 100644 --- a/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_defaults.properties +++ b/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_defaults.properties @@ -1,136 +1,137 @@ -#MIT License # -#Copyright (c) 2019 Jannis Weis +# MIT License # -#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: +# Copyright (c) 2019 Jannis Weis # -#The above copyright notice and this permission notice shall be included in all -#copies or substantial portions of the Software. +# 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: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# 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. # -#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. # suppress inspection "UnusedProperty" for whole file ####Background#### -%background = 3c3f41 -%backgroundAlternative = 414547 -%backgroundColorful = 3B4754 -%backgroundContainer = 3c3f41 +%background = EEE8D5 +%backgroundAlternative = F0EBDB +%backgroundColorful = DEDDD1 +%backgroundContainer = FDF6E3 -%backgroundHeader = 45484a -%backgroundToolTip = 4b4d4d +%backgroundHeader = FDF6E3 +%backgroundToolTip = F5F1E5 -%backgroundHover = 27292a -%backgroundSelected = 4e5254 -%backgroundHoverSecondary = 353739 -%backgroundSelectedSecondary = 2d2f30 -%backgroundHoverColorful = 262D36 -%backgroundSelectedColorful = 313A45 +%backgroundHover = D7D1BF +%backgroundSelected = FAF3E0 +%backgroundHoverSecondary = D7D1BE +%backgroundSelectedSecondary = BCB6A4 +%backgroundHoverColorful = C8C7BC +%backgroundSelectedColorful = E6E5DC -%dropBackground = 4b4b4b -%dropForeground = 999999 +%dropBackground = F3EDDC +%dropForeground = 617EB3 ####Border#### -%border = 555555 -%borderSecondary = 333638 -%borderTertiary = 5b5d5f -%borderFocus = 79c0ff -%gridLine = 4f5152 +%border = C9C3B3 +%borderSecondary = C6C1B1 +%borderTertiary = A0A0A0 +%borderFocus = 248AD4 +%gridLine = F5EEDC ####Highlight#### -%hoverHighlight = 4c5052 -%clickHighlight = 5c6164 +%hoverHighlight = DBD6C4 +%clickHighlight = CCC6B6 -%hoverHighlightColorful = 2F3A45 -%clickHighlightColorful = 2B353F +%hoverHighlightColorful = E6E5DC +%clickHighlightColorful = EEEEE8 -%hoverHighlightDefault = 406086 -%clickHighlightDefault = 4a688c +%hoverHighlightDefault = 548BC0 +%clickHighlightDefault = 6395C6 -%hoverHighlightSecondary = 333537 -%clickHighlightSecondary = 2a2b2d +%hoverHighlightSecondary = E2DBC9 +%clickHighlightSecondary = E9E4d6 -%highlightFill = 0d293e -%highlightFillFocus = 4b6eaf -%highlightFillFocusSecondary = 4A88C7 -%highlightFillMono = 747a80 +%highlightFill = D2CBB9 +%highlightFillFocus = 3570CD +%highlightFillFocusSecondary = 3D7EC0 +%highlightFillMono = 99A1A5 ####Widgets#### -%widgetBorder = 6b6b6b -%widgetBorderInactive = 535353 -%widgetBorderDefault = 4c708c -%widgetFill = 43494a -%widgetFillSelected = 43494a -%widgetFillInactive = 3c3f41 -%widgetFillDefault = 365880 +%widgetBorder = BAB5A7 +%widgetBorderInactive = CCC6B6 +%widgetBorderDefault = 4474B1 +%widgetFill = FDF6E3 +%widgetFillSelected = 4984BE +%widgetFillInactive = EEE8D5 +%widgetFillDefault = 4681BB ####Controls#### -%controlBorder = 6b6b6b -%controlBorderDisabled = 545556 -%controlBorderSelected = 6B6B6B -%controlBorderFocus = 466D94 -%controlBorderFocusSelected = 466D94 -%controlBorderSecondary = 424242 -%controlFill = A0A0A0 -%controlFillFocus = A0A0A0 -%controlFillSecondary = A0A0A0 -%controlTrack = 636869 -%controlFillDisabled = 606060 -%controlFillHighlight = 5394ec -%controlFillHighlightDisabled = 475b81 -%controlBackground = 555555 -%controlFadeStart = 696969 -%controlFadeEnd = 838383 -%controlErrorFadeStart = e74848 -%controlErrorFadeEnd = f4a2a0 -%controlPassedFadeStart = 008f50 -%controlPassedFadeEnd = 5dc48f +%controlBorder = BDB8AA +%controlBorderDisabled = CCC6B6 +%controlBorderSelected = 4984BE +%controlBorderFocus = 86ABCB +%controlBorderFocusSelected = 86ABCB +%controlBorderSecondary = D0CBBD +%controlFill = FFFFFF +%controlFillFocus = FFFFFF +%controlFillSecondary = 6B8086 +%controlTrack = dacaa1 +%controlFillDisabled = 839496 +%controlFillHighlight = 4681BB +%controlFillHighlightDisabled = D2CBB9 +%controlBackground = C3BEAF +%controlFadeStart = C3BEAF +%controlFadeEnd = 6B8086 +%controlErrorFadeStart = D14943 +%controlErrorFadeEnd = F6887C +%controlPassedFadeStart = 2DAA66 +%controlPassedFadeEnd = 77DF92 ####Text#### -%caret = bbbbbb -%textForeground = bbbbbb -%textForegroundDefault = bbbbbb -%textForegroundHighlight = DDDDDD -%textForegroundInactive = 777777 -%textForegroundSecondary = 919191 -%acceleratorForeground = eeeeee - -%textSelectionForeground = bbbbbb -%textSelectionForegroundInactive = bbbbbb -%textSelectionBackground = 214283 +%caret = 2E4E58 +%textForeground = 2E4E58 +%textForegroundDefault = FFFFFF +%textForegroundHighlight = 002B36 +%textForegroundInactive = 657b83 +%textForegroundSecondary = 586e75 +%acceleratorForeground = 617EB3 + +%textSelectionForeground = FFFFFF +%textSelectionForegroundInactive = 2E4E58 +%textSelectionBackground = 3570CD #currentLineBackground -%textSelectionBackgroundSecondary = 323232 -%textBackground = 45494a -%textBackgroundInactive = 3c3f41 -%textBackgroundSecondary = 2B2B2B +%textSelectionBackgroundSecondary = F3EDDC +%textBackground = FDF6E3 +%textBackgroundInactive = EEE8D5 +%textBackgroundSecondary = 002B36 #Editor number pane -%textBackgroundSecondaryInactive = 313335 +%textBackgroundSecondaryInactive = EEE8D5 %hyperlink = 589df6 ####Misc#### -#Todo Line Colors %shadow = 000000 -%glowFocus = 3e84c9 -%glowFocusLine = 466D94 +%glowFocus = 3b93eb +%glowFocusLine = A5C7E2 -%glowError = cf6767 -%glowErrorLine = 73454B +%glowError = E8B4A6 +%glowErrorLine = DE3641 -%glowFocusError = c2413c -%glowFocusErrorLine = 73454B +%glowFocusError = DE3641 +%glowFocusErrorLine = DE3641 -%glowWarning = ac7920 -%glowWarningLine = 6e5324 +%glowWarning = DC9E2F +%glowWarningLine = F6CA7C #Arc %arc = 5 @@ -139,4 +140,4 @@ %arcSecondaryFocus = 3 %borderThickness = 3 -%shadowHeight = 3 \ No newline at end of file +%shadowHeight = 2 \ No newline at end of file diff --git a/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_styleSheet.css b/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_styleSheet.css index 22d3ca82..4512aba0 100644 --- a/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_styleSheet.css +++ b/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_styleSheet.css @@ -27,7 +27,7 @@ body { font-weight: normal; margin-left: 0; margin-right: 0; - color: #000000; + color: #2E4E58; } p { diff --git a/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_ui.properties b/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_ui.properties new file mode 100644 index 00000000..772cad1e --- /dev/null +++ b/src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_ui.properties @@ -0,0 +1,27 @@ +# +# MIT License +# +# Copyright (c) 2019 Jannis Weis +# +# 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: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# 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. +# +# suppress inspection "UnusedProperty" for whole file +RadioButton.activeFillColor = %controlFill +CheckBox.activeFillColor = %controlFill +ColorChooser.swatchesDefaultRecentColor = EAE4D1 diff --git a/src/test/java/ToolTipDemo.java b/src/test/java/ToolTipDemo.java index d852257e..1fd89916 100644 --- a/src/test/java/ToolTipDemo.java +++ b/src/test/java/ToolTipDemo.java @@ -19,6 +19,7 @@ public class ToolTipDemo { { setToolTipText("ToolTip \n multiline \n third line's a charm"); +// setToolTipText("ToolTip"); } @Override