Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add cell style on top of row
  • Loading branch information
NathanW2 committed Aug 22, 2015
1 parent 323977f commit b355420
Showing 1 changed file with 3 additions and 18 deletions.
21 changes: 3 additions & 18 deletions src/gui/attributetable/qgsattributetablemodel.cpp
Expand Up @@ -593,28 +593,13 @@ QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) cons
styles = QgsConditionalStyle::matchingConditionalStyles( layer()->rowStyles(), QVariant(), &mFeat );
mRowStylesMap.insert( index.row(), styles );

}
QgsConditionalStyle style = QgsConditionalStyle::stackStyles( styles );
// TODO Extract me out
foreach ( QgsConditionalStyle style, styles )
{
if ( style.isValid() )
{
if ( role == Qt::BackgroundColorRole && style.backgroundColor().isValid() )
return style.backgroundColor();
if ( role == Qt::TextColorRole && style.textColor().isValid() )
return style.textColor();
if ( role == Qt::DecorationRole )
return style.icon();
if ( role == Qt::FontRole )
return style.font();
}

}

QgsConditionalStyle rowstyle = QgsConditionalStyle::stackStyles( styles );
QgsFieldUIProperties props = layer()->fieldUIProperties( field.name() );
styles = QgsConditionalStyle::matchingConditionalStyles( props.conditionalStyles(), val, &mFeat );
style = QgsConditionalStyle::stackStyles( styles );
styles.insert( 0, rowstyle );
QgsConditionalStyle style = QgsConditionalStyle::stackStyles( styles );

if ( style.isValid() )
{
Expand Down

0 comments on commit b355420

Please sign in to comment.