You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/09/25 18:53:16 UTC
svn commit: r818915 - in /incubator/pivot/trunk:
tutorials/src/org/apache/pivot/tutorials/buttons/
tutorials/src/org/apache/pivot/tutorials/menus/ tutorials/www/
wtk/src/org/apache/pivot/wtk/skin/ wtk/src/org/apache/pivot/wtk/skin/terra/
Author: tvolkert
Date: Fri Sep 25 16:53:15 2009
New Revision: 818915
URL: http://svn.apache.org/viewvc?rev=818915&view=rev
Log:
Separated "gridColor" style in table view and table pane into distinct "horizontalGridColor" and "verticalGridColor" styles; fixed small bug in TerraListButtonSkin (its popup wasn't owned by the list button)
Modified:
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/checkboxes.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/context_menus.wtkx
incubator/pivot/trunk/tutorials/www/checkboxes.template.html
incubator/pivot/trunk/tutorials/www/table_panes.template.html
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTablePaneSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/checkboxes.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/checkboxes.wtkx?rev=818915&r1=818914&r2=818915&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/context_menus.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/context_menus.wtkx?rev=818915&r1=818914&r2=818915&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/www/checkboxes.template.html
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/www/checkboxes.template.html?rev=818915&r1=818914&r2=818915&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/www/checkboxes.template.html (original)
+++ incubator/pivot/trunk/tutorials/www/checkboxes.template.html Fri Sep 25 16:53:15 2009
@@ -57,7 +57,8 @@
xmlns="org.apache.pivot.wtk">
<content>
<TablePane styles="{showHorizontalGridLines: true, showVerticalGridLines:true,
- padding:4, horizontalSpacing:1, verticalSpacing:1, gridColor:10}">
+ padding:4, horizontalSpacing:1, verticalSpacing:1,
+ horizontalGridColor:10, verticalGridColor:10}">
<columns>
<TablePane.Column width="-1"/>
<TablePane.Column width="24"/>
Modified: incubator/pivot/trunk/tutorials/www/table_panes.template.html
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/www/table_panes.template.html?rev=818915&r1=818914&r2=818915&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/www/table_panes.template.html (original)
+++ incubator/pivot/trunk/tutorials/www/table_panes.template.html Fri Sep 25 16:53:15 2009
@@ -44,7 +44,8 @@
<li><tt>verticalSpacing</tt> - the amount of space the table pane inserts between rows.</li>
<li><tt>showHorizontalGridLines</tt> - whether horizontal grid lines will be painted in the space between rows. Note that this will be ignored if <tt>verticalSpacing</tt> is zero, as there would be no space in which to paint the grid lines.</li>
<li><tt>showVerticalGridLines</tt> - whether vertical grid lines will be painted in the space between columns. Note that this will be ignored if <tt>horizontalSpacing</tt> is zero, as there would be no space in which to paint the grid lines.</li>
-<li><tt>gridColor</tt> - the color of the grid lines.</li>
+<li><tt>horizontalGridColor</tt> - the color of the horizontal grid lines.</li>
+<li><tt>verticalGridColor</tt> - the color of the vertical grid lines.</li>
<li><tt>highlightBackgroundColor</tt> - the background color of rows and columns whose <tt>highlighted</tt> flag is set to <tt>true</tt>.</li>
</ul>
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java?rev=818915&r1=818914&r2=818915&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java Fri Sep 25 16:53:15 2009
@@ -45,7 +45,8 @@
private int verticalSpacing = 0;
private boolean showHorizontalGridLines = false;
private boolean showVerticalGridLines = false;
- private Color gridColor = Color.BLACK;
+ private Color horizontalGridColor = Color.BLACK;
+ private Color verticalGridColor = Color.BLACK;
private Color highlightBackgroundColor = Color.GRAY;
private int[] columnWidths = null;
@@ -569,7 +570,6 @@
Graphics2D gridGraphics = (Graphics2D)graphics.create();
gridGraphics.setStroke(new BasicStroke());
- gridGraphics.setPaint(gridColor);
gridGraphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
@@ -634,6 +634,8 @@
if (showHorizontalGridLines
&& verticalSpacing > 0) {
+ gridGraphics.setPaint(horizontalGridColor);
+
int rowY = padding.top + (rowHeights[0] + verticalSpacing);
for (int i = 1; i < rowCount; i++) {
@@ -647,6 +649,8 @@
if (showVerticalGridLines
&& horizontalSpacing > 0) {
+ gridGraphics.setPaint(verticalGridColor);
+
int columnX = padding.left + (columnWidths[0] + horizontalSpacing);
for (int j = 1; j < columnCount; j++) {
@@ -792,21 +796,54 @@
}
/**
- * Gets the color used to paint the table pane's grid lines.
+ * Gets the color used to paint the table pane's horizontal grid lines.
+ */
+ public Color getHorizontalGridColor() {
+ return horizontalGridColor;
+ }
+
+ /**
+ * Sets the color used to paint the table pane's horizontal grid lines.
+ */
+ public void setHorizontalGridColor(Color horizontalGridColor) {
+ if (horizontalGridColor == null) {
+ throw new IllegalArgumentException("horizontalGridColor is null.");
+ }
+
+ this.horizontalGridColor = horizontalGridColor;
+
+ if (showHorizontalGridLines || showVerticalGridLines) {
+ repaintComponent();
+ }
+ }
+
+ /**
+ * Sets the color used to paint the table pane's horizontal grid lines.
+ */
+ public final void setHorizontalGridColor(String horizontalGridColor) {
+ if (horizontalGridColor == null) {
+ throw new IllegalArgumentException("horizontalGridColor is null.");
+ }
+
+ setHorizontalGridColor(GraphicsUtilities.decodeColor(horizontalGridColor));
+ }
+
+ /**
+ * Gets the color used to paint the table pane's vertical grid lines.
*/
- public Color getGridColor() {
- return gridColor;
+ public Color getVerticalGridColor() {
+ return verticalGridColor;
}
/**
- * Sets the color used to paint the table pane's grid lines.
+ * Sets the color used to paint the table pane's vertical grid lines.
*/
- public void setGridColor(Color gridColor) {
- if (gridColor == null) {
- throw new IllegalArgumentException("gridColor is null.");
+ public void setVerticalGridColor(Color verticalGridColor) {
+ if (verticalGridColor == null) {
+ throw new IllegalArgumentException("verticalGridColor is null.");
}
- this.gridColor = gridColor;
+ this.verticalGridColor = verticalGridColor;
if (showHorizontalGridLines || showVerticalGridLines) {
repaintComponent();
@@ -814,14 +851,14 @@
}
/**
- * Sets the color used to paint the table pane's grid lines.
+ * Sets the color used to paint the table pane's vertical grid lines.
*/
- public final void setGridColor(String gridColor) {
- if (gridColor == null) {
- throw new IllegalArgumentException("gridColor is null.");
+ public final void setVerticalGridColor(String verticalGridColor) {
+ if (verticalGridColor == null) {
+ throw new IllegalArgumentException("verticalGridColor is null.");
}
- setGridColor(GraphicsUtilities.decodeColor(gridColor));
+ setVerticalGridColor(GraphicsUtilities.decodeColor(verticalGridColor));
}
/**
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java?rev=818915&r1=818914&r2=818915&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java Fri Sep 25 16:53:15 2009
@@ -642,7 +642,7 @@
listViewPopup.setLocation(x, y);
listViewPopup.setPreferredSize(popupWidth, popupHeight);
- listViewPopup.open(listButton.getDisplay());
+ listViewPopup.open(listButton.getWindow());
if (listView.getSelectedIndex() == -1
&& listView.getListData().getLength() > 0) {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTablePaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTablePaneSkin.java?rev=818915&r1=818914&r2=818915&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTablePaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTablePaneSkin.java Fri Sep 25 16:53:15 2009
@@ -24,7 +24,8 @@
*/
public class TerraTablePaneSkin extends TablePaneSkin {
public TerraTablePaneSkin() {
- setGridColor(7);
+ setHorizontalGridColor(7);
+ setVerticalGridColor(7);
setHighlightBackgroundColor(10);
}
@@ -33,9 +34,14 @@
setBackgroundColor(theme.getColor(backgroundColor));
}
- public final void setGridColor(int gridColor) {
+ public final void setHorizontalGridColor(int horizontalGridColor) {
TerraTheme theme = (TerraTheme)Theme.getTheme();
- setGridColor(theme.getColor(gridColor));
+ setHorizontalGridColor(theme.getColor(horizontalGridColor));
+ }
+
+ public final void setVerticalGridColor(int verticalGridColor) {
+ TerraTheme theme = (TerraTheme)Theme.getTheme();
+ setVerticalGridColor(theme.getColor(verticalGridColor));
}
public final void setHighlightBackgroundColor(int highlightBackgroundColor) {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java?rev=818915&r1=818914&r2=818915&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java Fri Sep 25 16:53:15 2009
@@ -66,7 +66,8 @@
private Color highlightBackgroundColor;
private Color alternateRowColor;
private Color columnSelectionColor;
- private Color gridColor;
+ private Color horizontalGridColor;
+ private Color verticalGridColor;
private boolean showHighlight;
private boolean showHorizontalGridLines;
private boolean showVerticalGridLines;
@@ -92,7 +93,8 @@
highlightBackgroundColor = theme.getColor(10);
alternateRowColor = theme.getColor(11);
columnSelectionColor = null;
- gridColor = theme.getColor(11);
+ horizontalGridColor = theme.getColor(11);
+ verticalGridColor = theme.getColor(11);
showHighlight = true;
showHorizontalGridLines = true;
@@ -369,10 +371,9 @@
rowY += rowHeight + 1;
}
- // Set the grid stroke and color
- graphics.setPaint(gridColor);
-
// Paint the vertical grid lines
+ graphics.setPaint(verticalGridColor);
+
if (showVerticalGridLines) {
columnX = 0;
@@ -390,6 +391,8 @@
}
// Paint the horizontal grid line
+ graphics.setPaint(horizontalGridColor);
+
if (showHorizontalGridLines) {
int rowCount = tableData.getLength();
@@ -798,30 +801,56 @@
setColumnSelectionColor(theme.getColor(columnSelectionColor));
}
- public Color getGridColor() {
- return gridColor;
+ public Color getHorizontalGridColor() {
+ return horizontalGridColor;
+ }
+
+ public void setHorizontalGridColor(Color horizontalGridColor) {
+ if (horizontalGridColor == null) {
+ throw new IllegalArgumentException("horizontalGridColor is null.");
+ }
+
+ this.horizontalGridColor = horizontalGridColor;
+ repaintComponent();
+ }
+
+ public final void setHorizontalGridColor(String horizontalGridColor) {
+ if (horizontalGridColor == null) {
+ throw new IllegalArgumentException("horizontalGridColor is null.");
+ }
+
+ setHorizontalGridColor(GraphicsUtilities.decodeColor(horizontalGridColor));
+ }
+
+ public final void setHorizontalGridColor(int horizontalGridColor) {
+ TerraTheme theme = (TerraTheme)Theme.getTheme();
+ setHorizontalGridColor(theme.getColor(horizontalGridColor));
+ }
+
+ public Color getVerticalGridColor() {
+ return verticalGridColor;
}
- public void setGridColor(Color gridColor) {
- if (gridColor == null) {
- throw new IllegalArgumentException("gridColor is null.");
+ public void setVerticalGridColor(Color verticalGridColor) {
+ if (verticalGridColor == null) {
+ throw new IllegalArgumentException("verticalGridColor is null.");
}
- this.gridColor = gridColor;
+ this.verticalGridColor = verticalGridColor;
repaintComponent();
}
- public final void setGridColor(String gridColor) {
- if (gridColor == null) {
- throw new IllegalArgumentException("gridColor is null.");
+ public final void setVerticalGridColor(String verticalGridColor) {
+ if (verticalGridColor == null) {
+ throw new IllegalArgumentException("verticalGridColor is null.");
}
- setGridColor(GraphicsUtilities.decodeColor(gridColor));
+ setVerticalGridColor(GraphicsUtilities.decodeColor(verticalGridColor));
}
- public final void setGridColor(int gridColor) {
+ public final void setVerticalGridColor(int verticalGridColor) {
TerraTheme theme = (TerraTheme)Theme.getTheme();
- setGridColor(theme.getColor(gridColor));
+ setVerticalGridColor(theme.getColor(verticalGridColor));
}
public boolean getShowHighlight() {