diff options
| author | Lluis Sanchez <llsan@microsoft.com> | 2019-06-05 18:19:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-05 18:19:37 +0300 |
| commit | dc9b40856b1e896d3adad266fbd3e93a598ccd22 (patch) | |
| tree | 6cc7c1723756c5e5e499f2663fb4c190550e0c7a /main | |
| parent | dd358afa9e8645838372086e5295c70f0d0bea2a (diff) | |
| parent | 7a5867ac2c134fe6d73b96703869c0b50bccd4e8 (diff) | |
Merge pull request #7791 from mono/pr-david-fix901091
Fix 901424: After click in the document navigation editor doesn't get focus
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpPathedDocumentExtension.DataProvider.cs | 3 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBoxListWindow.cs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpPathedDocumentExtension.DataProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpPathedDocumentExtension.DataProvider.cs index aa1c806bf2..5c02589975 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpPathedDocumentExtension.DataProvider.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpPathedDocumentExtension.DataProvider.cs @@ -244,9 +244,6 @@ namespace MonoDevelop.CSharp //FIXME: use the snapshot that the nodes came from var point = new VirtualSnapshotPoint (editor.TextBuffer.CurrentSnapshot, offset); EditorOperations.SelectAndMoveCaret (point, point, TextSelectionMode.Stream, EnsureSpanVisibleOptions.AlwaysCenter); - - // TOTEST - // editor.Properties.GetProperty<DocumentController> (typeof (DocumentController)).GrabFocus (); } public int IconCount { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBoxListWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBoxListWindow.cs index d8594f9307..9eb058dc89 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBoxListWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBoxListWindow.cs @@ -92,6 +92,8 @@ namespace MonoDevelop.Components var sel = list.Selection; if (sel >= 0 && sel < DataProvider.IconCount) { DataProvider.ActivateItem (sel); + // This is so parent window of dropdown regains focus + TransientFor.Present (); Destroy (); } }; |