From a7492f5bbf2b06bc24351705b6756c24778161c8 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Wed, 14 Sep 2016 09:34:52 +1000
Subject: [PATCH] Fix excessive margins on color picker when in style dock

(cherry-picked from c9f0901b5be95f9ddd3337a3f8c70f0ed192ca19)
---
 src/gui/qgscompoundcolorwidget.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gui/qgscompoundcolorwidget.cpp b/src/gui/qgscompoundcolorwidget.cpp
index cb897d5f5449..0389c90cb5b1 100644
--- a/src/gui/qgscompoundcolorwidget.cpp
+++ b/src/gui/qgscompoundcolorwidget.cpp
@@ -42,6 +42,8 @@ QgsCompoundColorWidget::QgsCompoundColorWidget( QWidget *parent, const QColor& c
   {
     // shuffle stuff around
     QVBoxLayout* newLayout = new QVBoxLayout();
+    newLayout->setMargin( 0 );
+    newLayout->setContentsMargins( 0, 0, 0, 0 );
     newLayout->addWidget( mTabWidget );
     newLayout->addWidget( mSlidersWidget );
     newLayout->addWidget( mPreviewWidget );