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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2020-05-21 18:30:38 +02:00
parent 4e08497552 63eab81d11
commit d33aff6a41
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
runelite-client/src/main/java/net/runelite/client/ui/overlay/components/BackgroundComponent.java
View File

@@ -39,16 +39,10 @@ import net.runelite.client.ui.overlay.RenderableEntity;
public class BackgroundComponent implements RenderableEntity public class BackgroundComponent implements RenderableEntity
{ {
private static final int BORDER_OFFSET = 2; private static final int BORDER_OFFSET = 2;
private static final float COLOR_OFFSET = 0.2f;
private static final int OUTSIDE_STROKE_RED_OFFSET = 14; private static final float OUTER_COLOR_OFFSET = 1 - COLOR_OFFSET;
private static final int OUTSIDE_STROKE_GREEN_OFFSET = 13; private static final float INNER_COLOR_OFFSET = 1 + COLOR_OFFSET;
private static final int OUTSIDE_STROKE_BLUE_OFFSET = 15; private static final float ALPHA_COLOR_OFFSET = 1 + 2 * COLOR_OFFSET;
private static final int OUTSIDE_STROKE_ALPHA = 255;
private static final int INSIDE_STROKE_RED_OFFSET = 20;
private static final int INSIDE_STROKE_GREEN_OFFSET = 21;
private static final int INSIDE_STROKE_BLUE_OFFSET = 19;
private static final int INSIDE_STROKE_ALPHA = 255;
private Color backgroundColor = ComponentConstants.STANDARD_BACKGROUND_COLOR; private Color backgroundColor = ComponentConstants.STANDARD_BACKGROUND_COLOR;
private Rectangle rectangle = new Rectangle(); private Rectangle rectangle = new Rectangle();
@@ -58,17 +52,17 @@ public class BackgroundComponent implements RenderableEntity
public Dimension render(Graphics2D graphics) public Dimension render(Graphics2D graphics)
{ {
Color outsideStrokeColor = new Color( Color outsideStrokeColor = new Color(
Math.max(0, backgroundColor.getRed() - OUTSIDE_STROKE_RED_OFFSET), (int) (backgroundColor.getRed() * OUTER_COLOR_OFFSET),
Math.max(0, backgroundColor.getGreen() - OUTSIDE_STROKE_GREEN_OFFSET), (int) (backgroundColor.getGreen() * OUTER_COLOR_OFFSET),
Math.max(0, backgroundColor.getBlue() - OUTSIDE_STROKE_BLUE_OFFSET), (int) (backgroundColor.getBlue() * OUTER_COLOR_OFFSET),
OUTSIDE_STROKE_ALPHA Math.min(255, (int) (backgroundColor.getAlpha() * ALPHA_COLOR_OFFSET))
); );
Color insideStrokeColor = new Color( Color insideStrokeColor = new Color(
Math.min(255, backgroundColor.getRed() + INSIDE_STROKE_RED_OFFSET), Math.min(255, (int) (backgroundColor.getRed() * INNER_COLOR_OFFSET)),
Math.min(255, backgroundColor.getGreen() + INSIDE_STROKE_GREEN_OFFSET), Math.min(255, (int) (backgroundColor.getGreen() * INNER_COLOR_OFFSET)),
Math.min(255, backgroundColor.getBlue() + INSIDE_STROKE_BLUE_OFFSET), Math.min(255, (int) (backgroundColor.getBlue() * INNER_COLOR_OFFSET)),
INSIDE_STROKE_ALPHA Math.min(255, (int) (backgroundColor.getAlpha() * ALPHA_COLOR_OFFSET))
); );
// Render background // Render background