From 491231e600915110d12216781d2f38018c82847d Mon Sep 17 00:00:00 2001
From: nyalldawson <nyall.dawson@gmail.com>
Date: Thu, 17 Oct 2013 21:36:28 +1100
Subject: [PATCH] Fix loading composer item frame thickness (fix #8866)

---
 src/app/composer/qgscomposeritemwidget.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/composer/qgscomposeritemwidget.cpp b/src/app/composer/qgscomposeritemwidget.cpp
index 5812be8d676..bdb4c4760da 100644
--- a/src/app/composer/qgscomposeritemwidget.cpp
+++ b/src/app/composer/qgscomposeritemwidget.cpp
@@ -78,9 +78,8 @@ void QgsComposerItemWidget::on_mFrameColorButton_colorChanged( const QColor& new
     return;
   }
   mItem->beginCommand( tr( "Frame color changed" ) );
-  QPen thePen;
+  QPen thePen = mItem->pen();
   thePen.setColor( newFrameColor );
-  thePen.setWidthF( mOutlineWidthSpinBox->value() );
 
   mItem->setPen( thePen );
   mItem->update();
@@ -332,6 +331,8 @@ void QgsComposerItemWidget::setValuesForGuiElements()
   mBlendModeCombo->blockSignals( true );
   mTransparencySlider->blockSignals( true );
   mTransparencySpnBx->blockSignals( true );
+  mFrameColorButton->blockSignals( true );
+  mBackgroundColorButton->blockSignals( true );
 
   mBackgroundColorButton->setColor( mItem->brush().color() );
   mBackgroundColorButton->setColorDialogTitle( tr( "Select background color" ) );
@@ -348,6 +349,8 @@ void QgsComposerItemWidget::setValuesForGuiElements()
   mTransparencySlider->setValue( mItem->transparency() );
   mTransparencySpnBx->setValue( mItem->transparency() );
 
+  mBackgroundColorButton->blockSignals( false );
+  mFrameColorButton->blockSignals( false );
   mOutlineWidthSpinBox->blockSignals( false );
   mFrameGroupBox->blockSignals( false );
   mBackgroundGroupBox->blockSignals( false );