From 8742a9e814f80260c9b7953996ea0127ac36edb5 Mon Sep 17 00:00:00 2001
From: Larry Shaffer <larrys@dakotacarto.com>
Date: Wed, 22 May 2013 18:53:05 -0600
Subject: [PATCH] Fix for label buffer drawing triggered off of just its data
 defined size in the past (<2.0)

---
 src/core/qgspallabeling.cpp | 26 ++++++++++++--------------
 src/core/qgspallabeling.h   |  1 -
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
index d0f6320a19ad..58f254ce5e25 100644
--- a/src/core/qgspallabeling.cpp
+++ b/src/core/qgspallabeling.cpp
@@ -233,7 +233,6 @@ QgsPalLayerSettings::QgsPalLayerSettings()
 
   // text buffer
   bufferDraw = false;
-  bufferDrawOld = false; // on when old style buffer triggered by just size is found
   bufferSize = 1.0;
   bufferSizeInMapUnits = false;
   bufferColor = Qt::white;
@@ -755,6 +754,13 @@ void QgsPalLayerSettings::readDataDefinedProperty( QgsVectorLayer* layer,
     {
       //upgrade any existing property to field name-based
       layer->setCustomProperty( newPropertyName, QVariant( updateDataDefinedString( ddString ) ) );
+
+      // fix for buffer drawing triggered off of just its data defined size in the past (<2.0)
+      if ( oldIndx == 7 ) // old bufferSize enum
+      {
+        bufferDraw = true;
+        layer->setCustomProperty( "labeling/bufferDraw", true );
+      }
     }
 
     // remove old-style field index-based property
@@ -849,7 +855,6 @@ void QgsPalLayerSettings::readFromLayer( QgsVectorLayer* layer )
 
   // fix for buffer being keyed off of just its size in the past
   QVariant drawBuffer = layer->customProperty( "labeling/bufferDraw", QVariant() );
-  bufferDrawOld = !drawBuffer.isValid();
   if ( drawBuffer.isValid() )
   {
     bufferDraw = drawBuffer.toBool();
@@ -2511,6 +2516,11 @@ void QgsPalLayerSettings::parseTextBuffer()
     drawBuffer = exprVal.toBool();
   }
 
+  if ( !drawBuffer )
+  {
+    return;
+  }
+
   // data defined buffer size?
   double bufrSize = bufferSize;
   if ( dataDefinedValEval( "doublepos", QgsPalLayerSettings::BufferSize, exprVal ) )
@@ -2518,18 +2528,6 @@ void QgsPalLayerSettings::parseTextBuffer()
     bufrSize = exprVal.toDouble();
   }
 
-  // FIXME: find better solution for temporarily turning on buffer, when previously defined by size
-  // fix for buffer being keyed off of just its size in the past
-//  if ( bufrSize > 0.0 && bufferDrawOld )
-//  {
-//    drawBuffer = bufferDraw = true;
-//  }
-
-  if ( !drawBuffer )
-  {
-    return;
-  }
-
   // data defined buffer transparency?
   int bufTransp = bufferTransp;
   if ( dataDefinedValEval( "transp", QgsPalLayerSettings::BufferTransp, exprVal ) )
diff --git a/src/core/qgspallabeling.h b/src/core/qgspallabeling.h
index 8f41571da27e..296d1974e1eb 100644
--- a/src/core/qgspallabeling.h
+++ b/src/core/qgspallabeling.h
@@ -307,7 +307,6 @@ class CORE_EXPORT QgsPalLayerSettings
     //-- text buffer
 
     bool bufferDraw;
-    bool bufferDrawOld; // on when old style buffer triggered by just size is found
     double bufferSize; // buffer size
     bool bufferSizeInMapUnits; //true if buffer is in map units (otherwise in mm)
     QColor bufferColor;