Fix editing quotes

FrayxRulez · FrayxRulez · commit 126ecd3c0268 · 2025-11-01T16:55:12.000+04:00
diff --git a/Telegram/Controls/FormattedTextBox.cs b/Telegram/Controls/FormattedTextBox.cs
@@ -778,13 +778,10 @@ private void ClearStyle(ITextRange range, bool monospace)
 
                 range.SetRange(start, end);
 
-                if (range.CharacterFormat.Size != 10.5f)
-                {
-                    InsertBlockquote(range, true, false);
-                }
-
                 range.CharacterFormat = Document.GetDefaultCharacterFormat();
-                //range.ParagraphFormat = Document.GetDefaultParagraphFormat();
+                range.ParagraphFormat.SpaceAfter = 0;
+                range.ParagraphFormat.SpaceBefore = 0;
+                range.ParagraphFormat.SetIndents(0, 0, 0);
 
                 range.GetText(TextGetOptions.NoHidden, out string text);
                 range.SetText(TextSetOptions.Unlink, text);
@@ -1256,7 +1253,9 @@ private bool GetIsEmpty()
                 try
                 {
                     Document.Selection.CharacterFormat = Document.GetDefaultCharacterFormat();
-                    Document.Selection.ParagraphFormat = Document.GetDefaultParagraphFormat();
+                    Document.Selection.ParagraphFormat.SpaceAfter = 0;
+                    Document.Selection.ParagraphFormat.SpaceBefore = 0;
+                    Document.Selection.ParagraphFormat.SetIndents(0, 0, 0);
                 }
                 catch
                 {
@@ -1671,7 +1670,9 @@ public void InsertBlockquote(ITextRange textRange, bool enable, bool batch = tru
             else
             {
                 range.CharacterFormat.Size = 14 * magic;
-                range.ParagraphFormat = Document.GetDefaultParagraphFormat();
+                range.ParagraphFormat.SpaceAfter = 0;
+                range.ParagraphFormat.SpaceBefore = 0;
+                range.ParagraphFormat.SetIndents(0, 0, 0);
             }
 
             MergeParagraphs(range);
@@ -1821,14 +1822,17 @@ private void UpdateFormat()
                     }
                 }
 
-                if (range.ParagraphFormat.SpaceAfter != 0 && range.CharacterFormat.Size != 9)
+                if (range.ParagraphFormat.SpaceAfter == 6 && range.CharacterFormat.Size != 9)
                 {
                     range.CharacterFormat.Size = 9;
                 }
-                else if (range.ParagraphFormat.SpaceAfter == 0 && range.CharacterFormat.Size != 10.5f)
+                else if (range.ParagraphFormat.SpaceAfter != 6 && range.CharacterFormat.Size != 10.5f)
                 {
                     range.CharacterFormat.Size = 10.5f;
                 }
+
+                range.Collapse(false);
+
             } while (range.MoveStart(TextRangeUnit.CharacterFormat, 1) > 0);
 
             //EndUndoGroup();
@@ -1864,14 +1868,6 @@ private void UpdateBlocks()
 
                 lastPosition = range.StartPosition;
 
