Allow text wrapping in WPF controls #142
Conversation
DiffPlex.Wpf.Demo/MainWindow.xaml
Outdated
| @@ -18,6 +18,7 @@ | |||
| <StackPanel Orientation="Horizontal" Grid.Row="1" Background="#20808080"> | |||
| <Button Width="100" Height="20" x:Name="DiffButton" Content="Switch Mode" Click="DiffButton_Click" BorderBrush="{x:Null}" BorderThickness="0" Margin="16,0,1,0" /> | |||
| <Button Width="20" Height="20" x:Name="FutherActionsButton" Content="…" Click="FutherActionsButton_Click" BorderBrush="{x:Null}" BorderThickness="0" Margin="0,0,31,0" /> | |||
| <Button Width="100" Height="20" x:Name="TextWrapButton" Content="WrapText" Click="TextWrapButton_Click" BorderBrush="{x:Null}" Background="Green" BorderThickness="0" Margin="16,0,1,0" /> | |||
There was a problem hiding this comment.
This should not be a button but a check box where you can enable and disable word wrapping
DiffPlex.Wpf.Demo/MainWindow.xaml.cs
Outdated
| @@ -59,6 +59,11 @@ private void DiffButton_Click(object sender, RoutedEventArgs e) | |||
| DiffView.ShowInline(); | |||
| } | |||
|
|
|||
| private void TextWrapButton_Click(object sender, RoutedEventArgs e) | |||
| { | |||
| DiffView.EnableTextWrapping(); | |||
There was a problem hiding this comment.
Same as above, should be a toggle box that lets you enable and disable this mode
| x:Name="SelfControl" | ||
| mc:Ignorable="d" | ||
| d:DesignHeight="450" d:DesignWidth="800"> | ||
| <UserControl |
There was a problem hiding this comment.
nit: This file has a lot of formatting changes, ideally, we would only include the meaningful change for review
| @@ -41,15 +41,26 @@ internal static class Helper | |||
| internal static void RenderInlineDiffs(InternalLinesViewer viewer, ICollection<DiffPiece> lines, UIElement source, int contextLineCount) | |||
| { | |||
| viewer.Clear(); | |||
| var diffViewer = source as DiffViewer; | |||
There was a problem hiding this comment.
Shouldn't this work also for InlineDiffviewer too? If so, we can make a common interface for both to pass into this instead of UIElement.
DiffPlex.Wpf/Controls/Helper.cs
Outdated
| if (diffViewer.IsTextWrapEnabled) | ||
| { | ||
| var c = viewer.Add(null, null, null as string, ChangeType.Unchanged.ToString(), source); | ||
| c.Tag = line; |
There was a problem hiding this comment.
This can be done once after the block with a base element for c
DiffPlex.Wpf/Controls/Helper.cs
Outdated
| if (diffViewer.IsTextWrapEnabled) | ||
| { | ||
| var c = viewer.Add(line.Position, "+", details, changeType.ToString(), source); | ||
| c.Tag = line; |
|
|
||
| public WrapPanel Add(int? number, string operation, List<KeyValuePair<string, string>> value, string changeType, UIElement source) | ||
| { | ||
| if (source is DiffViewer diffViewer) |
There was a problem hiding this comment.
Same comment here, we should support inlinedifferviewer and not do this check.
…ewer and SideBySideDiffViewer
|
@mmanela any progress on this PR? |
Added the ability to wrap text by calling
DiffView.EnableTextWrapping(). This addresses issue #113IsTextWrapEnabled) that keeps track if the text should be wrapped or not(IfDiffViewer. ToggleTextWrapping()is called).!IsTextWrapEnabledthen theAdd()method would simply create aStackPanelwith horizontal Orientation, which does not allow text wrapping.IsTextWrapEnabledtheAdd()method would create aWrapPanelinstead with the same orientation asStackPanel, which does allow text wrapping.number,operation,textvariables align within the DiffViewer.IsTextWrapEnabledthen we would set the Horizontal scroll bar visibility to hidden/disabledBelow is an example of the text wrapping:
https://github.com/user-attachments/assets/53d3d13e-6338-4336-92f9-a566412f1fbc