feat(theme): adjust color and size parameters in pattern renderers for improved visuals
This commit is contained in:
@@ -33,7 +33,7 @@ public class BevelPatternRenderer implements PatternRenderer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Outer bevel (raised)
|
// Outer bevel (raised)
|
||||||
drawBevel(g2d, x, y, width, height, strength, true, light, dark);
|
drawBevel(g2d, x, y, width, height, strength + 1, true, light, dark);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ public class DreamPatternRenderer implements PatternRenderer {
|
|||||||
final var arc = Math.max(6, s * 6);
|
final var arc = Math.max(6, s * 6);
|
||||||
|
|
||||||
g2d.setColor(backgroundColor);
|
g2d.setColor(backgroundColor);
|
||||||
g2d.fillRoundRect(x + s, y + s, Math.max(0, width - s * 2), Math.max(0, height - s * 2), arc, arc);
|
g2d.fillRoundRect(x - s, y - s, Math.max(0, width + s * 2), Math.max(0, height + s * 2), arc, arc);
|
||||||
|
|
||||||
this.drawDecorativeBorder(g2d, x, y, width, height, s, borderColor);
|
this.drawDecorativeBorder(g2d, x, y, width, height, s, borderColor);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -88,13 +88,13 @@ public class FantasyPatternRenderer implements PatternRenderer {
|
|||||||
|
|
||||||
final Color fg;
|
final Color fg;
|
||||||
if (pressed) {
|
if (pressed) {
|
||||||
fg = theme.getTextNormal().toColor();
|
fg = theme.getSelectionSecondary().toColor();
|
||||||
}
|
}
|
||||||
else if (highlight) {
|
else if (highlight) {
|
||||||
fg = Color.BLACK;
|
fg = theme.getTextNormal().toColor();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
fg = theme.getTextDisabled().toColor();
|
fg = theme.getTextNormal().toColor();
|
||||||
}
|
}
|
||||||
g2d.setColor(fg);
|
g2d.setColor(fg);
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ public class UrbanPatternRenderer implements PatternRenderer {
|
|||||||
public void drawDecorativeBorderFilled(final Graphics2D g2d, final int x, final int y, final int width, final int height, final int strength, final Color borderColor, final Color backgroundColor) {
|
public void drawDecorativeBorderFilled(final Graphics2D g2d, final int x, final int y, final int width, final int height, final int strength, final Color borderColor, final Color backgroundColor) {
|
||||||
final var s = Math.max(1, strength);
|
final var s = Math.max(1, strength);
|
||||||
g2d.setColor(backgroundColor);
|
g2d.setColor(backgroundColor);
|
||||||
g2d.fillRect(x + s, y + s, Math.max(0, width - s * 2), Math.max(0, height - s * 2));
|
g2d.fillRect(x - s, y - s, Math.max(0, width + s * 2), Math.max(0, height + s * 2));
|
||||||
this.drawDecorativeBorder(g2d, x, y, width, height, s, borderColor);
|
this.drawDecorativeBorder(g2d, x, y, width, height, s, borderColor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,11 +13,11 @@ public class UrbanThemeFactoryBean implements FactoryBean<Theme> {
|
|||||||
.borderInner(new HSBColor(0.58f, 0.06f, 0.72f))
|
.borderInner(new HSBColor(0.58f, 0.06f, 0.72f))
|
||||||
.borderInnerDisabled(new HSBColor(0.58f, 0.04f, 0.22f))
|
.borderInnerDisabled(new HSBColor(0.58f, 0.04f, 0.22f))
|
||||||
.backgroundNormal(new HSBColor(0.58f, 0.22f, 0.16f))
|
.backgroundNormal(new HSBColor(0.58f, 0.22f, 0.16f))
|
||||||
.backgroundSelected(new HSBColor(0.03f, 0.80f, 0.78f))
|
.backgroundSelected(new HSBColor(0.03f, 0.08f, 0.78f))
|
||||||
.textNormal(new HSBColor(0.00f, 0.00f, 0.94f))
|
.textNormal(new HSBColor(0.00f, 0.00f, 0.94f))
|
||||||
.textDisabled(new HSBColor(0.00f, 0.00f, 0.62f))
|
.textDisabled(new HSBColor(0.00f, 0.00f, 0.62f))
|
||||||
.selectionPrimary(new HSBColor(0.03f, 0.80f, 0.78f))
|
.selectionPrimary(new HSBColor(0.03f, 0.08f, 0.78f))
|
||||||
.selectionSecondary(new HSBColor(0.48f, 0.65f, 0.88f))
|
.selectionSecondary(new HSBColor(0.48f, 0.08f, 0.88f))
|
||||||
.windowBackground(new HSBColor(0.58f, 0.28f, 0.09f))
|
.windowBackground(new HSBColor(0.58f, 0.28f, 0.09f))
|
||||||
.hoverBrightnessAdjustment(0.18f)
|
.hoverBrightnessAdjustment(0.18f)
|
||||||
.pressedBrightnessAdjustment(0.32f)
|
.pressedBrightnessAdjustment(0.32f)
|
||||||
|
|||||||
Reference in New Issue
Block a user