From b4149dee8bffdf8a9de202a051ece86d03ab8c81 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sun, 6 Jan 2013 15:27:56 +0100 Subject: [PATCH] fix http://community.sharpdevelop.net/forums/p/16476/44890.aspx --- .../ICSharpCode.AvalonEdit/Search/SearchCommands.cs | 4 +--- .../AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchPanel.cs | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchCommands.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchCommands.cs index bda001d9ba..b7c125528e 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchCommands.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchCommands.cs @@ -73,9 +73,7 @@ namespace ICSharpCode.AvalonEdit.Search void ExecuteFind(object sender, ExecutedRoutedEventArgs e) { - if (panel.IsClosed) { - panel.Open(); - } + panel.Open(); panel.SearchPattern = TextArea.Selection.GetText(); Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.Input, (Action)delegate { panel.Reactivate(); }); } diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchPanel.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchPanel.cs index b3522537af..ec9119b0cf 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchPanel.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchPanel.cs @@ -379,10 +379,12 @@ namespace ICSharpCode.AvalonEdit.Search /// public void Open() { + if (!IsClosed) return; var layer = AdornerLayer.GetAdornerLayer(textArea); if (layer != null) layer.Add(adorner); textArea.TextView.BackgroundRenderers.Add(renderer); + IsClosed = false; } /// @@ -391,7 +393,7 @@ namespace ICSharpCode.AvalonEdit.Search public event EventHandler SearchOptionsChanged; /// - /// Raises the event. + /// Raises the event. /// protected virtual void OnSearchOptionsChanged(SearchOptionsChangedEventArgs e) {