use blue font for highlighted tree items

qgis · Jan 27, 2018 · 54cd01ac7dbab03fad96bc6c294192d183283780 · 54cd01a
1 parent 6be8249
commit 54cd01ac7dbab03fad96bc6c294192d183283780
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/gui/qgsoptionsdialogbase.cpp b/src/gui/qgsoptionsdialogbase.cpp
@@ -468,12 +468,13 @@ QgsSearchHighlightOptionWidget::QgsSearchHighlightOptionWidget( QWidget *widget
         {
           QList<QTreeWidgetItem *> items = treeWidget->findItems( searchText, Qt::MatchContains | Qt::MatchRecursive, 0 );
           mChangedStyle = items.count() ? true : false;
-          mTreeInitialBackground.clear();
+          mTreeInitialStyle.clear();
           mTreeInitialExpand.clear();
           for ( QTreeWidgetItem *item : items )
           {
-            mTreeInitialBackground.insert( item, item->background( 0 ) );
+            mTreeInitialStyle.insert( item, qMakePair( item->background( 0 ), item->foreground( 0 ) ) );
             item->setBackground( 0, QBrush( QColor( Qt::yellow ) ) );
+            item->setForeground( 0, QBrush( QColor( Qt::blue ) ) );
 
             QTreeWidgetItem *parent = item;
             while ( ( parent = parent->parent() ) )
@@ -484,7 +485,6 @@ QgsSearchHighlightOptionWidget::QgsSearchHighlightOptionWidget( QWidget *widget
               parent->setExpanded( true );
             }
           }
-
         }
       };
 
@@ -497,14 +497,15 @@ QgsSearchHighlightOptionWidget::QgsSearchHighlightOptionWidget( QWidget *widget
             item->setExpanded( mTreeInitialExpand.value( item ) );
           }
         }
-        for ( QTreeWidgetItem *item : mTreeInitialBackground.keys() )
+        for ( QTreeWidgetItem *item : mTreeInitialStyle.keys() )
         {
           if ( item )
           {
-            item->setBackground( 0, mTreeInitialBackground.value( item ) );
+            item->setBackground( 0, mTreeInitialStyle.value( item ).first );
+            item->setForeground( 0, mTreeInitialStyle.value( item ).second );
           }
         }
-        mTreeInitialBackground.clear();
+        mTreeInitialStyle.clear();
         mTreeInitialExpand.clear();
       };
     }

diff --git a/src/gui/qgsoptionsdialogbase.h b/src/gui/qgsoptionsdialogbase.h
@@ -90,8 +90,8 @@ class GUI_EXPORT QgsSearchHighlightOptionWidget : public QObject
   private:
     QPointer< QWidget > mWidget;
     QString mSearchText = QString();
-    // a map to save the tree state (backouground, expanded) before highlighting items
-    QMap<QTreeWidgetItem *, QBrush> mTreeInitialBackground = QMap<QTreeWidgetItem *, QBrush>();
+    // a map to save the tree state (backouground, font, expanded) before highlighting items
+    QMap<QTreeWidgetItem *, QPair<QBrush, QBrush>> mTreeInitialStyle = QMap<QTreeWidgetItem *, QPair<QBrush, QBrush>>();
     QMap<QTreeWidgetItem *, bool> mTreeInitialExpand = QMap<QTreeWidgetItem *, bool>();
     bool mValid = true;
     bool mChangedStyle = false;