Browse Source

Added SolarizedLightTheme.

Fixed issue where the tooltip would not correctly resize if the pointer
changed.
Fixed some color values.
pull/15/head
weisj 5 years ago
parent
commit
c36b900e83
  1. 4
      src/main/java/com/weis/darklaf/LafManager.java
  2. 7
      src/main/java/com/weis/darklaf/theme/IntelliJTheme.java
  3. 12
      src/main/java/com/weis/darklaf/theme/SolarizedDarkTheme.java
  4. 19
      src/main/java/com/weis/darklaf/theme/SolarizedLightTheme.java
  5. 26
      src/main/java/com/weis/darklaf/ui/colorchooser/DarkColorChooserPanel.java
  6. 1
      src/main/java/com/weis/darklaf/ui/tabbedpane/DarkTabbedPaneUI.java
  7. 14
      src/main/java/com/weis/darklaf/ui/tooltip/DarkTooltipBorder.java
  8. 3
      src/main/java/com/weis/darklaf/ui/tooltip/DarkTooltipUI.java
  9. 1
      src/main/resources/com/weis/darklaf/theme/darcula/darcula_defaults.properties
  10. 3
      src/main/resources/com/weis/darklaf/theme/intellij/intellij_defaults.properties
  11. 25
      src/main/resources/com/weis/darklaf/theme/intellij/intellij_ui.properties
  12. 3
      src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_defaults.properties
  13. 30
      src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_styleSheet.css
  14. 25
      src/main/resources/com/weis/darklaf/theme/solarized_dark/solarized_dark_ui.properties
  15. 169
      src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_defaults.properties
  16. 2
      src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_styleSheet.css
  17. 27
      src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_ui.properties
  18. 1
      src/test/java/ToolTipDemo.java

4
src/main/java/com/weis/darklaf/LafManager.java

@ -24,7 +24,7 @@
package com.weis.darklaf; package com.weis.darklaf;
import com.weis.darklaf.theme.DarculaTheme; 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 com.weis.darklaf.theme.Theme;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -80,7 +80,7 @@ public final class LafManager {
*/ */
public static Theme getTheme() { public static Theme getTheme() {
if (theme == null) { if (theme == null) {
theme = new SolarizedDarkTheme(); theme = new IntelliJTheme();
} }
return theme; return theme;
} }

7
src/main/java/com/weis/darklaf/theme/IntelliJTheme.java

@ -34,4 +34,11 @@ public class IntelliJTheme extends Theme {
public String getName() { public String getName() {
return "intellij"; 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);
}
} }

12
src/main/java/com/weis/darklaf/theme/SolarizedDarkTheme.java

@ -23,6 +23,11 @@
*/ */
package com.weis.darklaf.theme; package com.weis.darklaf.theme;
import com.weis.darklaf.util.PropertyLoader;
import javax.swing.*;
import java.util.Properties;
public class SolarizedDarkTheme extends Theme { public class SolarizedDarkTheme extends Theme {
@Override @Override
@ -39,4 +44,11 @@ public class SolarizedDarkTheme extends Theme {
public boolean isDark() { public boolean isDark() {
return true; 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);
}
} }

19
src/main/java/com/weis/darklaf/theme/SolarizedLightTheme.java

@ -23,12 +23,12 @@
*/ */
package com.weis.darklaf.theme; package com.weis.darklaf.theme;
public class SolarizedLightTheme extends Theme { import com.weis.darklaf.util.PropertyLoader;
@Override import javax.swing.*;
public void beforeInstall() { import java.util.Properties;
throw new UnsupportedThemeException("Currently not finished");
} public class SolarizedLightTheme extends Theme {
@Override @Override
protected String getResourcePath() { protected String getResourcePath() {
@ -40,8 +40,15 @@ public class SolarizedLightTheme extends Theme {
return "solarized_light"; 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 @Override
public boolean isDark() { public boolean isDark() {
return true; return false;
} }
} }

26
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.*;
import javax.swing.colorchooser.AbstractColorChooserPanel; import javax.swing.colorchooser.AbstractColorChooserPanel;
import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorEvent;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import java.awt.*; import java.awt.*;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
@ -181,10 +183,26 @@ public class DarkColorChooserPanel extends AbstractColorChooserPanel implements
} }
}); });
} else { } else {
field.addPropertyChangeListener(e -> { field.getDocument().addDocumentListener(new DocumentListener() {
if ("value".equals(e.getPropertyName())) { @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; if (isChanging) return;
var hexStr = e.getNewValue().toString(); System.out.println("here");
var hexStr = String.format("%1$-" + 8 + "s", field.getText()).replaceAll(" ", "F");
var alpha = isColorTransparencySelectionEnabled() var alpha = isColorTransparencySelectionEnabled()
? Integer.valueOf(hexStr.substring(6, 8), 16) : 255; ? Integer.valueOf(hexStr.substring(6, 8), 16) : 255;
var c = new Color( var c = new Color(
@ -192,7 +210,9 @@ public class DarkColorChooserPanel extends AbstractColorChooserPanel implements
Integer.valueOf(hexStr.substring(2, 4), 16), Integer.valueOf(hexStr.substring(2, 4), 16),
Integer.valueOf(hexStr.substring(4, 6), 16), Integer.valueOf(hexStr.substring(4, 6), 16),
alpha); alpha);
System.out.println(c);
colorWheelPanel.setColor(c, textHex); colorWheelPanel.setColor(c, textHex);
} catch (NumberFormatException | IndexOutOfBoundsException ignore) {}
} }
}); });
} }

