ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #3046 from SRLJustin/green-tint

Browse Source
This commit is contained in:
Owain van Brakel
2021-10-06 15:53:54 +02:00
committed by GitHub
parent 7643e158ee 9aad812df9
commit e70f4047b2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/runelite-client.gradle.kts
View File

@@ -66,7 +66,7 @@ dependencies {
implementation(group = "net.java.dev.jna", name = "jna", version = "5.9.0") implementation(group = "net.java.dev.jna", name = "jna", version = "5.9.0")
implementation(group = "net.java.dev.jna", name = "jna-platform", version = "5.9.0") implementation(group = "net.java.dev.jna", name = "jna-platform", version = "5.9.0")
implementation(group = "net.runelite", name = "discord", version = "1.4") implementation(group = "net.runelite", name = "discord", version = "1.4")
implementation(group = "org.pushing-pixels", name = "radiance-substance", version = "4.0.0") implementation(group = "net.runelite.pushingpixels", name = "substance", version = "8.0.02")
implementation(group = "net.sf.jopt-simple", name = "jopt-simple", version = "5.0.4") implementation(group = "net.sf.jopt-simple", name = "jopt-simple", version = "5.0.4")
implementation(group = "org.madlonkay", name = "desktopsupport", version = "0.6.0") implementation(group = "org.madlonkay", name = "desktopsupport", version = "0.6.0")
implementation(group = "org.apache.commons", name = "commons-text", version = "1.9") implementation(group = "org.apache.commons", name = "commons-text", version = "1.9")

5
runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java
View File

@@ -59,7 +59,7 @@ public class ObsidianSkin extends SubstanceSkin
ObsidianSkin() ObsidianSkin()
{ {
final SubstanceSkin.ColorSchemes schemes = SubstanceSkin final SubstanceSkin.ColorSchemes schemes = SubstanceSkin
.getColorSchemes(getClass().getResourceAsStream(NAME + ".colorschemes")); .getColorSchemes(getClass().getResource(NAME + ".colorschemes"));
final SubstanceColorScheme activeScheme = schemes.get("RuneLite Active"); final SubstanceColorScheme activeScheme = schemes.get("RuneLite Active");
final SubstanceColorScheme enabledScheme = schemes.get("RuneLite Enabled"); final SubstanceColorScheme enabledScheme = schemes.get("RuneLite Enabled");
@@ -119,7 +119,7 @@ public class ObsidianSkin extends SubstanceSkin
.get("RuneLite Decorations Watermark"); .get("RuneLite Decorations Watermark");
this.registerDecorationAreaSchemeBundle(decorationsSchemeBundle, decorationsWatermarkScheme, this.registerDecorationAreaSchemeBundle(decorationsSchemeBundle, decorationsWatermarkScheme,
DecorationAreaType.TOOLBAR, DecorationAreaType.CONTROL_PANE, DecorationAreaType.FOOTER); DecorationAreaType.TOOLBAR, DecorationAreaType.GENERAL, DecorationAreaType.FOOTER);
final SubstanceColorSchemeBundle headerSchemeBundle = new SubstanceColorSchemeBundle(activeScheme, final SubstanceColorSchemeBundle headerSchemeBundle = new SubstanceColorSchemeBundle(activeScheme,
enabledScheme, enabledScheme); enabledScheme, enabledScheme);
@@ -184,6 +184,7 @@ public class ObsidianSkin extends SubstanceSkin
} }
}; };
this.watermark = null;
this.fillPainter = new FractionBasedFillPainter("RuneLite", this.fillPainter = new FractionBasedFillPainter("RuneLite",
new float[]{0.0f, 0.5f, 1.0f}, new float[]{0.0f, 0.5f, 1.0f},
new ColorSchemeSingleColorQuery[]{ColorSchemeSingleColorQuery.ULTRALIGHT, new ColorSchemeSingleColorQuery[]{ColorSchemeSingleColorQuery.ULTRALIGHT,

3
runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
View File

@@ -62,7 +62,6 @@ import net.runelite.client.ui.ColorScheme;
import net.runelite.client.ui.NavigationButton; import net.runelite.client.ui.NavigationButton;
import net.runelite.client.ui.components.CustomScrollBarUI; import net.runelite.client.ui.components.CustomScrollBarUI;
import net.runelite.client.ui.components.SliderUI; import net.runelite.client.ui.components.SliderUI;
import org.pushingpixels.substance.api.SubstanceSlices;
import org.pushingpixels.substance.internal.SubstanceSynapse; import org.pushingpixels.substance.internal.SubstanceSynapse;
/** /**
@@ -218,7 +217,7 @@ public class SwingUtil
button.setSize(scaledImage.getWidth(), scaledImage.getHeight()); button.setSize(scaledImage.getWidth(), scaledImage.getHeight());
button.setToolTipText(navigationButton.getTooltip()); button.setToolTipText(navigationButton.getTooltip());
button.setIcon(new ImageIcon(scaledImage)); button.setIcon(new ImageIcon(scaledImage));
button.putClientProperty(SubstanceSynapse.BACKGROUND_APPEARANCE_STRATEGY, SubstanceSlices.BackgroundAppearanceStrategy.FLAT); button.putClientProperty(SubstanceSynapse.FLAT_LOOK, Boolean.TRUE);
button.setFocusable(false); button.setFocusable(false);
button.addActionListener(e -> button.addActionListener(e ->
{ {