Skip to content

Commit

Permalink
Consistent color of tabbed pane content border
Browse files Browse the repository at this point in the history 
For #389
  • Loading branch information
@kirill-grouchnikov
kirill-grouchnikov committed Jun 18, 2022
1 parent 51f798e commit d8e8c40
Showing 1 changed file with 32 additions and 28 deletions.
60 changes: 32 additions & 28 deletions ...ng/src/main/java/org/pushingpixels/radiance/theming/internal/ui/RadianceTabbedPaneUI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1721,9 +1721,10 @@ protected void paintContentBorderBottomEdge(Graphics g, int tabPlacement, int se
RadianceColorScheme borderScheme = RadianceColorSchemeUtilities.getColorScheme(
this.tabPane, selectedIndex, RadianceThemingSlices.ColorSchemeAssociationKind.TAB_BORDER,
ComponentState.SELECTED);
Color darkShadowColor = RadianceColorUtilities.getMidBorderColor(borderScheme);
Color lineColor = RadianceCoreUtilities.getBorderPainter(this.tabPane)
.getRepresentativeColor(borderScheme);
if (isUnbroken) {
g2d.setColor(this.highlight);
g2d.setColor(lineColor);
g2d.drawLine(x, y + h - 1, x + w, y + h - 1);
} else {
// Break line to show visual connection to selected tab
Expand All @@ -1742,25 +1743,25 @@ protected void paintContentBorderBottomEdge(Graphics g, int tabPlacement, int se
bottomOutline.lineTo(selectionEndX, y + h - 1);
bottomOutline.lineTo(x + w, y + h - 1);
}
g2d.setPaint(new GradientPaint(x, y + h - 1, darkShadowColor, x, y + h - 1 + bumpHeight,
RadianceColorUtilities.getAlphaColor(darkShadowColor, 0)));
g2d.setPaint(new GradientPaint(x, y + h - 1, lineColor, x, y + h - 1 + bumpHeight,
RadianceColorUtilities.getAlphaColor(lineColor, 0)));
g2d.draw(bottomOutline);
}

if (isDouble) {
if (tabPlacement == BOTTOM) {
g2d.setColor(this.highlight);
g2d.setColor(darkShadowColor);
g2d.setColor(lineColor);
g2d.drawLine(x, y + h - 1 - ribbonDelta, x + w, y + h - 1 - ribbonDelta);
}
if (tabPlacement == LEFT) {
g2d.setPaint(new GradientPaint(x, y + h - 1, darkShadowColor, x + 4 * ribbonDelta,
g2d.setPaint(new GradientPaint(x, y + h - 1, lineColor, x + 4 * ribbonDelta,
y + h - 1, this.highlight));
g2d.drawLine(x, y + h - 1, x + 4 * ribbonDelta, y + h - 1);
}
if (tabPlacement == RIGHT) {
g2d.setPaint(new GradientPaint(x + w - 1 - 4 * ribbonDelta, y + h - 1,
this.highlight, x + w - 1, y + h - 1, darkShadowColor));
this.highlight, x + w - 1, y + h - 1, lineColor));
g2d.drawLine(x + w - 1 - 4 * ribbonDelta, y + h - 1, x + w - 1, y + h - 1);
}
}
Expand Down Expand Up @@ -1804,9 +1805,10 @@ protected void paintContentBorderLeftEdge(Graphics g, int tabPlacement, int sele
RadianceColorScheme borderScheme = RadianceColorSchemeUtilities.getColorScheme(
this.tabPane, selectedIndex, RadianceThemingSlices.ColorSchemeAssociationKind.TAB_BORDER,
ComponentState.SELECTED);
Color darkShadowColor = RadianceColorUtilities.getMidBorderColor(borderScheme);
Color lineColor = RadianceCoreUtilities.getBorderPainter(this.tabPane)
.getRepresentativeColor(borderScheme);
if (isUnbroken) {
g2d.setColor(this.highlight);
g2d.setColor(lineColor);
g2d.drawLine(x, y, x, y + h);
} else {
// Break line to show visual connection to selected tab
Expand All @@ -1826,28 +1828,28 @@ protected void paintContentBorderLeftEdge(Graphics g, int tabPlacement, int sele
leftOutline.lineTo(x, selectionEndY);
leftOutline.lineTo(x, y + h);
}
g2d.setPaint(new GradientPaint(x, y, darkShadowColor, x - bumpWidth, y,
RadianceColorUtilities.getAlphaColor(darkShadowColor, 0)));
g2d.setPaint(new GradientPaint(x, y, lineColor, x - bumpWidth, y,
RadianceColorUtilities.getAlphaColor(lineColor, 0)));
g2d.draw(leftOutline);
}

if (isDouble) {
if (tabPlacement == LEFT) {
g2d.setColor(darkShadowColor);
g2d.setColor(lineColor);
g2d.drawLine(x + ribbonDelta, y, x + ribbonDelta, y + h);
// g2d.setColor(this.highlight);
// g2d.drawLine(x + 1 + ribbonDelta, y + 1, x + 1 + ribbonDelta,
// y +
// h - 1);
}
if (tabPlacement == TOP) {
g2d.setPaint(new GradientPaint(x, y, darkShadowColor, x, y + 4 * ribbonDelta,
g2d.setPaint(new GradientPaint(x, y, lineColor, x, y + 4 * ribbonDelta,
this.highlight));
g2d.drawLine(x, y, x, y + 4 * ribbonDelta);
}
if (tabPlacement == BOTTOM) {
g2d.setPaint(new GradientPaint(x, y + h - 1 - 4 * ribbonDelta, this.highlight, x,
y + h - 1, darkShadowColor));
y + h - 1, lineColor));
g2d.drawLine(x, y + h - 1 - 4 * ribbonDelta, x, y + h - 1);
}
}
Expand Down Expand Up @@ -1890,9 +1892,10 @@ protected void paintContentBorderRightEdge(Graphics g, int tabPlacement, int sel
RadianceColorScheme borderScheme = RadianceColorSchemeUtilities.getColorScheme(
this.tabPane, selectedIndex, RadianceThemingSlices.ColorSchemeAssociationKind.TAB_BORDER,
ComponentState.SELECTED);
Color darkShadowColor = RadianceColorUtilities.getMidBorderColor(borderScheme);
Color lineColor = RadianceCoreUtilities.getBorderPainter(this.tabPane)
.getRepresentativeColor(borderScheme);
if (isUnbroken) {
g2d.setColor(this.highlight);
g2d.setColor(lineColor);
g2d.drawLine(x + w - 1, y, x + w - 1, y + h);
} else {
// Break line to show visual connection to selected tab
Expand All @@ -1912,8 +1915,8 @@ protected void paintContentBorderRightEdge(Graphics g, int tabPlacement, int sel
rightOutline.lineTo(x + w - 1, selectionEndY);
rightOutline.lineTo(x + w - 1, y + h);
}
g2d.setPaint(new GradientPaint(x + w - 1, y, darkShadowColor, x + w - 1 + bumpWidth, y,
RadianceColorUtilities.getAlphaColor(darkShadowColor, 0)));
g2d.setPaint(new GradientPaint(x + w - 1, y, lineColor, x + w - 1 + bumpWidth, y,
RadianceColorUtilities.getAlphaColor(lineColor, 0)));
g2d.draw(rightOutline);
}

Expand All @@ -1922,17 +1925,17 @@ protected void paintContentBorderRightEdge(Graphics g, int tabPlacement, int sel
g2d.setColor(this.highlight);
// g2d.drawLine(x + w - 2 - ribbonDelta, y + 1, x + w - 2 -
// ribbonDelta, y + h - 1);
g2d.setColor(darkShadowColor);
g2d.setColor(lineColor);
g2d.drawLine(x + w - 1 - ribbonDelta, y, x + w - 1 - ribbonDelta, y + h);
}
if (tabPlacement == TOP) {
g2d.setPaint(new GradientPaint(x + w - 1, y, darkShadowColor, x + w - 1,
g2d.setPaint(new GradientPaint(x + w - 1, y, lineColor, x + w - 1,
y + 4 * ribbonDelta, this.highlight));
g2d.drawLine(x + w - 1, y, x + w - 1, y + 4 * ribbonDelta);
}
if (tabPlacement == BOTTOM) {
g2d.setPaint(new GradientPaint(x + w - 1, y + h - 1 - 4 * ribbonDelta,
this.highlight, x + w - 1, y + h - 1, darkShadowColor));
this.highlight, x + w - 1, y + h - 1, lineColor));
g2d.drawLine(x + w - 1, y + h - 1 - 4 * ribbonDelta, x + w - 1, y + h - 1);
}
}
Expand Down Expand Up @@ -1976,9 +1979,10 @@ protected void paintContentBorderTopEdge(Graphics g, int tabPlacement, int selec
RadianceColorScheme borderScheme = RadianceColorSchemeUtilities.getColorScheme(
this.tabPane, selectedIndex, RadianceThemingSlices.ColorSchemeAssociationKind.TAB_BORDER,
ComponentState.SELECTED);
Color darkShadowColor = RadianceColorUtilities.getMidBorderColor(borderScheme);
Color lineColor = RadianceCoreUtilities.getBorderPainter(this.tabPane)
.getRepresentativeColor(borderScheme);
if (isUnbroken) {
g2d.setColor(this.highlight);
g2d.setColor(lineColor);
g2d.drawLine(x, y, x + w, y);
} else {
// Break line to show visual connection to selected tab
Expand All @@ -1997,24 +2001,24 @@ protected void paintContentBorderTopEdge(Graphics g, int tabPlacement, int selec
topOutline.lineTo(selectionEndX, y);
topOutline.lineTo(x + w, y);
}
g2d.setPaint(new GradientPaint(x, y, darkShadowColor, x, y - bumpHeight,
RadianceColorUtilities.getAlphaColor(darkShadowColor, 0)));
g2d.setPaint(new GradientPaint(x, y, lineColor, x, y - bumpHeight,
RadianceColorUtilities.getAlphaColor(lineColor, 0)));
g2d.draw(topOutline);
}

if (isDouble) {
if (tabPlacement == TOP) {
g2d.setColor(darkShadowColor);
g2d.setColor(lineColor);
g2d.drawLine(x, y + ribbonDelta, x + w, y + ribbonDelta);
}
if (tabPlacement == LEFT) {
g2d.setPaint(new GradientPaint(x, y, darkShadowColor, x + 4 * ribbonDelta, y,
g2d.setPaint(new GradientPaint(x, y, lineColor, x + 4 * ribbonDelta, y,
this.highlight));
g2d.drawLine(x, y, x + 4 * ribbonDelta, y);
}
if (tabPlacement == RIGHT) {
g2d.setPaint(new GradientPaint(x + w - 1 - 4 * ribbonDelta, y, this.highlight,
x + w - 1, y, darkShadowColor));
x + w - 1, y, lineColor));
g2d.drawLine(x + w - 1 - 4 * ribbonDelta, y, x + w - 1, y);
}
}
Expand Down

0 comments on commit d8e8c40

Please sign in to comment.