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/03/16 01:23:16 UTC
svn commit: r923522 - in /pivot/trunk:
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
wtk/src/org/apache/pivot/wtk/skin/
Author: gbrown
Date: Tue Mar 16 00:23:16 2010
New Revision: 923522
URL: http://svn.apache.org/viewvc?rev=923522&view=rev
Log:
Add showOKButtonFirst style to TerraFileBrowserSkin; fix minor bug in TerraTableViewSkin when variableRowHeight = true and table data list is empty; update TerraListViewSkin#paint() logic to parallel TerraTableViewSkin#paint() when variableItemHeight = true; revert recent change to LabelSkin and replace with improved fix; close suggestion popup with result = true when Tab key is pressed.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java?rev=923522&r1=923521&r2=923522&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java Tue Mar 16 00:23:16 2010
@@ -30,6 +30,7 @@ import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.ButtonPressListener;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.ComponentMouseButtonListener;
+import org.apache.pivot.wtk.Container;
import org.apache.pivot.wtk.FileBrowser;
import org.apache.pivot.wtk.FileBrowserListener;
import org.apache.pivot.wtk.FileBrowserSheet;
@@ -236,6 +237,27 @@ public class TerraFileBrowserSheetSkin e
fileBrowser.getStyles().put("hideDisabledFiles", hideDisabledFiles);
}
+ public boolean getShowOKButtonFirst() {
+ Container parent = okButton.getParent();
+ return parent.indexOf(okButton) < parent.indexOf(cancelButton);
+ }
+
+ public void setShowOKButtonFirst(boolean showOKButtonFirst) {
+ if (showOKButtonFirst != getShowOKButtonFirst()) {
+ Container parent = okButton.getParent();
+ parent.remove(okButton);
+ parent.remove(cancelButton);
+
+ if (showOKButtonFirst) {
+ parent.add(okButton);
+ parent.add(cancelButton);
+ } else {
+ parent.add(cancelButton);
+ parent.add(okButton);
+ }
+ }
+ }
+
@Override
public void windowOpened(Window window) {
super.windowOpened(window);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java?rev=923522&r1=923521&r2=923522&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java Tue Mar 16 00:23:16 2010
@@ -288,7 +288,14 @@ public class TerraListViewSkin extends C
if (clipBounds != null) {
if (variableItemHeight) {
itemStart = getItemAt(clipBounds.y);
- itemEnd = getItemAt(clipBounds.y + clipBounds.height - 1);
+ if (itemStart == -1) {
+ itemStart = listData.getLength();
+ }
+
+ if (itemEnd != -1) {
+ int lastItemBottomY = itemHeights.get(itemEnd + 1) - 1;
+ itemEnd = getItemAt(Math.min(clipBounds.y + clipBounds.height - 1, lastItemBottomY));
+ }
} else {
itemStart = Math.max(itemStart, (int)Math.floor(clipBounds.y
/ (double)fixedItemHeight));
@@ -297,28 +304,16 @@ public class TerraListViewSkin extends C
}
}
- int itemY;
- if (variableItemHeight) {
- itemY = itemHeights.get(itemStart);
- } else {
- itemY = itemStart * fixedItemHeight;
- }
-
for (int itemIndex = itemStart; itemIndex <= itemEnd; itemIndex++) {
Object item = listData.get(itemIndex);
boolean highlighted = (itemIndex == highlightedIndex
&& listView.getSelectMode() != ListView.SelectMode.NONE);
boolean selected = listView.isItemSelected(itemIndex);
boolean disabled = listView.isItemDisabled(itemIndex);
- int itemHeight;
- if (variableItemHeight) {
- itemHeight = itemHeights.get(itemIndex + 1) - itemHeights.get(itemIndex);
- } else {
- itemHeight = fixedItemHeight;
- }
+ int itemY = getItemY(itemIndex);
+ int itemHeight = getItemHeight(itemIndex);
Color itemBackgroundColor = null;
-
if (selected) {
itemBackgroundColor = (listView.isFocused())
? this.selectionBackgroundColor : inactiveSelectionBackgroundColor;
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java?rev=923522&r1=923521&r2=923522&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java Tue Mar 16 00:23:16 2010
@@ -234,7 +234,7 @@ public class TerraSuggestionPopupSkin ex
}
case Keyboard.KeyCode.TAB: {
- suggestionPopup.close(false);
+ suggestionPopup.close(true);
FocusTraversalDirection direction = (Keyboard.isPressed(Keyboard.Modifier.SHIFT)) ?
FocusTraversalDirection.BACKWARD : FocusTraversalDirection.FORWARD;
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java?rev=923522&r1=923521&r2=923522&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java Tue Mar 16 00:23:16 2010
@@ -334,8 +334,10 @@ public class TerraTableViewSkin extends
rowStart = tableData.getLength();
}
- int lastRowBottomY = rowHeights.get(rowEnd+1) - 1;
- rowEnd = getRowAt(Math.min(clipBounds.y + clipBounds.height - 1, lastRowBottomY));
+ if (rowEnd != -1) {
+ int lastRowBottomY = rowHeights.get(rowEnd + 1) - 1;
+ rowEnd = getRowAt(Math.min(clipBounds.y + clipBounds.height - 1, lastRowBottomY));
+ }
} else {
rowStart = Math.max(rowStart, (int)Math.floor(clipBounds.y
/ (double)(fixedRowHeight + 1)));
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java?rev=923522&r1=923521&r2=923522&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java Tue Mar 16 00:23:16 2010
@@ -222,8 +222,7 @@ public class LabelSkin extends Component
int n = text.length();
if (n > 0) {
- if (wrapText
- && n > 1) {
+ if (wrapText) {
int width = getWidth() - (padding.left + padding.right);
float lineWidth = 0;
@@ -249,7 +248,7 @@ public class LabelSkin extends Component
lastWhitespaceIndex = -1;
// Append the current line
- if ((i - 1) - start > 0) {
+ if ((i - 1) - start >= 0) {
StringCharacterIterator line = new StringCharacterIterator(text, start, i, start);
GlyphVector glyphVector = font.createGlyphVector(FONT_RENDER_CONTEXT, line);
glyphVectors.add(glyphVector);
@@ -265,7 +264,7 @@ public class LabelSkin extends Component
}
// Append the final line
- if ((i - 1) - start > 0) {
+ if ((i - 1) - start >= 0) {
StringCharacterIterator line = new StringCharacterIterator(text, start, i, start);
GlyphVector glyphVector = font.createGlyphVector(FONT_RENDER_CONTEXT, line);
glyphVectors.add(glyphVector);