Skip to content

Commit

Permalink
Merge #1968 Fix for black rows in GUI on conflicting mods
Browse files Browse the repository at this point in the history
  • Loading branch information
politas committed Dec 31, 2016
2 parents a772df5 + be01298 commit 174271a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.

## Unreleased

### Bugfixes
- [GUI] Fix for black rows in GUI on conflicting mods. (#1968 by: Rohaq; reviewed: politas)

## v1.22.0

### Bugfixes
Expand Down
4 changes: 2 additions & 2 deletions GUI/Main.cs
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,14 @@ private void ConflictsUpdated()
}
else
{
if (row.DefaultCellStyle.BackColor != SystemColors.ControlText)
if (row.DefaultCellStyle.BackColor != Color.Empty)
{
foreach (DataGridViewCell cell in row.Cells)
{
cell.ToolTipText = null;
}

row.DefaultCellStyle.BackColor = SystemColors.ControlText;
row.DefaultCellStyle.BackColor = Color.Empty;
ModList.InvalidateRow(row.Index);
}
}
Expand Down

0 comments on commit 174271a

Please sign in to comment.