diff options
| author | Greg Munn <greg@sgmunn.com> | 2018-06-14 22:17:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-14 22:17:36 +0300 |
| commit | 13cecd02aceddf29a1ed57b86f81c02994df1483 (patch) | |
| tree | 4e5da50644e1e049825989ec259b695dac814f39 | |
| parent | 19da0c7e85158e6cb4c38ec67342134d2b3711d3 (diff) | |
| parent | 218c49943387072f02bca079105af549b555ebf0 (diff) | |
Merge pull request #4922 from mono/backport-pr-4921-to-d15-7monodevelop-7.5.3.7
[d15-7] Fixes issue #4906 Gutter on the left corrupts when you hover over the
| -rw-r--r-- | main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextArea.cs | 4 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextViewMargin.cs | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextArea.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextArea.cs index bd49e64473..6c713b1043 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextArea.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextArea.cs @@ -2265,9 +2265,7 @@ namespace Mono.TextEditor cr.LineWidth = Options.Zoom; textViewCr.LineWidth = Options.Zoom; - textViewCr.Rectangle (textViewMargin.XOffset, 0, Allocation.Width - textViewMargin.XOffset, Allocation.Height); - textViewCr.Clip (); - + RenderMargins (cr, textViewCr, cairoArea); #if DEBUG_EXPOSE diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextViewMargin.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextViewMargin.cs index ec4a293298..9d3cd104fa 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextViewMargin.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextViewMargin.cs @@ -3075,6 +3075,9 @@ namespace Mono.TextEditor { // double xStart = System.Math.Max (area.X, XOffset); // xStart = System.Math.Max (0, xStart); + cr.Rectangle (XOffset, 0, textEditor.Allocation.Width - XOffset, textEditor.Allocation.Height); + cr.Clip (); + var correctedXOffset = System.Math.Floor (XOffset) - 1; var extendingMarker = line != null ? (IExtendingTextLineMarker)textEditor.Document.GetMarkers (line).FirstOrDefault (l => l is IExtendingTextLineMarker) : null; isSpaceAbove = extendingMarker != null ? extendingMarker.IsSpaceAbove : false; @@ -3306,6 +3309,7 @@ namespace Mono.TextEditor DrawScrollShadow (cr, x, y, _lineHeight); if (wrapper != null && wrapper.IsUncached) wrapper.Dispose (); + cr.ResetClip (); } void DrawScrollShadow (Cairo.Context cr, double x, double y, double _lineHeight) |