Browse Source

Minor cleanup.

pull/15/head
mkonicek 15 years ago
parent
commit
32ba95171c
  1. 8
      src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs
  2. 22
      src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs

8
src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs

@ -149,10 +149,10 @@ namespace Debugger.AddIn.Visualizers.GridVisualizer
this.columnHider = new GridViewColumnHider((GridView)this.listView.View); this.columnHider = new GridViewColumnHider((GridView)this.listView.View);
cmbColumns.ItemsSource = this.columnHider.HideableColumns; cmbColumns.ItemsSource = this.columnHider.HideableColumns;
} }
} catch (GetValueException ex) { } catch (GetValueException) {
// TODO display ex msg // display ex msg
} catch (DebuggerVisualizerException ex) { } catch (DebuggerVisualizerException) {
// TODO display ex msg // display ex msg
} }
} }

22
src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs

@ -80,13 +80,29 @@ namespace ICSharpCode.SharpDevelop.Commands.TabStrip
{ {
public override void Run() public override void Run()
{ {
var projectBrowser = (ProjectBrowserPad.Instance.Control as ProjectBrowserPanel).ProjectBrowserControl; var fileName = GetActiveFileName();
var fileName = ((IWorkbenchWindow)Owner).ActiveViewContent.PrimaryFileName; var projectBrowser = GetProjectBrowser();
if (fileName != null) { if (fileName != null && projectBrowser != null) {
projectBrowser.SelectFileAndExpand(fileName); projectBrowser.SelectFileAndExpand(fileName);
projectBrowser.Focus(); projectBrowser.Focus();
} }
} }
string GetActiveFileName()
{
if ((this.Owner is IWorkbenchWindow) && (((IWorkbenchWindow)this.Owner).ActiveViewContent != null)) {
return (Owner as IWorkbenchWindow).ActiveViewContent.PrimaryFileName;
}
return null;
}
ProjectBrowserControl GetProjectBrowser()
{
if ((ProjectBrowserPad.Instance != null) && (ProjectBrowserPad.Instance.Control is ProjectBrowserPanel)) {
return (ProjectBrowserPad.Instance.Control as ProjectBrowserPanel).ProjectBrowserControl;
}
return null;
}
} }
/// <summary> /// <summary>

Loading…
Cancel
Save