From kde-commits  Wed Feb 29 23:41:30 2012
From: Shaun Reich <shaun.reich () kdemail ! net>
Date: Wed, 29 Feb 2012 23:41:30 +0000
To: kde-commits
Subject: [kde-workspace/plasma/sreich/sal-qml] plasma/netbook/containments/sal/package/contents/ui: make the
Message-Id: <20120229234130.8C18BA60BB () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=133055893209638

Git commit d12be13673089961f9c155c44b80ec5757973e31 by Shaun Reich.
Committed on 01/03/2012 at 00:40.
Pushed by sreich into branch 'plasma/sreich/sal-qml'.

make the gridview be the only flickable, and the scrollbar boudn to that

M  +2    -9    plasma/netbook/containments/sal/package/contents/ui/ResultsV=
iew.qml

http://commits.kde.org/kde-workspace/d12be13673089961f9c155c44b80ec5757973e=
31

diff --git a/plasma/netbook/containments/sal/package/contents/ui/ResultsVie=
w.qml b/plasma/netbook/containments/sal/package/contents/ui/ResultsView.qml
index f13ccf9..3667e30 100644
--- a/plasma/netbook/containments/sal/package/contents/ui/ResultsView.qml
+++ b/plasma/netbook/containments/sal/package/contents/ui/ResultsView.qml
@@ -30,13 +30,6 @@ Item {
 =

     property alias model: gridView.model
 =

-    Flickable {
-        id: resultsFlickable
-
-        anchors.fill: parent
-        interactive: true
-        clip: true
-        contentHeight: resultItemHeight * gridView.count
 =

         GridView {
             id: gridView
@@ -51,6 +44,7 @@ Item {
             cellHeight: resultItemHeight
 =

             highlightFollowsCurrentItem: true
+            clip: true
 =

             highlight: highlight
             delegate: Result {
@@ -74,11 +68,10 @@ Item {
                 }
             }
         }
-    }
 =

     PlasmaComponents.ScrollBar {
         id: scrollBar
-        flickableItem: resultsFlickable
+        flickableItem: gridView
         anchors {
             right: parent.right
             top: parent.top