Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix option dialog crash when searching in tree widget
  • Loading branch information
nirvn committed Jul 19, 2019
1 parent 3d97aaa commit 7044063
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
16 changes: 3 additions & 13 deletions src/gui/qgsoptionsdialoghighlightwidgetsimpl.cpp
Expand Up @@ -25,6 +25,7 @@

#include "qgsoptionsdialoghighlightwidget.h"
#include "qgsmessagebaritem.h"
#include "qgslogger.h"

#include "qgsoptionsdialoghighlightwidgetsimpl.h"

Expand Down Expand Up @@ -235,13 +236,11 @@ bool QgsOptionsDialogHighlightTree::highlightText( const QString &text )

QList<QTreeWidgetItem *> items = treeWidget->findItems( text, Qt::MatchContains | Qt::MatchRecursive, 0 );
success = !items.empty();
mTreeInitialStyle.clear();
mTreeInitialExpand.clear();
QBrush highlightBackground( QColor( HIGHLIGHT_BACKGROUND_RED, HIGHLIGHT_BACKGROUND_GREEN, HIGHLIGHT_BACKGROUND_BLUE ) );
QBrush highlightText( QColor( HIGHLIGHT_TEXT_RED, HIGHLIGHT_TEXT_GREEN, HIGHLIGHT_TEXT_BLUE ) );
for ( QTreeWidgetItem *item : items )
{
mTreeInitialStyle.insert( item, qMakePair( item->background( 0 ), item->foreground( 0 ) ) );
item->setBackground( 0, QBrush( QColor( HIGHLIGHT_BACKGROUND_RED, HIGHLIGHT_BACKGROUND_GREEN, HIGHLIGHT_BACKGROUND_BLUE ) ) );
item->setForeground( 0, QBrush( QColor( HIGHLIGHT_TEXT_RED, HIGHLIGHT_TEXT_GREEN, HIGHLIGHT_TEXT_BLUE ) ) );
setChildrenVisible( item, true );

QTreeWidgetItem *parent = item;
Expand Down Expand Up @@ -284,15 +283,6 @@ void QgsOptionsDialogHighlightTree::reset()
item->setExpanded( mTreeInitialExpand.value( item ) );
}
}
for ( QTreeWidgetItem *item : mTreeInitialStyle.keys() )
{
if ( item )
{
item->setBackground( 0, mTreeInitialStyle.value( item ).first );
item->setForeground( 0, mTreeInitialStyle.value( item ).second );
}
}
mTreeInitialStyle.clear();
mTreeInitialExpand.clear();
}
}
1 change: 0 additions & 1 deletion src/gui/qgsoptionsdialoghighlightwidgetsimpl.h
Expand Up @@ -138,7 +138,6 @@ class GUI_EXPORT QgsOptionsDialogHighlightTree : public QgsOptionsDialogHighligh
void reset() override;
QPointer<QTreeView> mTreeView;
// 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>();
QMap<QTreeWidgetItem *, bool> mTreeInitialVisible = QMap<QTreeWidgetItem *, bool>();
};
Expand Down

0 comments on commit 7044063

Please sign in to comment.