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 2009/11/09 20:35:40 UTC
svn commit: r834187 - in
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin:
ComponentSkin.java FlowPaneSkin.java LabelSkin.java
terra/TerraMeterSkin.java terra/TerraTextInputSkin.java
Author: gbrown
Date: Mon Nov 9 19:35:40 2009
New Revision: 834187
URL: http://svn.apache.org/viewvc?rev=834187&view=rev
Log:
Remove debugBaseline flag (but leave drawBaselineDebug() method - developers can call this method explicitly when debugging baseline changes).
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java?rev=834187&r1=834186&r2=834187&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java Mon Nov 9 19:35:40 2009
@@ -92,8 +92,6 @@
public static final int SHOW_TOOLTIP_TIMEOUT = 1000;
- protected static boolean debugBaseline = true;
-
@Override
public int getWidth() {
return width;
@@ -366,6 +364,16 @@
}
}
+ protected void drawBaselineDebug(Graphics2D graphics) {
+ int width = getWidth();
+ int baseline = getBaseline(width, getHeight());
+
+ if (baseline != -1) {
+ graphics.setPaint(Color.RED);
+ GraphicsUtilities.drawLine(graphics, 0, baseline, width, Orientation.HORIZONTAL);
+ }
+ }
+
public static Font decodeFont(String value) {
Font font;
if (value.startsWith("{")) {
@@ -380,13 +388,4 @@
return font;
}
-
- protected final void drawBaselineDebug(Graphics2D graphics) {
- int width = getWidth();
- int baseline = getBaseline(width, getHeight());
- if (baseline != -1) {
- graphics.setPaint(Color.RED);
- GraphicsUtilities.drawLine(graphics, 0, baseline, width, Orientation.HORIZONTAL);
- }
- }
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java?rev=834187&r1=834186&r2=834187&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java Mon Nov 9 19:35:40 2009
@@ -16,8 +16,6 @@
*/
package org.apache.pivot.wtk.skin;
-import java.awt.Graphics2D;
-
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.wtk.Component;
@@ -203,14 +201,6 @@
}
@Override
- public void paint(Graphics2D graphics) {
- super.paint(graphics);
- if (debugBaseline) {
- drawBaselineDebug(graphics);
- }
- }
-
- @Override
public void layout() {
FlowPane flowPane = (FlowPane)getComponent();
int width = getWidth();
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java?rev=834187&r1=834186&r2=834187&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java Mon Nov 9 19:35:40 2009
@@ -294,10 +294,6 @@
graphics.fillRect(0, 0, width, height);
}
- if (debugBaseline) {
- drawBaselineDebug(graphics);
- }
-
// Draw the text
if (glyphVectors.getLength() > 0) {
graphics.setFont(font);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java?rev=834187&r1=834186&r2=834187&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java Mon Nov 9 19:35:40 2009
@@ -225,12 +225,6 @@
graphics.setPaint(textColor);
graphics.setFont(font);
graphics.drawString(meter.getText(), textX, textY + ascent);
-
- graphics.setClip(clip);
- }
-
- if (debugBaseline) {
- drawBaselineDebug(graphics);
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java?rev=834187&r1=834186&r2=834187&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java Mon Nov 9 19:35:40 2009
@@ -314,10 +314,6 @@
graphics.setColor(backgroundColor);
graphics.fillRect(0, 0, width, height);
- if (debugBaseline) {
- drawBaselineDebug(graphics);
- }
-
// Paint the bevel
graphics.setColor(bevelColor);
GraphicsUtilities.drawLine(graphics, 0, 0, width, Orientation.HORIZONTAL);