Merge pull request #1839 from rduivenvoorde/identify_color_11996

m-kuhn · m-kuhn · commit 7796b157f1a7 · 2015-01-21T12:31:30.000+01:00
fix for #11996, use user colors for rubberband instead of fixed red when...
diff --git a/src/gui/qgsidentifymenu.cpp b/src/gui/qgsidentifymenu.cpp
@@ -579,9 +579,18 @@ void QgsIdentifyMenu::handleMenuHover()
     QgsVectorLayer* vl = qobject_cast<QgsVectorLayer*>( result.mLayer );
     if ( !vl )
       continue;
+
     QgsHighlight *hl = new QgsHighlight( mCanvas, result.mFeature.geometry(), vl );
-    hl->setColor( QColor( 255, 0, 0 ) );
-    hl->setWidth( 2 );
+    QSettings settings;
+    QColor color = QColor( settings.value( "/Map/highlight/color", QGis::DEFAULT_HIGHLIGHT_COLOR.name() ).toString() );
+    int alpha = settings.value( "/Map/highlight/colorAlpha", QGis::DEFAULT_HIGHLIGHT_COLOR.alpha() ).toInt();
+    double buffer = settings.value( "/Map/highlight/buffer", QGis::DEFAULT_HIGHLIGHT_BUFFER_MM ).toDouble();
+    double minWidth = settings.value( "/Map/highlight/minWidth", QGis::DEFAULT_HIGHLIGHT_MIN_WIDTH_MM ).toDouble();
+    hl->setColor( color ); // sets also fill with default alpha
+    color.setAlpha( alpha );
+    hl->setFillColor( color ); // sets fill with alpha
+    hl->setBuffer( buffer );
+    hl->setMinWidth( minWidth );
     mRubberBands.append( hl );
     connect( vl, SIGNAL( destroyed() ), this, SLOT( layerDestroyed() ) );
   }
