Browse Source

fix #236; show images in debugger evaluation tooltip

pull/240/merge
Eusebiu Marcu 15 years ago
parent
commit
09a7400208
  1. 2
      Debugger/ILSpy.Debugger/Services/ImageService/ImageService.cs
  2. 4
      ILSpy/MainWindow.xaml
  3. 2
      ILSpy/MainWindow.xaml.cs

2
Debugger/ILSpy.Debugger/Services/ImageService/ImageService.cs

@ -27,7 +27,7 @@ namespace ICSharpCode.ILSpy.Debugger.Services
static BitmapImage LoadBitmap(string name) static BitmapImage LoadBitmap(string name)
{ {
try { try {
BitmapImage image = new BitmapImage(new Uri("pack://application:,,,/ILSpy.Debugger;component/Images/" + name + ".png")); BitmapImage image = new BitmapImage(new Uri("pack://application:,,,/ILSpy.Debugger.Plugin;component/Images/" + name + ".png"));
if (image == null) if (image == null)
return null; return null;
image.Freeze(); image.Freeze();

4
ILSpy/MainWindow.xaml

@ -78,12 +78,12 @@
SelectedItem="{Binding FilterSettings.Language}"/> SelectedItem="{Binding FilterSettings.Language}"/>
</ToolBar> </ToolBar>
<!-- Status bar --> <!-- Status bar -->
<StatusBar x:Name="statusBar" DockPanel.Dock="Bottom" Height="26"> <StatusBar x:Name="statusBar" DockPanel.Dock="Bottom" Height="26" Visibility="Collapsed">
<StatusBarItem DockPanel.Dock="Right"> <StatusBarItem DockPanel.Dock="Right">
<TextBlock VerticalAlignment="Center" <TextBlock VerticalAlignment="Center"
HorizontalAlignment="Right" HorizontalAlignment="Right"
x:Name="StatusLabel" x:Name="StatusLabel"
ToolTip="Debugger status" ToolTip="Status"
Text="Stand by..."/> Text="Stand by..."/>
</StatusBarItem> </StatusBarItem>
</StatusBar> </StatusBar>

2
ILSpy/MainWindow.xaml.cs

@ -706,6 +706,8 @@ namespace ICSharpCode.ILSpy
public void SetStatus(string status, Brush foreground) public void SetStatus(string status, Brush foreground)
{ {
if (this.statusBar.Visibility == Visibility.Collapsed)
this.statusBar.Visibility = Visibility.Visible;
this.StatusLabel.Foreground = foreground; this.StatusLabel.Foreground = foreground;
this.StatusLabel.Text = status; this.StatusLabel.Text = status;
} }

Loading…
Cancel
Save