Don't wrap text in the diff view

UI/ViewModels/FormControlPatchViewModel.cs

 using pEp.DPE;
 using System.Windows.Documents;
-using System.Windows.Media;
 
 namespace pEp.UI.ViewModels
 {
@@ -8,7 +7,7 @@ namespace pEp.UI.ViewModels
     {
         #region Fields
 
-        private Patch patch;
+        private readonly Patch patch;
 
         #endregion
 
@@ -48,7 +47,7 @@ namespace pEp.UI.ViewModels
         /// <summary>
         /// Gets the diff of this patch as formatted flow document.
         /// </summary>
-        public FlowDocument DisplayDiff { get; }
+        public FlowDocument DisplayDiff => PatchDialogViewModel.FormatDiff(this.Diff);
 
         /// <summary>
         /// The explanation shown in the UI regarding this patch.
@@ -132,59 +131,12 @@ namespace pEp.UI.ViewModels
             this.Explanation = "New configuration changes pending approval";
             this.IsRejectButtonVisible = true;
             this.OKButtonText = "Support";
-            this.DisplayDiff = this.FormatDiff();
         }
 
         #endregion
 
         #region Methods
 
-        /// <summary>
-        /// Formats the diff displaying colors of changes.
-        /// </summary>
-        /// <returns>The formatted diff or null if no diff is available.</returns>
-        private FlowDocument FormatDiff()
-        {
-            if (string.IsNullOrEmpty(this.Diff))
-            {
-                return null;
-            }
-
-            FlowDocument document = new FlowDocument
-            {
-                FontFamily = new FontFamily("Courier New"),
-                FontSize = 12.0,
-                Background = Brushes.White
-            };
-
-            string[] lines = this.Diff?.Replace("\r\n", "\n")?.Split('\n') ?? new string[] { };
-            foreach (string line in lines)
-            {
-                Paragraph paragraph = new Paragraph(new Run(line))
-                {
-                    Margin = new System.Windows.Thickness(1),
-                    LineHeight = 14.0
-                };
-
-                if (line.StartsWith("-"))
-                {
-                    paragraph.Background = Globals.ResourceDict["BrushRedBackground"] as Brush;
-                }
-                else if (line.StartsWith("+"))
-                {
-                    paragraph.Background = Globals.ResourceDict["BrushGreenBackground"] as Brush;
-                }
-                else if (line.StartsWith("@@"))
-                {
-                    paragraph.Background = Brushes.LightGray;
-                }
-
-                document.Blocks.Add(paragraph);
-            }
-
-            return document;
-        }
-
         /// <summary>
         /// Rejects this patch.
         /// </summary>

UI/ViewModels/PatchDialogViewModel.cs

@@ -10,6 +10,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Media;
 
@@ -522,53 +523,6 @@ namespace pEp.UI.ViewModels
                 Log.Error($"EditFileAndCreateDiff: Error reading file content from { fileName }: { ex }");
             }
         }
-
-        /// <summary>
-        /// Formats the diff displaying colors of changes.
-        /// </summary>
-        /// <returns>The formatted diff or null if no diff is available.</returns>
-        private FlowDocument FormatDiff(string diff)
-        {
-            if (string.IsNullOrEmpty(diff))
-            {
-                return null;
-            }
-
-            FlowDocument document = new FlowDocument
-            {
-                FontFamily = new FontFamily("Courier New"),
-                FontSize = 12.0,
-                Background = Brushes.White,
-            };
-
-            string[] lines = diff?.Replace("\r\n", "\n")?.Split('\n') ?? new string[] { };
-            foreach (string line in lines)
-            {
-                Paragraph paragraph = new Paragraph(new Run(line))
-                {
-                    Margin = new System.Windows.Thickness(1),
-                    LineHeight = 14.0
-                };
-
-                if (line.StartsWith("-"))
-                {
-                    paragraph.Background = Globals.ResourceDict["BrushRedBackground"] as Brush;
-                }
-                else if (line.StartsWith("+"))
-                {
-                    paragraph.Background = Globals.ResourceDict["BrushGreenBackground"] as Brush;
-                }
-                else if (line.StartsWith("@@"))
-                {
-                    paragraph.Background = Brushes.LightGray;
-                }
-
-                document.Blocks.Add(paragraph);
-            }
-
-            return document;
-        }
-
         /// <summary>
         /// Gets a common root URI from all selected files in the dialog.
         /// </summary>
