feature: diff - toggle show all lines (#615) #652
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The property "SyncScrollOffset" in TextDiff is distinct from the one with the same name in TwoSideTextDiff. These two properties are used in separate (though slightly related) ways and are not really connected. The one in TwoSideTextDiff is mainly used to keep the scroll-pos of the two SingleSideTextDiffPresenter views in sync (aligned), while the one in TextDiff is used only to preserve/reset the scroll-pos in the single CombinedTextDiffPresenter view when (re)loading Diff Content (so not really syncing anything). To clarify this and to make the two properties more distinguishable, I renamed the one in TextDiff to simply "ScrollOffset".
New StreamGeometry "Icons.Lines.All" using SVG path from "text_line_spacing_regular" at https://avaloniaui.github.io/icons.html. New String "Text.Diff.VisualLines.All" for en_US locale (no translations yet).
* Added new ToggleButton in DiffView toolbar, visible when IsTextDiff, disabling the buttons "Increase/Decrease Number of Visible Lines" when on. * Added new Preference property "UseFullTextDiff". * Added StyledProperty "UseFullTextDiffProperty" in TextDiffView, with a DataTemplate binding to the corresponding preference property. * When changed, UseFullTextDiffProperty is handled identically as UseSideBySideDiffProperty (via new helper method RefreshContent(), for unification with OnDataContextChanged()). * Added new method DiffContext.ToggleFullTextDiff() for changing the preference property and reloading the diff content. * Implemented the new feature by overriding the "unified" (number of context lines) for Commands.Diff() with a very high number. NOTE: The number used (~1 billion) is supposed to be the highest one working on Mac, according to this forum comment: https://stackoverflow.com/questions/28727424/for-git-diff-is-there-a-uinfinity-option-to-show-the-whole-file#comment135202820_28846576
goran-w
changed the title
goran-w
changed the title
love-linger
added a commit
that referenced
this pull request
Nov 4, 2024
* update localization for zh_CN and zh_TW * change the icon for `Icons.Lines.All` * reorder diff view toolbar buttons * move private methods after protected Signed-off-by: leo <longshuang@msn.cn>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This addresses the issue (suggestion) #615 - Implemented new TextDiff feature "Show All Lines" (toggle)
Summary of changes:
Increase/Decrease Number of Visible Lineswhen toggled ON.Icons.Lines.Allwith SVG path fromtext_line_spacing_regularat https://avaloniaui.github.io/icons.html.Text.Diff.VisualLines.Allfor en_US locale (no translations added yet).UseFullTextDiffto store this toggle setting.UseFullTextDiffPropertyin TextDiffView, with a DataTemplate binding to the corresponding preference property.unified(number of context lines) param for Commands.Diff() with a very high number (done in DiffContext.LoadDiffContent()).TextDiff.SyncScrollOffsettoTextDiff.ScrollOffset, to distinguish it from the identically named propertyTwoSideTextDiff.SyncScrollOffset. These two properties are distinct from each other and are used in separate (though slightly related) ways - they are not really connected, which initially confused me when reading the code. The one inTwoSideTextDiffis mainly used to keep the scroll-pos of the twoSingleSideTextDiffPresenterviews in sync (aligned), while the one inTextDiffis used only to preserve/reset the scroll-pos in the singleCombinedTextDiffPresenterview when (re)loading Diff Content (so not really syncing anything).