Siegfried Pammer 13 years ago
parent
commit
b4149dee8b
  1. 4
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchCommands.cs
  2. 4
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchPanel.cs

4
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchCommands.cs

@ -73,9 +73,7 @@ namespace ICSharpCode.AvalonEdit.Search
void ExecuteFind(object sender, ExecutedRoutedEventArgs e) void ExecuteFind(object sender, ExecutedRoutedEventArgs e)
{ {
if (panel.IsClosed) { panel.Open();
panel.Open();
}
panel.SearchPattern = TextArea.Selection.GetText(); panel.SearchPattern = TextArea.Selection.GetText();
Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.Input, (Action)delegate { panel.Reactivate(); }); Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.Input, (Action)delegate { panel.Reactivate(); });
} }

4
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchPanel.cs

@ -379,10 +379,12 @@ namespace ICSharpCode.AvalonEdit.Search
/// </summary> /// </summary>
public void Open() public void Open()
{ {
if (!IsClosed) return;
var layer = AdornerLayer.GetAdornerLayer(textArea); var layer = AdornerLayer.GetAdornerLayer(textArea);
if (layer != null) if (layer != null)
layer.Add(adorner); layer.Add(adorner);
textArea.TextView.BackgroundRenderers.Add(renderer); textArea.TextView.BackgroundRenderers.Add(renderer);
IsClosed = false;
} }
/// <summary> /// <summary>
@ -391,7 +393,7 @@ namespace ICSharpCode.AvalonEdit.Search
public event EventHandler<SearchOptionsChangedEventArgs> SearchOptionsChanged; public event EventHandler<SearchOptionsChangedEventArgs> SearchOptionsChanged;
/// <summary> /// <summary>
/// Raises the <see cref="SearchOptionsChanged" /> event. /// Raises the <see cref="SearchPanel.SearchOptionsChanged" /> event.
/// </summary> /// </summary>
protected virtual void OnSearchOptionsChanged(SearchOptionsChangedEventArgs e) protected virtual void OnSearchOptionsChanged(SearchOptionsChangedEventArgs e)
{ {

Loading…
Cancel
Save