1
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) { protected void paintTabAreaBackground(@NotNull final Graphics g, final int tabPlacement) {
g.setColor(getTabAreaBackground()); g.setColor(getTabAreaBackground());
g.setColor(Color.RED);
var b = getTabAreaBounds(); var b = getTabAreaBounds();
if (scrollableTabLayoutEnabled()) { if (scrollableTabLayoutEnabled()) {
b.setLocation(0, 0); b.setLocation(0, 0);

14
src/main/java/com/weis/darklaf/ui/tooltip/DarkTooltipBorder.java

@ -55,6 +55,8 @@ public class DarkTooltipBorder implements Border, UIResource {
return; return;
} }
if (c instanceof JToolTip && ((JToolTip) c).getTipText() == null) 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); var ins = shadowBorder.getBorderInsets(c);
adjustInsets(ins); adjustInsets(ins);
var bubbleArea = bubbleBorder.getInnerArea(x + ins.left, y + ins.top, 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 bw = bubbleBorder.getThickness();
int off = 0; int off = 0;
var pointerSide = bubbleBorder.getPointerSide(); 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(); off = bubbleBorder.getPointerSize();
} }
shadowBorder.paintBorder(c, g, x + bw, y + bw + off, width - 2 * bw, height - 2 * bw - off); 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.right = Math.max(bi.right, si.right);
ins.top = Math.max(bi.top, si.top); ins.top = Math.max(bi.top, si.top);
var uIns = getUserInsets(c); var uIns = getUserInsets(c);
ins.left += 5 + si.left + uIns.left; ins.left += 5 + uIns.left;
ins.top += 2 + si.top + uIns.top; ins.top += 2 + uIns.top;
ins.right += 5 + si.right + uIns.right; ins.right += 5 + uIns.right;
ins.bottom += 2 + si.bottom + uIns.bottom; ins.bottom += 2 + uIns.bottom;
return ins; return ins;
} }

3
src/main/java/com/weis/darklaf/ui/tooltip/DarkTooltipUI.java

@ -112,14 +112,17 @@ public class DarkTooltipUI extends BasicToolTipUI implements PropertyChangeListe
} else { } else {
border.setPointerLocation(Alignment.CENTER); border.setPointerLocation(Alignment.CENTER);
} }
tooltip.setComponent(tooltip.getComponent());
} else if ("JToolTip.pointerHeight".equals(key)) { } else if ("JToolTip.pointerHeight".equals(key)) {
if (newVal instanceof Integer) { if (newVal instanceof Integer) {
border.setPointerHeight((Integer) newVal); border.setPointerHeight((Integer) newVal);
} }
tooltip.setComponent(tooltip.getComponent());
} else if ("JToolTip.pointerWidth".equals(key)) { } else if ("JToolTip.pointerWidth".equals(key)) {
if (newVal instanceof Integer) { if (newVal instanceof Integer) {
border.setPointerWidth((Integer) newVal); border.setPointerWidth((Integer) newVal);
} }
tooltip.setComponent(tooltip.getComponent());
} }
} }
} }

1
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, #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 #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
#SOFTWARE. #SOFTWARE.
#
# suppress inspection "UnusedProperty" for whole file # suppress inspection "UnusedProperty" for whole file
####Background#### ####Background####
%background = 3c3f41 %background = 3c3f41

3
src/main/resources/com/weis/darklaf/theme/intellij/intellij_defaults.properties

@ -22,6 +22,7 @@
# SOFTWARE. # SOFTWARE.
# #
# suppress inspection "UnusedProperty" for whole file # suppress inspection "UnusedProperty" for whole file
####Background####
%background = F2F2F2 %background = F2F2F2
%backgroundAlternative = F2F5F9 %backgroundAlternative = F2F5F9
%backgroundColorful = E6EBF0 %backgroundColorful = E6EBF0
@ -120,7 +121,7 @@
%hyperlink = 589df6 %hyperlink = 589df6
####Misc#### ####Misc####
%shadow = 808080 %shadow = 000000
%glowFocus = 3d94f2 %glowFocus = 3d94f2
%glowFocusLine = 7B9FC7 %glowFocusLine = 7B9FC7

