Fix image loading bug

icsharpcode · Dec 17, 2018 · 3a742e7 · 3a742e7
1 parent 9d85001
commit 3a742e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ILSpy.Core/ILSpy.Core.csproj b/ILSpy.Core/ILSpy.Core.csproj
@@ -56,7 +56,7 @@
     <Content Include="Images\*.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <EmbeddedResource Include="Images\ILSpy.png;Images\PrivateInternal.png">
+    <EmbeddedResource Include="Images\ILSpy.png;Images\PrivateInternal.png;Images\Search.png;;Images\ClearSearch.png;">
     </EmbeddedResource>
   </ItemGroup>
 

diff --git a/ILSpy.Core/Search/SearchPane.xaml b/ILSpy.Core/Search/SearchPane.xaml
@@ -17,7 +17,7 @@
 					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
 				<local:SearchBox x:Name="searchBox" DockPanel.Dock="Top" Grid.Column="0" Grid.Row="0" Margin="1"
-            SearchIcon="Images/Search.png" ClearSearchIcon="Images/ClearSearch.png"
+            SearchIcon="resm:ICSharpCode.ILSpy.Images.Search.png?assembly=ILSpy.Core" ClearSearchIcon="resm:ICSharpCode.ILSpy.Images.ClearSearch.png?assembly=ILSpy.Core"
 						Text="{Binding SearchTerm, ElementName=searchPane}" ToolTip.Tip="Search" UpdateDelay="0:0:0.1"
 						WatermarkColor="Gray" Watermark="Search for t:TypeName, m:Member or c:Constant; use exact match (=term), 'should not contain' (-term) or 'must contain' (+term); use /reg(ular)?Ex(pressions)?/ or both - t:/Type(Name)?/..." />
 				<StackPanel Grid.Column="1" Grid.Row="0" Orientation="Horizontal">
@@ -46,7 +46,7 @@
             <!--TODO:TextTrimming-->
 						<StackPanel Orientation="Horizontal" Grid.Column="0">
 							<Image Height="16" Margin="0,0,4,0" Width="16" Source="{Binding Image}" />
-							<TextBlock Text="{Binding Name}" ToolTip="{Binding ToolTip}" />
+							<TextBlock Text="{Binding Name}" ToolTip.Tip="{Binding ToolTip}" />
 						</StackPanel>
 						<StackPanel Orientation="Horizontal"  Grid.Column="1">
 							<Image Height="16" Margin="4,0,4,0" Width="16" Source="{Binding LocationImage}" />