Don't hard-code black and gray for layer tree items' text color

qgis · Feb 11, 2019 · 4be150c · 4be150c
1 parent f8f701c
commit 4be150c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/python/core/auto_generated/layertree/qgslayertreemodel.sip.in b/python/core/auto_generated/layertree/qgslayertreemodel.sip.in
@@ -304,7 +304,7 @@ Gets map of map layer style overrides (key: layer ID, value: style name) where a
 
     void setLayerStyleOverrides( const QMap<QString, QString> &overrides );
 %Docstring
-Set map of map layer style overrides (key: layer ID, value: style name) where a different style should be used instead of the current one
+Sets map of map layer style overrides (key: layer ID, value: style name) where a different style should be used instead of the current one
 
 .. versionadded:: 2.10
 %End

diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
@@ -277,13 +277,15 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
   }
   else if ( role == Qt::ForegroundRole )
   {
-    QBrush brush( Qt::black, Qt::SolidPattern );
+    QBrush brush( qApp->palette().color( QPalette::Text ), Qt::SolidPattern );
     if ( QgsLayerTree::isLayer( node ) )
     {
       const QgsMapLayer *layer = QgsLayerTree::toLayer( node )->layer();
       if ( ( !node->isVisible() && ( !layer || layer->isSpatial() ) ) || ( layer && !layer->isInScaleRange( mLegendMapViewScale ) ) )
       {
-        brush.setColor( Qt::gray );
+        QColor fadedTextColor = brush.color();
+        fadedTextColor.setAlpha( 66 );
+        brush.setColor( fadedTextColor );
       }
     }
     return brush;

diff --git a/src/core/layertree/qgslayertreemodel.h b/src/core/layertree/qgslayertreemodel.h
@@ -269,7 +269,7 @@ class CORE_EXPORT QgsLayerTreeModel : public QAbstractItemModel
     QMap<QString, QString> layerStyleOverrides() const;
 
     /**
-     * Set map of map layer style overrides (key: layer ID, value: style name) where a different style should be used instead of the current one
+     * Sets map of map layer style overrides (key: layer ID, value: style name) where a different style should be used instead of the current one
      * \since QGIS 2.10
      */
     void setLayerStyleOverrides( const QMap<QString, QString> &overrides );