25
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

3
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, #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 #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
#SOFTWARE. #SOFTWARE.
#
# suppress inspection "UnusedProperty" for whole file # suppress inspection "UnusedProperty" for whole file
####Background#### ####Background####
%background = 0E3C4A %background = 0E3C4A
@ -44,7 +45,7 @@
%borderSecondary = 11333C %borderSecondary = 11333C
%borderTertiary = 5B5D5F %borderTertiary = 5B5D5F
%borderFocus = 1D8AD1 %borderFocus = 1D8AD1
%gridLine = 093640 %gridLine = 254E5A
####Highlight#### ####Highlight####
%hoverHighlight = 264F5B %hoverHighlight = 264F5B

30
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"); * Copyright (c) 2019 Jannis Weis
* 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 * 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 * The above copyright notice and this permission notice shall be included in all
* distributed under the License is distributed on an "AS IS" BASIS, * copies or substantial portions of the Software.
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. *
* See the License for the specific language governing permissions and * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* limitations under the License. * 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 { body {
font-size: 14pt; font-size: 14pt;
@ -19,7 +27,7 @@ body {
font-weight: normal; font-weight: normal;
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
color: #bbbbbb; color: #A7B6BA;
} }
p { p {

25
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

169
src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_defaults.properties

@ -1,3 +1,4 @@
#
# MIT License # MIT License
# #
# Copyright (c) 2019 Jannis Weis # Copyright (c) 2019 Jannis Weis
@ -19,118 +20,118 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # 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 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
#
# suppress inspection "UnusedProperty" for whole file # suppress inspection "UnusedProperty" for whole file
####Background#### ####Background####
%background = 3c3f41 %background = EEE8D5
%backgroundAlternative = 414547 %backgroundAlternative = F0EBDB
%backgroundColorful = 3B4754 %backgroundColorful = DEDDD1
%backgroundContainer = 3c3f41 %backgroundContainer = FDF6E3
%backgroundHeader = 45484a %backgroundHeader = FDF6E3
%backgroundToolTip = 4b4d4d %backgroundToolTip = F5F1E5
%backgroundHover = 27292a %backgroundHover = D7D1BF
%backgroundSelected = 4e5254 %backgroundSelected = FAF3E0
%backgroundHoverSecondary = 353739 %backgroundHoverSecondary = D7D1BE
%backgroundSelectedSecondary = 2d2f30 %backgroundSelectedSecondary = BCB6A4
%backgroundHoverColorful = 262D36 %backgroundHoverColorful = C8C7BC
%backgroundSelectedColorful = 313A45 %backgroundSelectedColorful = E6E5DC
%dropBackground = 4b4b4b %dropBackground = F3EDDC
%dropForeground = 999999 %dropForeground = 617EB3
####Border#### ####Border####
%border = 555555 %border = C9C3B3
%borderSecondary = 333638 %borderSecondary = C6C1B1
%borderTertiary = 5b5d5f %borderTertiary = A0A0A0
%borderFocus = 79c0ff %borderFocus = 248AD4
%gridLine = 4f5152 %gridLine = F5EEDC
####Highlight#### ####Highlight####
%hoverHighlight = 4c5052 %hoverHighlight = DBD6C4
%clickHighlight = 5c6164 %clickHighlight = CCC6B6
%hoverHighlightColorful = 2F3A45 %hoverHighlightColorful = E6E5DC
%clickHighlightColorful = 2B353F %clickHighlightColorful = EEEEE8
%hoverHighlightDefault = 406086 %hoverHighlightDefault = 548BC0
%clickHighlightDefault = 4a688c %clickHighlightDefault = 6395C6
%hoverHighlightSecondary = 333537 %hoverHighlightSecondary = E2DBC9
%clickHighlightSecondary = 2a2b2d %clickHighlightSecondary = E9E4d6
%highlightFill = 0d293e %highlightFill = D2CBB9
%highlightFillFocus = 4b6eaf %highlightFillFocus = 3570CD
%highlightFillFocusSecondary = 4A88C7 %highlightFillFocusSecondary = 3D7EC0
%highlightFillMono = 747a80 %highlightFillMono = 99A1A5
####Widgets#### ####Widgets####
%widgetBorder = 6b6b6b %widgetBorder = BAB5A7
%widgetBorderInactive = 535353 %widgetBorderInactive = CCC6B6
%widgetBorderDefault = 4c708c %widgetBorderDefault = 4474B1
%widgetFill = 43494a %widgetFill = FDF6E3
%widgetFillSelected = 43494a %widgetFillSelected = 4984BE
%widgetFillInactive = 3c3f41 %widgetFillInactive = EEE8D5
%widgetFillDefault = 365880 %widgetFillDefault = 4681BB
####Controls#### ####Controls####
%controlBorder = 6b6b6b %controlBorder = BDB8AA
%controlBorderDisabled = 545556 %controlBorderDisabled = CCC6B6
%controlBorderSelected = 6B6B6B %controlBorderSelected = 4984BE
%controlBorderFocus = 466D94 %controlBorderFocus = 86ABCB
%controlBorderFocusSelected = 466D94 %controlBorderFocusSelected = 86ABCB
%controlBorderSecondary = 424242 %controlBorderSecondary = D0CBBD
%controlFill = A0A0A0 %controlFill = FFFFFF
%controlFillFocus = A0A0A0 %controlFillFocus = FFFFFF
%controlFillSecondary = A0A0A0 %controlFillSecondary = 6B8086
%controlTrack = 636869 %controlTrack = dacaa1
%controlFillDisabled = 606060 %controlFillDisabled = 839496
%controlFillHighlight = 5394ec %controlFillHighlight = 4681BB
%controlFillHighlightDisabled = 475b81 %controlFillHighlightDisabled = D2CBB9
%controlBackground = 555555 %controlBackground = C3BEAF
%controlFadeStart = 696969 %controlFadeStart = C3BEAF
%controlFadeEnd = 838383 %controlFadeEnd = 6B8086
%controlErrorFadeStart = e74848 %controlErrorFadeStart = D14943
%controlErrorFadeEnd = f4a2a0 %controlErrorFadeEnd = F6887C
%controlPassedFadeStart = 008f50 %controlPassedFadeStart = 2DAA66
%controlPassedFadeEnd = 5dc48f %controlPassedFadeEnd = 77DF92
####Text#### ####Text####
%caret = bbbbbb %caret = 2E4E58
%textForeground = bbbbbb %textForeground = 2E4E58
%textForegroundDefault = bbbbbb %textForegroundDefault = FFFFFF
%textForegroundHighlight = DDDDDD %textForegroundHighlight = 002B36
%textForegroundInactive = 777777 %textForegroundInactive = 657b83
%textForegroundSecondary = 919191 %textForegroundSecondary = 586e75
%acceleratorForeground = eeeeee %acceleratorForeground = 617EB3
%textSelectionForeground = bbbbbb %textSelectionForeground = FFFFFF
%textSelectionForegroundInactive = bbbbbb %textSelectionForegroundInactive = 2E4E58
%textSelectionBackground = 214283 %textSelectionBackground = 3570CD
#currentLineBackground #currentLineBackground
%textSelectionBackgroundSecondary = 323232 %textSelectionBackgroundSecondary = F3EDDC
%textBackground = 45494a %textBackground = FDF6E3
%textBackgroundInactive = 3c3f41 %textBackgroundInactive = EEE8D5
%textBackgroundSecondary = 2B2B2B %textBackgroundSecondary = 002B36
#Editor number pane #Editor number pane
%textBackgroundSecondaryInactive = 313335 %textBackgroundSecondaryInactive = EEE8D5
%hyperlink = 589df6 %hyperlink = 589df6
####Misc#### ####Misc####
#Todo Line Colors
%shadow = 000000 %shadow = 000000
%glowFocus = 3e84c9 %glowFocus = 3b93eb
%glowFocusLine = 466D94 %glowFocusLine = A5C7E2
%glowError = cf6767 %glowError = E8B4A6
%glowErrorLine = 73454B %glowErrorLine = DE3641
%glowFocusError = c2413c %glowFocusError = DE3641
%glowFocusErrorLine = 73454B %glowFocusErrorLine = DE3641
%glowWarning = ac7920 %glowWarning = DC9E2F
%glowWarningLine = 6e5324 %glowWarningLine = F6CA7C
#Arc #Arc
%arc = 5 %arc = 5
@ -139,4 +140,4 @@
%arcSecondaryFocus = 3 %arcSecondaryFocus = 3
%borderThickness = 3 %borderThickness = 3
%shadowHeight = 3 %shadowHeight = 2

2
src/main/resources/com/weis/darklaf/theme/solarized_light/solarized_light_styleSheet.css

@ -27,7 +27,7 @@ body {
font-weight: normal; font-weight: normal;
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
color: #000000; color: #2E4E58;
} }
p { p {

27
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

1
src/test/java/ToolTipDemo.java

@ -19,6 +19,7 @@ public class ToolTipDemo {
{ {
setToolTipText("ToolTip \n multiline \n third line's a charm"); setToolTipText("ToolTip \n multiline \n third line's a charm");
// setToolTipText("ToolTip");
} }
@Override @Override

Loading…
Cancel
Save