Skip to content

Commit 71c5b35

Browse files
committed
Fix: tooltip in replace mode
1 parent ebb2473 commit 71c5b35

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

ICSharpCode.AvalonEdit/Search/SearchPanel.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public class SearchPanel : Control {
4545
SearchResultBackgroundRenderer renderer;
4646
TextBox searchTextBox;
4747
TextBox replaceTextBox;
48+
Border searchPanel;
4849
SearchPanelAdorner adorner;
4950

5051
#region DependencyProperties
@@ -294,6 +295,7 @@ void textArea_Document_TextChanged(object sender, EventArgs e) {
294295
/// <inheritdoc/>
295296
public override void OnApplyTemplate() {
296297
base.OnApplyTemplate();
298+
searchPanel = Template.FindName("PART_searchPanel", this) as Border;
297299
searchTextBox = Template.FindName("PART_searchTextBox", this) as TextBox;
298300
replaceTextBox = Template.FindName("PART_replaceTextBox", this) as TextBox;
299301
}
@@ -405,7 +407,7 @@ void DoSearch(bool changeSelection) {
405407
if (!renderer.CurrentResults.Any()) {
406408
messageView.IsOpen = true;
407409
messageView.Content = Localization.NoMatchesFoundText;
408-
messageView.PlacementTarget = searchTextBox;
410+
messageView.PlacementTarget = searchPanel;
409411
} else
410412
messageView.IsOpen = false;
411413
}
@@ -436,7 +438,7 @@ void SearchLayerKeyDown(object sender, KeyEventArgs e) {
436438
var error = Validation.GetErrors(searchTextBox).FirstOrDefault();
437439
if (error != null) {
438440
messageView.Content = Localization.ErrorText + " " + error.ErrorContent;
439-
messageView.PlacementTarget = searchTextBox;
441+
messageView.PlacementTarget = searchPanel;
440442
messageView.IsOpen = true;
441443
}
442444
}

ICSharpCode.AvalonEdit/Search/SearchPanel.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ControlTemplate.Resources>
88
<BooleanToVisibilityConverter x:Key="booleanToVisibilityConverter"/>
99
</ControlTemplate.Resources>
10-
<Border Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" BorderThickness="1" HorizontalAlignment="Right" VerticalAlignment="Top" Cursor="Arrow">
10+
<Border Name="PART_searchPanel" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" BorderThickness="1" HorizontalAlignment="Right" VerticalAlignment="Top" Cursor="Arrow">
1111
<StackPanel Orientation="Vertical">
1212
<StackPanel Orientation="Horizontal">
1313
<TextBox Name="PART_searchTextBox" Focusable="True" Width="150" Height="24" Margin="3,3,3,0" TabIndex="0">

0 commit comments

Comments
 (0)