From 38284f8e1a806deb68372d1f5dd919c18226789e Mon Sep 17 00:00:00 2001
From: Daker Fernandes Pinheiro <dakerfp@gmail.com>
Date: Fri, 15 Jul 2011 20:51:42 -0300
Subject: [PATCH] Fix Highlight plasma component margins

The SVG margins was not being considered.

Signed-off-by: Daker Fernandes Pinheiro <dakerfp@gmail.com>
---
 declarativeimports/plasmacomponents/Highlight.qml | 6 ++++--
 declarativeimports/test/gallery/Scrollers.qml     | 5 +----
 declarativeimports/test/gallery/Sliders.qml       | 1 -
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/declarativeimports/plasmacomponents/Highlight.qml b/declarativeimports/plasmacomponents/Highlight.qml
index b88ef2198..9670c2837 100644
--- a/declarativeimports/plasmacomponents/Highlight.qml
+++ b/declarativeimports/plasmacomponents/Highlight.qml
@@ -40,8 +40,10 @@ Item {
 
         anchors {
             fill: parent
-            topMargin: 2
-            bottomMargin: 2
+            topMargin: -background.margins.top
+            leftMargin: -background.margins.left
+            bottomMargin: -background.margins.bottom
+            rightMargin: -background.margins.right
         }
     }
 }
diff --git a/declarativeimports/test/gallery/Scrollers.qml b/declarativeimports/test/gallery/Scrollers.qml
index 1c93fe31c..dea2d8c81 100644
--- a/declarativeimports/test/gallery/Scrollers.qml
+++ b/declarativeimports/test/gallery/Scrollers.qml
@@ -71,10 +71,7 @@ Column {
     Item {
         width: 200
         height: 200
-        PlasmaComponents.Highlight {
-            anchors.fill: parent
-            anchors.margins: -10
-        }
+        PlasmaComponents.Highlight { anchors.fill: parent }
         Flickable {
             id: scrollArea
             anchors.fill: parent
diff --git a/declarativeimports/test/gallery/Sliders.qml b/declarativeimports/test/gallery/Sliders.qml
index 0fe1d054a..f7150b588 100644
--- a/declarativeimports/test/gallery/Sliders.qml
+++ b/declarativeimports/test/gallery/Sliders.qml
@@ -34,7 +34,6 @@ Column {
         Column {
             anchors {
                 fill: parent
-                margins: 10
             }
             spacing: 10