Skip to content
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.

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

Fixup highlighted graph #11123

Merged
merged 2 commits into from Aug 8, 2023
Merged

Conversation

mstv
Copy link
Member

@mstv mstv commented Aug 1, 2023

Fixes #11098
regressed in #10915

Proposed changes

  • Refactor: Simplify property RevisionGraphColumnProvider.RevisionGraphDrawStyle
  • Avoid drawing the same graph curve twice only if unrelated branches are colored

Screenshots

Before

image

After

image

Test methodology

  • manual

Please do not squash merge


✒️ I contribute this code under The Developer Certificate of Origin.

@ghost ghost assigned mstv Aug 1, 2023
Copy link
Member

@gerhardol gerhardol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1
Looks good, have not run

}
set { _revisionGraphDrawStyle = value; }
}
public RevisionGraphDrawStyle RevisionGraphDrawStyle;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes it a public field, which is discouraged.

Suggested change
public RevisionGraphDrawStyle RevisionGraphDrawStyle;
public RevisionGraphDrawStyle RevisionGraphDrawStyle { get; set; }

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

mstv added a commit to mstv/gitextensions that referenced this pull request Aug 3, 2023
mstv added a commit to mstv/gitextensions that referenced this pull request Aug 3, 2023
@mstv mstv force-pushed the fix/11098_highlighted_graph branch from c8a617c to acb4b84 Compare August 3, 2023 20:55
@mstv mstv force-pushed the fix/11098_highlighted_graph branch from acb4b84 to 8138a08 Compare August 8, 2023 18:02
@mstv mstv merged commit 8138a08 into gitextensions:master Aug 8, 2023
3 of 4 checks passed
@ghost ghost added this to the vNext milestone Aug 8, 2023
@mstv mstv deleted the fix/11098_highlighted_graph branch August 8, 2023 18:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Current branch line not fully colored when overlapping with other branches
3 participants