Merge pull request #109 from jimfoye/master

Ensure search options panel is closed when search panel is closed

Author: dgrunwald

ICSharpCode.AvalonEdit/Search/SearchPanel.cs

@@ -46,6 +46,7 @@ public class SearchPanel : Control
 		TextDocument currentDocument;
 		SearchResultBackgroundRenderer renderer;
 		TextBox searchTextBox;
+		Popup dropdownPopup;
 		SearchPanelAdorner adorner;
 
 		#region DependencyProperties
@@ -275,7 +276,9 @@ void textArea_Document_TextChanged(object sender, EventArgs e)
 		public override void OnApplyTemplate()
 		{
 			base.OnApplyTemplate();
+
 			searchTextBox = Template.FindName("PART_searchTextBox", this) as TextBox;
+			dropdownPopup = Template.FindName("PART_dropdownPopup", this) as Popup;
 		}
 
 		void ValidateSearchText()
@@ -411,6 +414,8 @@ public void Close()
 			var layer = AdornerLayer.GetAdornerLayer(textArea);
 			if (layer != null)
 				layer.Remove(adorner);
+			if (dropdownPopup != null)
+				dropdownPopup.IsOpen = false;
 			messageView.IsOpen = false;
 			textArea.TextView.BackgroundRenderers.Remove(renderer);
 			if (hasFocus)

ICSharpCode.AvalonEdit/Search/SearchPanel.xaml

@@ -17,7 +17,7 @@
 							</TextBox>
 							<search:DropDownButton Height="24">
 								<search:DropDownButton.DropDownContent>
-									<Popup StaysOpen="False">
+									<Popup StaysOpen="False" Name="PART_dropdownPopup">
 										<Border Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" BorderThickness="1">
 											<StackPanel Orientation="Vertical">
 												<CheckBox IsChecked="{Binding MatchCase, RelativeSource={RelativeSource TemplatedParent}}" Content="{Binding Localization.MatchCaseText, RelativeSource={RelativeSource TemplatedParent}}" Margin="3" />