You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/07/05 02:42:52 UTC
svn commit: r960413 - in
/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra:
TerraCalendarButtonSkin.java TerraColorChooserButtonSkin.java
TerraListButtonSkin.java TerraMenuButtonSkin.java TerraPushButtonSkin.java
TerraTabPaneSkin.java
Author: gbrown
Date: Mon Jul 5 00:42:51 2010
New Revision: 960413
URL: http://svn.apache.org/viewvc?rev=960413&view=rev
Log:
Re-apply button rounding fix.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java?rev=960413&r1=960412&r2=960413&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java Mon Jul 5 00:42:51 2010
@@ -234,12 +234,18 @@ public class TerraCalendarButtonSkin ext
}
// Paint the background
+ graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+
graphics.setPaint(new GradientPaint(width / 2f, 0, bevelColor,
width / 2f, height / 2f, backgroundColor));
- graphics.fill(new RoundRectangle2D.Double(0, 0, width, height,
+ graphics.fill(new RoundRectangle2D.Double(0.5, 0.5, width - 1, height - 1,
CORNER_RADIUS, CORNER_RADIUS));
// Paint the content
+ graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_OFF);
+
Bounds contentBounds = new Bounds(0, 0,
Math.max(width - TRIGGER_WIDTH - 1, 0), Math.max(height - 1, 0));
Button.DataRenderer dataRenderer = calendarButton.getDataRenderer();
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java?rev=960413&r1=960412&r2=960413&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java Mon Jul 5 00:42:51 2010
@@ -180,12 +180,18 @@ public class TerraColorChooserButtonSkin
}
// Paint the background
+ graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+
graphics.setPaint(new GradientPaint(width / 2f, 0, bevelColor,
width / 2f, height / 2f, backgroundColor));
- graphics.fill(new RoundRectangle2D.Double(0, 0, width, height,
+ graphics.fill(new RoundRectangle2D.Double(0.5, 0.5, width - 1, height - 1,
CORNER_RADIUS, CORNER_RADIUS));
// Paint the content
+ graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_OFF);
+
Bounds contentBounds = new Bounds(0, 0,
Math.max(width - TRIGGER_WIDTH - 1, 0), Math.max(height - 1, 0));
Button.DataRenderer dataRenderer = colorChooserButton.getDataRenderer();
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java?rev=960413&r1=960412&r2=960413&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java Mon Jul 5 00:42:51 2010
@@ -266,12 +266,18 @@ public class TerraListButtonSkin extends
graphics.setStroke(new BasicStroke());
// Paint the background
+ graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+
graphics.setPaint(new GradientPaint(width / 2f, 0, bevelColor,
width / 2f, height / 2f, backgroundColor));
- graphics.fill(new RoundRectangle2D.Double(0, 0, width, height,
+ graphics.fill(new RoundRectangle2D.Double(0.5, 0.5, width - 1, height - 1,
CORNER_RADIUS, CORNER_RADIUS));
// Paint the content
+ graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_OFF);
+
Bounds contentBounds = new Bounds(0, 0,
Math.max(width - TRIGGER_WIDTH - 1, 0), Math.max(height - 1, 0));
Button.DataRenderer dataRenderer = listButton.getDataRenderer();
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java?rev=960413&r1=960412&r2=960413&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java Mon Jul 5 00:42:51 2010
@@ -227,15 +227,21 @@ public class TerraMenuButtonSkin extends
}
// Paint the background
+ graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+
if (backgroundColor != null
&& bevelColor != null) {
graphics.setPaint(new GradientPaint(width / 2f, 0, bevelColor,
width / 2f, height / 2f, backgroundColor));
- graphics.fill(new RoundRectangle2D.Double(0, 0, width, height,
+ graphics.fill(new RoundRectangle2D.Double(0.5, 0.5, width - 1, height - 1,
CORNER_RADIUS, CORNER_RADIUS));
}
// Paint the content
+ graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_OFF);
+
Bounds contentBounds = new Bounds(padding.left + 1, padding.top + 1,
Math.max(width - (padding.left + padding.right + spacing + TRIGGER_WIDTH + 2), 0),
Math.max(height - (padding.top + padding.bottom + 2), 0));
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java?rev=960413&r1=960412&r2=960413&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java Mon Jul 5 00:42:51 2010
@@ -217,15 +217,21 @@ public class TerraPushButtonSkin extends
}
// Paint the background
+ graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+
if (backgroundColor != null
&& bevelColor != null) {
graphics.setPaint(new GradientPaint(width / 2f, 0, bevelColor,
width / 2f, height / 2f, backgroundColor));
- graphics.fill(new RoundRectangle2D.Double(0, 0, width, height,
+ graphics.fill(new RoundRectangle2D.Double(0.5, 0.5, width - 1, height - 1,
CORNER_RADIUS, CORNER_RADIUS));
}
// Paint the content
+ graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_OFF);
+
Button.DataRenderer dataRenderer = pushButton.getDataRenderer();
dataRenderer.render(pushButton.getButtonData(), pushButton, highlighted);
dataRenderer.setSize(Math.max(width - (padding.left + padding.right + 2), 0),
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java?rev=960413&r1=960412&r2=960413&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java Mon Jul 5 00:42:51 2010
@@ -196,11 +196,14 @@ public class TerraTabPaneSkin extends Co
int height = getHeight();
// Draw the background
+ graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+
switch(tabOrientation) {
case HORIZONTAL: {
graphics.setPaint(new GradientPaint(width / 2f, 0, buttonBevelColor,
width / 2f, height / 2f, backgroundColor));
- graphics.fill(new RoundRectangle2D.Double(0, 0, width, height + CORNER_RADIUS,
+ graphics.fill(new RoundRectangle2D.Double(0.5, 0.5, width - 1, height - 1 + CORNER_RADIUS,
CORNER_RADIUS, CORNER_RADIUS));
break;
}
@@ -208,7 +211,7 @@ public class TerraTabPaneSkin extends Co
case VERTICAL: {
graphics.setPaint(new GradientPaint(0, height / 2f, buttonBevelColor,
width / 2f, height / 2f, backgroundColor));
- graphics.fill(new RoundRectangle2D.Double(0, 0, width + CORNER_RADIUS, height,
+ graphics.fill(new RoundRectangle2D.Double(0.5, 0.5, width - 1 + CORNER_RADIUS, height - 1,
CORNER_RADIUS, CORNER_RADIUS));
break;
}
@@ -218,9 +221,6 @@ public class TerraTabPaneSkin extends Co
graphics.setPaint(borderColor);
graphics.setStroke(new BasicStroke(1));
- graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
- RenderingHints.VALUE_ANTIALIAS_ON);
-
switch(tabOrientation) {
case HORIZONTAL: {
graphics.draw(new RoundRectangle2D.Double(0.5, 0.5, width - 1, height + CORNER_RADIUS - 1,