From e82a1f11fc679fc01e386b2a0f9960fef05cb9c1 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Fri, 12 Jun 2009 17:34:27 +0000 Subject: [PATCH] Fixed showing completion window when another completion window is already open. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4282 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../CodeCompletion/CompletionWindow.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindow.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindow.cs index 3de46cc818..3838982ace 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindow.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindow.cs @@ -98,12 +98,15 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion base.OnSourceInitialized(e); } + InputHandler myInputHandler; + void AttachEvents() { this.TextArea.Caret.PositionChanged += CaretPositionChanged; this.TextArea.MouseWheel += textArea_MouseWheel; this.TextArea.PreviewTextInput += textArea_PreviewTextInput; - this.TextArea.ActiveInputHandler = new InputHandler(this); + myInputHandler = new InputHandler(this); + this.TextArea.ActiveInputHandler = myInputHandler; } /// @@ -113,7 +116,8 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion this.TextArea.MouseWheel -= textArea_MouseWheel; this.TextArea.PreviewTextInput -= textArea_PreviewTextInput; base.DetachEvents(); - this.TextArea.ActiveInputHandler = this.TextArea.DefaultInputHandler; + if (this.TextArea.ActiveInputHandler == myInputHandler) + this.TextArea.ActiveInputHandler = this.TextArea.DefaultInputHandler; } #region InputHandler