@@ -630,7 +584,7 @@ namespace pEp.UI.ViewModels
         /// </summary>
         private void UpdateVisibleDiff()
         {
-            this.VisibleDiff = this.FormatDiff(this.SelectedFile?.Diff);
+            this.VisibleDiff = PatchDialogViewModel.FormatDiff(this.SelectedFile?.Diff);
         }
 
         /// <summary>
@@ -645,5 +599,73 @@ namespace pEp.UI.ViewModels
         }
 
         #endregion
+
+        #region Static methods
+
+        /// <summary>
+        /// Formats the diff displaying colors of changes.
+        /// </summary>
+        /// <returns>The formatted diff or null if no diff is available.</returns>
+        public static FlowDocument FormatDiff(string diff)
+        {
+            if (string.IsNullOrEmpty(diff))
+            {
+                return null;
+            }
+
+            // Initialize the document with zero width to set the real width later
+            FlowDocument document = new FlowDocument
+            {
+                Background = Brushes.White,
+                PageWidth = 0
+            };
+
+            string[] lines = diff.Replace("\r\n", "\n")?.Split('\n') ?? new string[] { };
+            foreach (string line in lines)
+            {
+                Paragraph paragraph = new Paragraph()
+                {
+                    Margin = new Thickness(1),
+                };
+
+                TextBlock textBlock = new TextBlock()
+                {
+                    Text = line,
+                    FontFamily = new FontFamily("Courier New"),
+                    LineHeight = 14.0,
+                    FontSize = 12.0,
+                    TextWrapping = TextWrapping.NoWrap
+                };
+
+                // Set the document width to the biggest textblock width plus some margin
+                // to account for padding inside the scroll viewer
+                textBlock.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+                if (textBlock.DesiredSize.Width > document.PageWidth)
+                {
+                    document.PageWidth = textBlock.DesiredSize.Width + 50;
+                }
+                paragraph.Inlines.Add(textBlock);
+
+                // Color the added and removed lines accordingly
+                if (line.StartsWith("-"))
+                {
+                    paragraph.Background = Globals.ResourceDict["BrushRedBackground"] as Brush;
+                }
+                else if (line.StartsWith("+"))
+                {
+                    paragraph.Background = Globals.ResourceDict["BrushGreenBackground"] as Brush;
+                }
+                else if (line.StartsWith("@@"))
+                {
+                    paragraph.Background = Brushes.LightGray;
+                }
+
+                document.Blocks.Add(paragraph);
+            }
+
+            return document;
+        }
+        
+        #endregion
     }
 }

UI/Views/FormControlPatchView.xaml

@@ -72,6 +72,7 @@
         <FlowDocumentScrollViewer Grid.Column="1"
                                   Grid.ColumnSpan="2"
                                   Grid.Row="3"
+                                  HorizontalScrollBarVisibility="Auto"
                                   BorderBrush="Black"
                                   BorderThickness="1"
                                   Margin="5,10,10,10"

UI/Views/FormControlPatchView.xaml.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace pEp.UI.Views
 {

UI/Views/PatchDialogView.xaml

@@ -72,6 +72,7 @@
                                   BorderBrush="Black"
                                   BorderThickness="1"
                                   Margin="5,10,10,10"
+                                  HorizontalScrollBarVisibility="Auto"
                                   Document="{Binding VisibleDiff}"/>
         <ui:TextBoxWithPlaceholder Grid.Column="0"
                                    Grid.ColumnSpan="3"