Improve highlight range API and fix incorrect list end calc.

2 files changed, 6 insertions, 5 deletions

diff --git a/examples/declarative/listview/itemlist.qml b/examples/declarative/listview/itemlist.qml
index 6dfc90b..77f5c2d 100644
--- a/examples/declarative/listview/itemlist.qml
+++ b/examples/declarative/listview/itemlist.qml
@@ -30,8 +30,8 @@ Rectangle {
         anchors.bottomMargin: 30
         model: itemModel
         preferredHighlightBegin: 0
-        preferredHighlightEnd: 1
-        strictlyEnforceHighlightRange: true
+        preferredHighlightEnd: 0
+        highlightRangeMode: "StrictlyEnforceRange"
         orientation: "Horizontal"
     }
 
diff --git a/examples/declarative/listview/listview.qml b/examples/declarative/listview/listview.qml
index 98974fd..b614904 100644
--- a/examples/declarative/listview/listview.qml
+++ b/examples/declarative/listview/listview.qml
@@ -41,7 +41,7 @@ Rectangle {
     // current item within the the bounds of the range, however
     // items will not scroll beyond the beginning or end of the view,
     // forcing the highlight to move outside the range at the ends.
-    // The third list sets strictlyEnforceHighlightRange to true
+    // The third list sets the highlightRangeMode to StrictlyEnforceRange
     // and sets a range smaller than the height of an item.  This
     // forces the current item to change when the view is flicked,
     // since the highlight is unable to move.
@@ -61,6 +61,7 @@ Rectangle {
         model: MyPetsModel; delegate: petDelegate; highlight: petHighlight
         preferredHighlightBegin: 80
         preferredHighlightEnd: 220
+        highlightRangeMode: "ApplyRange"
         currentIndex: list1.currentIndex
     }
     ListView {
@@ -69,7 +70,7 @@ Rectangle {
         model: MyPetsModel; delegate: petDelegate; highlight: petHighlight
         currentIndex: list1.currentIndex
         preferredHighlightBegin: 125
-        preferredHighlightEnd: 126
-        strictlyEnforceHighlightRange: true
+        preferredHighlightEnd: 125
+        highlightRangeMode: "StrictlyEnforceRange"
     }
 }