Skip to content

Remove ListViewItem/ColumnHeader dead code #666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zsd4yr merged 1 commit into from
Apr 15, 2019
Merged

Remove ListViewItem/ColumnHeader dead code #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/System.Windows.Forms/src/System/Windows/Forms/ColumnHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,10 +497,7 @@ public ColumnHeaderImageListIndexer(ColumnHeader ch) {

public override ImageList ImageList {
get {
if (owner != null && owner.ListView != null) {
return owner.ListView.SmallImageList;
}
return null;
return owner.ListView?.SmallImageList;
}
set {
Debug.Assert(false, "We should never set the image list");
Expand Down
9 changes: 6 additions & 3 deletions src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1404,19 +1404,22 @@ public Rectangle Bounds {

internal bool CustomBackColor {
get {
return style != null && !style.backColor.IsEmpty;
Debug.Assert(style != null, "Should have checked CustomStyle");
return !style.backColor.IsEmpty;
}
}

internal bool CustomFont {
get {
return style != null && style.font != null;
Debug.Assert(style != null, "Should have checked CustomStyle");
return style.font != null;
}
}

internal bool CustomForeColor {
get {
return style != null && !style.foreColor.IsEmpty;
Debug.Assert(style != null, "Should have checked CustomStyle");
return !style.foreColor.IsEmpty;
}
}

Expand Down