You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2011/11/06 13:01:55 UTC
svn commit: r1198346 - in /pivot/trunk:
tests/src/org/apache/pivot/tests/listview_test2.bxml
wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
Author: smartini
Date: Sun Nov 6 12:01:54 2011
New Revision: 1198346
URL: http://svn.apache.org/viewvc?rev=1198346&view=rev
Log:
PIVOT-806, add the wrapSelectNext style (default true, as in Windows), and put in a test bxml it as false
Modified:
pivot/trunk/tests/src/org/apache/pivot/tests/listview_test2.bxml
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/listview_test2.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/listview_test2.bxml?rev=1198346&r1=1198345&r2=1198346&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/listview_test2.bxml (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/listview_test2.bxml Sun Nov 6 12:01:54 2011
@@ -22,7 +22,7 @@ limitations under the License.
styles="{padding:{top:2, left:4, bottom:4, right:4}, spacing:12}">
<Border styles="{color:10}">
<ScrollPane preferredHeight="80">
- <ListView bxml:id="iconListView2" selectMode="multi" selectedIndex="2" styles="{variableItemHeight:true}">
+ <ListView bxml:id="iconListView2" selectMode="multi" selectedIndex="2" styles="{variableItemHeight:true, wrapSelectNext:false}">
<itemRenderer>
<content:ListViewItemRenderer iconWidth="-1" iconHeight="-1"
showIcon="true"/>
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=1198346&r1=1198345&r2=1198346&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 Sun Nov 6 12:01:54 2011
@@ -64,6 +64,7 @@ public class TerraListViewSkin extends C
private Color highlightBackgroundColor;
private Color alternateItemBackgroundColor;
private boolean showHighlight;
+ private boolean wrapSelectNext;
private boolean variableItemHeight;
private Insets checkboxPadding = new Insets(2, 2, 2, 0);
@@ -94,6 +95,7 @@ public class TerraListViewSkin extends C
highlightBackgroundColor = theme.getColor(10);
alternateItemBackgroundColor = null;
showHighlight = true;
+ wrapSelectNext = true;
}
@Override
@@ -752,6 +754,14 @@ public class TerraListViewSkin extends C
repaintComponent();
}
+ public boolean getWrapSelectNext() {
+ return wrapSelectNext;
+ }
+
+ public void setWrapSelectNext(boolean wrapSelectNext) {
+ this.wrapSelectNext = wrapSelectNext;
+ }
+
public Insets getCheckboxPadding() {
return checkboxPadding;
}
@@ -1150,9 +1160,8 @@ public class TerraListViewSkin extends C
}
}
-// TODO: add a style "wrapSelectNext" or similar to disable this behaviour (now enabled by default) ...
- if (!consumed)
- {
+ if (!consumed
+ && wrapSelectNext) {
for (int i = 0, n = listData.getLength(); i < n; i++) {
if (!listView.isItemDisabled(i)) {
String string = itemRenderer.toString(listData.get(i));
@@ -1320,7 +1329,7 @@ public class TerraListViewSkin extends C
Bounds visibleSelectionBounds = listView.getVisibleArea(selectionBounds);
if (visibleSelectionBounds != null
&& visibleSelectionBounds.height < selectionBounds.height) {
- // TODO Repainting the entire component is a workaround for PIVOT-490
+ // Repainting the entire component is a workaround for PIVOT-490
repaintComponent();
listView.scrollAreaToVisible(selectionBounds);
@@ -1336,4 +1345,5 @@ public class TerraListViewSkin extends C
public void selectedItemChanged(ListView listView, Object previousSelectedItem) {
// No-op
}
+
}