diff options
| author | Greg Munn <greg@sgmunn.com> | 2015-01-26 19:19:24 +0300 |
|---|---|---|
| committer | Greg Munn <greg@sgmunn.com> | 2015-01-26 19:19:24 +0300 |
| commit | 3f8ad4f0c050253e823515388bde42e129cda967 (patch) | |
| tree | 3d7231b4da900766273400f256725feca02ddb38 /main/src/core/MonoDevelop.Ide/MonoDevelop.Components | |
| parent | e4eb73730323c45d21fff14b5a1532eb147bd304 (diff) | |
| parent | 8f9269ec166195392be3214108a090aeed269aa8 (diff) | |
Merge branch 'master' into xamarin-publishing-workflow
Conflicts:
version-checks
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Components')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs index 9f8890bda6..48909cd63b 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs @@ -199,12 +199,15 @@ namespace MonoDevelop.Components set; } - public void RepositionWindow () + public void RepositionWindow (Gdk.Rectangle? newCaret = null) { if (parent == null) return; int x, y; + if (newCaret.HasValue) {//Update caret if parameter is given + currentCaret = newCaret.Value; + } Gdk.Rectangle caret = currentCaret; Gdk.Window window = targetWindow; if (targetWindow == null) |