ListView currentItemMode API replaced with highlight range API.

1 files changed, 14 insertions, 7 deletions

diff --git a/src/declarative/fx/qfxlistview.h b/src/declarative/fx/qfxlistview.h
index 095c27b..b122a8a 100644
--- a/src/declarative/fx/qfxlistview.h
+++ b/src/declarative/fx/qfxlistview.h
@@ -71,8 +71,11 @@ class Q_DECLARATIVE_EXPORT QFxListView : public QFxFlickable
     Q_PROPERTY(int count READ count NOTIFY countChanged)
     Q_PROPERTY(QmlComponent *highlight READ highlight WRITE setHighlight)
     Q_PROPERTY(bool autoHighlight READ autoHighlight WRITE setAutoHighlight) //### highlightFollowsCurrentItem
-    Q_PROPERTY(CurrentItemPositioning currentItemPositioning READ currentItemPositioning WRITE setCurrentItemPositioning) //### mode
-    Q_PROPERTY(int snapPosition READ snapPosition WRITE setSnapPosition)
+
+    Q_PROPERTY(qreal preferredHighlightBegin READ preferredHighlightBegin WRITE setPreferredHighlightBegin)
+    Q_PROPERTY(qreal preferredHighlightEnd READ preferredHighlightEnd WRITE setPreferredHighlightEnd)
+    Q_PROPERTY(bool strictlyEnforceHighlightRange READ strictlyEnforceHighlightRange WRITE setStrictlyEnforceHighlightRange)
+
     Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
     Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
     Q_PROPERTY(bool wrap READ isWrapEnabled WRITE setWrapEnabled) //### keyNavigationWraps, stops at end when held
@@ -103,11 +106,6 @@ public:
     bool autoHighlight() const;
     void setAutoHighlight(bool);
 
-    //### QSpan preferredHighlightRange
-    //### bool strictlyEnforceHighlightRange
-
-    //### don't jump around unnecessarily
-    //### fix highlight for snapAuto
     enum CurrentItemPositioning { Free, Snap, SnapAuto };
     CurrentItemPositioning currentItemPositioning() const;
     void setCurrentItemPositioning(CurrentItemPositioning mode);
@@ -115,6 +113,15 @@ public:
     int snapPosition() const;
     void setSnapPosition(int pos);
 
+    bool strictlyEnforceHighlightRange() const;
+    void setStrictlyEnforceHighlightRange(bool strict);
+    
+    qreal preferredHighlightBegin() const;
+    void setPreferredHighlightBegin(qreal);
+
+    qreal preferredHighlightEnd() const;
+    void setPreferredHighlightEnd(qreal);
+
     qreal spacing() const;
     void setSpacing(qreal spacing);