Use color name to compare colors when adding new recent color, prevents

duplicate colors in recent color list
qgis · Oct 8, 2014 · 732a8994d2ae3143d1afa88bb81286ccf6f37f72 · 732a899
1 parent 344eccd
commit 732a8994d2ae3143d1afa88bb81286ccf6f37f72
Unified Split

Showing with 12 additions and 2 deletions.

+12 −2 src/gui/qgscolorbuttonv2.cpp
diff --git a/src/gui/qgscolorbuttonv2.cpp b/src/gui/qgscolorbuttonv2.cpp
@@ -519,11 +519,21 @@ void QgsColorButtonV2::addRecentColor( const QColor& color )
 
   QSettings settings;
   QList< QVariant > recentColorVariants = settings.value( QString( "/colors/recent" ) ).toList();
-  QVariant colorVariant = QVariant( opaqueColor );
-  recentColorVariants.removeAll( colorVariant );
 
+  //remove colors by name
+  for ( int colorIdx = recentColorVariants.length() - 1; colorIdx >= 0; --colorIdx )
+  {
+    if (( recentColorVariants.at( colorIdx ).value<QColor>() ).name() == opaqueColor.name() )
+    {
+      recentColorVariants.removeAt( colorIdx );
+    }
+  }
+
+  //add color
+  QVariant colorVariant = QVariant( opaqueColor );
   recentColorVariants.prepend( colorVariant );
 
+  //trim to 20 colors
   while ( recentColorVariants.count() > 20 )
   {
     recentColorVariants.pop_back();