Don't crash if input line exceeds max padding

DaPa · Jun 2, 2021 · b511cd2 · b511cd2
1 parent b564644
commit b511cd2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/ClangFormatEditor/ClangFormatEditor.csproj b/ClangFormatEditor/ClangFormatEditor.csproj
@@ -9,7 +9,7 @@
 		<Authors>Caphyon</Authors>
 		<Product>Clang-Format Editor</Product>
 		<RepositoryUrl>https://github.com/Caphyon/clang-format-detector</RepositoryUrl>
-		<Version>7.3.0</Version>
+		<Version>7.3.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ClangFormatEditor/DiffStyle/DiffMatchPatchWrapper.cs b/ClangFormatEditor/DiffStyle/DiffMatchPatchWrapper.cs
@@ -435,6 +435,11 @@ private int GetMaxLineWidth(List<string> lines)
     private static string AddPadding(string text, int targetPadding, bool isNewLine)
     {
       var paddingCount = targetPadding - text.Length;
+      // if too long, then don't pad at all!
+      if (paddingCount < 0)
+      {
+        paddingCount = 0;
+      }
       if (isNewLine)
       {
         return new string(' ', paddingCount) + text;

diff --git a/ClangFormatEditor/MVVM/Views/MainWindow.xaml b/ClangFormatEditor/MVVM/Views/MainWindow.xaml
@@ -169,8 +169,8 @@
     <TextBlock
       Grid.Row="8"
       Grid.Column="4"
-      HorizontalAlignment="Right"
-      VerticalAlignment="Bottom"
+      HorizontalAlignment="Center"
+      VerticalAlignment="Center"
       FontSize="10"
       Foreground="White"
       Text="{Binding Version}" />