Merge lp:~saviq/unity-2d/abstract-scrollbar into lp:unity-2d

[Michał Sawicz]

[lib] make Scrollbar abstracted

[lib] make Scrollbar abstracted

[lp:~saviq/unity-2d/abstract-scrollbar]

799. By Michał Sawicz on 2011-12-07

[lib] move Scrollbar width out of the abstracted one

=== renamed file 'places/Scrollbar.qml' => 'libunity-2d-private/Unity2d/AbstractScrollbar.qml'
--- places/Scrollbar.qml	2011-07-26 16:57:44 +0000
+++ libunity-2d-private/Unity2d/AbstractScrollbar.qml	2011-12-07 15:02:25 +0000
@@ -35,8 +35,9 @@
     id: scrollbar
 
     property variant targetFlickable
-
-    width: 3
+    property alias sliderSource: sliderImage.source
+    property alias sliderAnchors: sliderImage.anchors
+    property alias sliderSmooth: sliderImage.smooth
 
     MouseArea {
         id: scrollMouseArea
@@ -88,17 +89,9 @@
         Behavior on height {NumberAnimation {duration: 200; easing.type: Easing.InOutQuad}}
 
         BorderImage {
+            id: sliderImage
+
             anchors.fill: parent
-            /* The glow around the slider is 5 pixels wide on the left and right sides
-               and 10 pixels tall on the top and bottom sides. */
-            anchors.rightMargin: -5
-            anchors.leftMargin: -5
-            anchors.topMargin: -10
-            anchors.bottomMargin: -10
-
-            smooth: false
-
-            source: "artwork/scrollbar.sci"
         }
 
         MouseArea {

=== modified file 'libunity-2d-private/Unity2d/CMakeLists.txt'
--- libunity-2d-private/Unity2d/CMakeLists.txt	2011-11-18 10:15:49 +0000
+++ libunity-2d-private/Unity2d/CMakeLists.txt	2011-12-07 15:02:25 +0000
@@ -59,5 +59,7 @@
 #Allow build in different directory
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/GnomeBackground.qml"
                                                               "${CMAKE_CURRENT_BINARY_DIR}/GnomeBackground.qml")
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/AbstractScrollbar.qml"
+                                                              "${CMAKE_CURRENT_BINARY_DIR}/AbstractScrollbar.qml")
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
                                                               "${CMAKE_CURRENT_BINARY_DIR}/qmldir")

=== modified file 'libunity-2d-private/Unity2d/qmldir'
--- libunity-2d-private/Unity2d/qmldir	2011-05-26 11:44:11 +0000
+++ libunity-2d-private/Unity2d/qmldir	2011-12-07 15:02:25 +0000
@@ -1,3 +1,4 @@
 plugin unity-2d-private-qml
 
 GnomeBackground 1.0 GnomeBackground.qml
+AbstractScrollbar 1.0 AbstractScrollbar.qml

=== modified file 'places/ListViewWithScrollbar.qml'
--- places/ListViewWithScrollbar.qml	2011-11-17 15:26:54 +0000
+++ places/ListViewWithScrollbar.qml	2011-12-07 15:02:25 +0000
@@ -17,6 +17,7 @@
  */
 
 import QtQuick 1.0
+import Unity2d 1.0
 
 FocusScope {
     property alias scrollbar: scrollbar
@@ -32,9 +33,11 @@
         anchors.rightMargin: 15
     }
 
-    Scrollbar {
+    AbstractScrollbar {
         id: scrollbar
 
+        width: 3
+
         anchors.top: parent.top
         anchors.topMargin: 15
         anchors.bottom: parent.bottom
@@ -43,6 +46,17 @@
 
         targetFlickable: list.flickable
 
+        /* The glow around the slider is 5 pixels wide on the left and right sides
+           and 10 pixels tall on the top and bottom sides. */
+        sliderAnchors.rightMargin: -5
+        sliderAnchors.leftMargin: -5
+        sliderAnchors.topMargin: -10
+        sliderAnchors.bottomMargin: -10
+
+        sliderSmooth: false
+
+        sliderSource: "artwork/scrollbar.sci"
+
         /* Hide the scrollbar if there is less than a page of results */
         opacity: targetFlickable.visibleArea.heightRatio < 1.0 ? 1.0 : 0.0
         Behavior on opacity {NumberAnimation {duration: 100}}