-                if (range.StartPosition == 0)
-                {
-                    //ContentElement.Padding = new Thickness(48, range.ParagraphFormat.SpaceAfter == 0 ? 13 : 7, 0, 15);
-                    ContentElement.Padding = new Thickness(0, 13, 0, 15);
-                    //ContentElement.Margin = new Thickness(0, range.ParagraphFormat.SpaceAfter == 0 ? 0 : 0, 0, 0);
-                    //Blocks.Padding = new Thickness(0, range.ParagraphFormat.SpaceAfter == 0 ? 0 : 0, 0, 0);
-                }
-
                 if (range.ParagraphFormat.SpaceAfter != 0)
                 {
                     range.GetRect(PointOptions.None, out Rect rect, out _);
@@ -1915,7 +1911,7 @@ private void ContentElement_ViewChanged(object sender, ScrollViewerViewChangedEv
             if (Blocks != null)
             {
                 Blocks.Height = ContentElement.ExtentHeight;
-                Blocks.Margin = new Thickness(0, -6, 0, Math.Min(0, ActualHeight - ContentElement.ExtentHeight));
+                Blocks.Margin = new Thickness(0, 0, 0, Math.Min(0, ActualHeight - ContentElement.ExtentHeight));
             }
         }
 
@@ -1935,8 +1931,10 @@ private void OnPreviewKeyDown(object sender, KeyRoutedEventArgs e)
 
                     range.SetText(TextSetOptions.None, "\r");
                     range.SetRange(range.StartPosition + direction, range.StartPosition + direction);
-                    range.ParagraphFormat = Document.GetDefaultParagraphFormat();
                     range.CharacterFormat = Document.GetDefaultCharacterFormat();
+                    range.ParagraphFormat.SpaceAfter = 0;
+                    range.ParagraphFormat.SpaceBefore = 0;
+                    range.ParagraphFormat.SetIndents(0, 0, 0);
                     Document.Selection.SetRange(range.StartPosition + direction, range.StartPosition + direction);
 
                     EndUndoGroup();

Original file line number	Diff line number	Diff line change
`@@ -778,13 +778,10 @@ private void ClearStyle(ITextRange range, bool monospace)`
`778`	`778`
`779`	`779`	`range.SetRange(start, end);`
`780`	`780`
`781`		`- if (range.CharacterFormat.Size != 10.5f)`
`782`		`- {`
`783`		`- InsertBlockquote(range, true, false);`
`784`		`- }`
`785`		`-`
`786`	`781`	`range.CharacterFormat = Document.GetDefaultCharacterFormat();`
`787`		`- //range.ParagraphFormat = Document.GetDefaultParagraphFormat();`
	`782`	`+ range.ParagraphFormat.SpaceAfter = 0;`
	`783`	`+ range.ParagraphFormat.SpaceBefore = 0;`
	`784`	`+ range.ParagraphFormat.SetIndents(0, 0, 0);`
`788`	`785`
`789`	`786`	`range.GetText(TextGetOptions.NoHidden, out string text);`
`790`	`787`	`range.SetText(TextSetOptions.Unlink, text);`
`@@ -1256,7 +1253,9 @@ private bool GetIsEmpty()`
`1256`	`1253`	`try`
`1257`	`1254`	`{`
`1258`	`1255`	`Document.Selection.CharacterFormat = Document.GetDefaultCharacterFormat();`
`1259`		`- Document.Selection.ParagraphFormat = Document.GetDefaultParagraphFormat();`
	`1256`	`+ Document.Selection.ParagraphFormat.SpaceAfter = 0;`
	`1257`	`+ Document.Selection.ParagraphFormat.SpaceBefore = 0;`
	`1258`	`+ Document.Selection.ParagraphFormat.SetIndents(0, 0, 0);`
`1260`	`1259`	`}`
`1261`	`1260`	`catch`
`1262`	`1261`	`{`
`@@ -1671,7 +1670,9 @@ public void InsertBlockquote(ITextRange textRange, bool enable, bool batch = tru`
`1671`	`1670`	`else`
`1672`	`1671`	`{`
`1673`	`1672`	`range.CharacterFormat.Size = 14 * magic;`
`1674`		`- range.ParagraphFormat = Document.GetDefaultParagraphFormat();`
	`1673`	`+ range.ParagraphFormat.SpaceAfter = 0;`
	`1674`	`+ range.ParagraphFormat.SpaceBefore = 0;`
	`1675`	`+ range.ParagraphFormat.SetIndents(0, 0, 0);`
`1675`	`1676`	`}`
`1676`	`1677`
`1677`	`1678`	`MergeParagraphs(range);`
`@@ -1821,14 +1822,17 @@ private void UpdateFormat()`
`1821`	`1822`	`}`
`1822`	`1823`	`}`
`1823`	`1824`
`1824`		`- if (range.ParagraphFormat.SpaceAfter != 0 && range.CharacterFormat.Size != 9)`
	`1825`	`+ if (range.ParagraphFormat.SpaceAfter == 6 && range.CharacterFormat.Size != 9)`
`1825`	`1826`	`{`
`1826`	`1827`	`range.CharacterFormat.Size = 9;`
`1827`	`1828`	`}`
`1828`		`- else if (range.ParagraphFormat.SpaceAfter == 0 && range.CharacterFormat.Size != 10.5f)`
	`1829`	`+ else if (range.ParagraphFormat.SpaceAfter != 6 && range.CharacterFormat.Size != 10.5f)`
`1829`	`1830`	`{`
`1830`	`1831`	`range.CharacterFormat.Size = 10.5f;`
`1831`	`1832`	`}`
	`1833`	`+`
	`1834`	`+ range.Collapse(false);`
	`1835`	`+`
`1832`	`1836`	`} while (range.MoveStart(TextRangeUnit.CharacterFormat, 1) > 0);`
`1833`	`1837`
`1834`	`1838`	`//EndUndoGroup();`
`@@ -1864,14 +1868,6 @@ private void UpdateBlocks()`
`1864`	`1868`
`1865`	`1869`	`lastPosition = range.StartPosition;`
`1866`	`1870`
`1867`		`- if (range.StartPosition == 0)`
`1868`		`- {`
`1869`		`- //ContentElement.Padding = new Thickness(48, range.ParagraphFormat.SpaceAfter == 0 ? 13 : 7, 0, 15);`
`1870`		`- ContentElement.Padding = new Thickness(0, 13, 0, 15);`
`1871`		`- //ContentElement.Margin = new Thickness(0, range.ParagraphFormat.SpaceAfter == 0 ? 0 : 0, 0, 0);`
`1872`		`- //Blocks.Padding = new Thickness(0, range.ParagraphFormat.SpaceAfter == 0 ? 0 : 0, 0, 0);`
`1873`		`- }`
`1874`		`-`
`1875`	`1871`	`if (range.ParagraphFormat.SpaceAfter != 0)`
`1876`	`1872`	`{`
`1877`	`1873`	`range.GetRect(PointOptions.None, out Rect rect, out _);`
`@@ -1915,7 +1911,7 @@ private void ContentElement_ViewChanged(object sender, ScrollViewerViewChangedEv`
`1915`	`1911`	`if (Blocks != null)`
`1916`	`1912`	`{`
`1917`	`1913`	`Blocks.Height = ContentElement.ExtentHeight;`
`1918`		`- Blocks.Margin = new Thickness(0, -6, 0, Math.Min(0, ActualHeight - ContentElement.ExtentHeight));`
	`1914`	`+ Blocks.Margin = new Thickness(0, 0, 0, Math.Min(0, ActualHeight - ContentElement.ExtentHeight));`
`1919`	`1915`	`}`
`1920`	`1916`	`}`
`1921`	`1917`
`@@ -1935,8 +1931,10 @@ private void OnPreviewKeyDown(object sender, KeyRoutedEventArgs e)`
`1935`	`1931`
`1936`	`1932`	`range.SetText(TextSetOptions.None, "\r");`
`1937`	`1933`	`range.SetRange(range.StartPosition + direction, range.StartPosition + direction);`
`1938`		`- range.ParagraphFormat = Document.GetDefaultParagraphFormat();`
`1939`	`1934`	`range.CharacterFormat = Document.GetDefaultCharacterFormat();`
	`1935`	`+ range.ParagraphFormat.SpaceAfter = 0;`
	`1936`	`+ range.ParagraphFormat.SpaceBefore = 0;`
	`1937`	`+ range.ParagraphFormat.SetIndents(0, 0, 0);`
`1940`	`1938`	`Document.Selection.SetRange(range.StartPosition + direction, range.StartPosition + direction);`
`1941`	`1939`
`1942`	`1940`	`EndUndoGroup();`