Browse Source

Prevent crash in DockPanel.FocusManager.Activate when active pane was removed (e.g. the pad that was active when SharpDevelop was closed does not exist anymore after an AddIn was removed manually or SharpDevelop was updated)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2732 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 18 years ago
parent
commit
65ba1bf91a
  1. 178
      data/resources/layouts/Debug.xml
  2. 146
      data/resources/layouts/Default.xml
  3. 2
      data/templates/project/CSharp/DefaultAssemblyInfo.cs
  4. 3
      src/Libraries/DockPanel_Src/WinFormsUI/Docking/DockPanel.FocusManager.cs
  5. 6
      src/Libraries/DockPanel_Src/patchnotes.txt

178
data/resources/layouts/Debug.xml

@ -1,145 +1,137 @@ @@ -1,145 +1,137 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- DockPanel configuration file. Author: Weifen Luo, all rights reserved. -->
<!-- !!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!! -->
<DockPanel FormatVersion="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.172743055555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="7" ActivePane="-1">
<Contents Count="28">
<!--DockPanel configuration file. Author: Weifen Luo, all rights reserved.-->
<!--!!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!!-->
<DockPanel FormatVersion="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.172743055555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="-1" ActivePane="2">
<Contents Count="27">
<Content ID="0" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.SideBarView" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="3" PersistString="ICSharpCode.SharpDevelop.Gui.ErrorListPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="4" PersistString="ICSharpCode.SharpDevelop.Gui.TaskListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="5" PersistString="ICSharpCode.SharpDevelop.Gui.CompilerMessageView" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="6" PersistString="ICSharpCode.SharpDevelop.Gui.PropertyPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="7" PersistString="ICSharpCode.SharpDevelop.Gui.FileScout" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="8" PersistString="SearchAndReplace.SearchResultPanel" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="9" PersistString="ICSharpCode.SharpDevelop.Bookmarks.BookmarkPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="10" PersistString="ICSharpCode.CodeCoverage.CodeCoveragePad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="11" PersistString="ICSharpCode.SharpDevelop.Gui.DefinitionViewPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="12" PersistString="Boo.InterpreterAddIn.InterpreterPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="13" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.BreakPointsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="14" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.CallStackPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="15" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="16" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="17" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LocalVarPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="18" PersistString="HtmlHelp2.HtmlHelp2TocPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="19" PersistString="HtmlHelp2.HtmlHelp2IndexPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="20" PersistString="HtmlHelp2.HtmlHelp2SearchPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="21" PersistString="HtmlHelp2.HtmlHelp2IndexResultsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="22" PersistString="HtmlHelp2.HtmlHelp2DynamicHelpPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="23" PersistString="ICSharpCode.NAntAddIn.Gui.NAntPadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="24" PersistString="SharpQuery.Pads.SharpQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="25" PersistString="ICSharpCode.WixBinding.SetupDialogListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="26" PersistString="ICSharpCode.XmlEditor.XPathQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="27" PersistString="ICSharpCode.SharpDevelop.Gui.SdiWorkspaceWindow" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.ErrorListPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="3" PersistString="ICSharpCode.SharpDevelop.Gui.TaskListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="4" PersistString="ICSharpCode.SharpDevelop.Gui.CompilerMessageView" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="5" PersistString="ICSharpCode.SharpDevelop.Gui.PropertyPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="6" PersistString="ICSharpCode.SharpDevelop.Gui.FileScout" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="7" PersistString="SearchAndReplace.SearchResultPanel" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="8" PersistString="ICSharpCode.SharpDevelop.Bookmarks.BookmarkPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="9" PersistString="ICSharpCode.CodeCoverage.CodeCoveragePad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="10" PersistString="ICSharpCode.SharpDevelop.Gui.DefinitionViewPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="11" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.BreakPointsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="12" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.CallStackPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="13" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="14" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="15" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LocalVarPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="16" PersistString="HtmlHelp2.HtmlHelp2TocPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="17" PersistString="HtmlHelp2.HtmlHelp2IndexPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="18" PersistString="HtmlHelp2.HtmlHelp2SearchPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="19" PersistString="HtmlHelp2.HtmlHelp2IndexResultsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="20" PersistString="HtmlHelp2.HtmlHelp2DynamicHelpPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="21" PersistString="ICSharpCode.WixBinding.SetupDialogListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="22" PersistString="ICSharpCode.XmlEditor.XPathQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="23" PersistString="ICSharpCode.SharpDevelop.Gui.ToolsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="24" PersistString="ClassDiagramAddin.ClassEditorPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="25" PersistString="ICSharpCode.UnitTesting.UnitTestsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="26" PersistString="SharpServerTools.Forms.ServerBrowserTool" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
</Contents>
<Panes Count="8">
<Panes Count="7">
<Pane ID="0" DockState="DockLeft" ActiveContent="0">
<Contents Count="4">
<Contents Count="3">
<Content ID="0" RefID="0" />
<Content ID="1" RefID="7" />
<Content ID="2" RefID="2" />
<Content ID="3" RefID="1" />
<Content ID="1" RefID="6" />
<Content ID="2" RefID="1" />
</Contents>
</Pane>
<Pane ID="1" DockState="Float" ActiveContent="-1">
<Contents Count="2">
<Content ID="0" RefID="8" />
<Content ID="1" RefID="9" />
<Content ID="0" RefID="7" />
<Content ID="1" RefID="8" />
</Contents>
</Pane>
<Pane ID="2" DockState="DockRight" ActiveContent="16">
<Contents Count="8">
<Content ID="0" RefID="22" />
<Content ID="1" RefID="18" />
<Content ID="2" RefID="19" />
<Content ID="3" RefID="20" />
<Content ID="4" RefID="16" />
<Content ID="5" RefID="21" />
<Content ID="6" RefID="13" />
<Pane ID="2" DockState="DockRight" ActiveContent="14">
<Contents Count="11">
<Content ID="0" RefID="20" />
<Content ID="1" RefID="16" />
<Content ID="2" RefID="17" />
<Content ID="3" RefID="18" />
<Content ID="4" RefID="14" />
<Content ID="5" RefID="19" />
<Content ID="6" RefID="11" />
<Content ID="7" RefID="23" />
<Content ID="8" RefID="24" />
<Content ID="9" RefID="25" />
<Content ID="10" RefID="26" />
</Contents>
</Pane>
<Pane ID="3" DockState="Float" ActiveContent="-1">
<Contents Count="4">
<Content ID="0" RefID="3" />
<Content ID="1" RefID="5" />
<Content ID="2" RefID="4" />
<Content ID="3" RefID="11" />
<Content ID="0" RefID="2" />
<Content ID="1" RefID="4" />
<Content ID="2" RefID="3" />
<Content ID="3" RefID="10" />
</Contents>
</Pane>
<Pane ID="4" DockState="DockBottom" ActiveContent="5">
<Contents Count="10">
<Content ID="0" RefID="3" />
<Content ID="1" RefID="5" />
<Content ID="2" RefID="14" />
<Content ID="3" RefID="4" />
<Content ID="4" RefID="17" />
<Content ID="5" RefID="11" />
<Content ID="6" RefID="10" />
<Content ID="7" RefID="12" />
<Content ID="8" RefID="9" />
<Content ID="9" RefID="8" />
<Pane ID="4" DockState="DockBottom" ActiveContent="4">
<Contents Count="9">
<Content ID="0" RefID="2" />
<Content ID="1" RefID="4" />
<Content ID="2" RefID="12" />
<Content ID="3" RefID="3" />
<Content ID="4" RefID="15" />
<Content ID="5" RefID="10" />
<Content ID="6" RefID="9" />
<Content ID="7" RefID="8" />
<Content ID="8" RefID="7" />
</Contents>
</Pane>
<Pane ID="5" DockState="Float" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="6" />
<Content ID="0" RefID="5" />
</Contents>
</Pane>
<Pane ID="6" DockState="DockRight" ActiveContent="15">
<Contents Count="3">
<Content ID="0" RefID="6" />
<Content ID="1" RefID="15" />
<Content ID="2" RefID="24" />
</Contents>
</Pane>
<Pane ID="7" DockState="Document" ActiveContent="27">
<Contents Count="1">
<Content ID="0" RefID="27" />
<Pane ID="6" DockState="DockRight" ActiveContent="13">
<Contents Count="2">
<Content ID="0" RefID="5" />
<Content ID="1" RefID="13" />
</Contents>
</Pane>
</Panes>
<DockWindows>
<DockWindow ID="0" DockState="Document" ZOrderIndex="0">
<DockList Count="1">
<Pane ID="0" RefID="7" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</DockList>
<NestedPanes Count="0" />
</DockWindow>
<DockWindow ID="1" DockState="DockLeft" ZOrderIndex="2">
<DockList Count="1">
<NestedPanes Count="1">
<Pane ID="0" RefID="0" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
</DockList>
</NestedPanes>
</DockWindow>
<DockWindow ID="2" DockState="DockRight" ZOrderIndex="4">
<DockList Count="2">
<NestedPanes Count="2">
<Pane ID="0" RefID="6" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
<Pane ID="1" RefID="2" PrevPane="6" Alignment="Top" Proportion="0.353459972862958" />
</DockList>
<Pane ID="1" RefID="2" PrevPane="6" Alignment="Top" Proportion="0.448698068101053" />
</NestedPanes>
</DockWindow>
<DockWindow ID="3" DockState="DockTop" ZOrderIndex="1">
<DockList Count="0" />
<NestedPanes Count="0" />
</DockWindow>
<DockWindow ID="4" DockState="DockBottom" ZOrderIndex="3">
<DockList Count="1">
<NestedPanes Count="1">
<Pane ID="0" RefID="4" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</DockList>
</NestedPanes>
</DockWindow>
</DockWindows>
<FloatWindows Count="3">
<FloatWindow ID="0" Bounds="367, 404, 300, 300" AllowRedocking="True" ZOrderIndex="0">
<DockList Count="1">
<FloatWindow ID="0" Bounds="367, 404, 300, 300" ZOrderIndex="0">
<NestedPanes Count="1">
<Pane ID="0" RefID="1" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</DockList>
</NestedPanes>
</FloatWindow>
<FloatWindow ID="1" Bounds="1650, 609, 300, 300" AllowRedocking="True" ZOrderIndex="1">
<DockList Count="1">
<FloatWindow ID="1" Bounds="1650, 609, 300, 300" ZOrderIndex="1">
<NestedPanes Count="1">
<Pane ID="0" RefID="3" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</DockList>
</NestedPanes>
</FloatWindow>
<FloatWindow ID="2" Bounds="2013, 283, 300, 300" AllowRedocking="True" ZOrderIndex="2">
<DockList Count="1">
<FloatWindow ID="2" Bounds="2013, 283, 300, 300" ZOrderIndex="2">
<NestedPanes Count="1">
<Pane ID="0" RefID="5" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</DockList>
</NestedPanes>
</FloatWindow>
</FloatWindows>
</DockPanel>

146
data/resources/layouts/Default.xml

@ -1,121 +1,117 @@ @@ -1,121 +1,117 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- DockPanel configuration file. Author: Weifen Luo, all rights reserved. -->
<!-- !!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!! -->
<!--DockPanel configuration file. Author: Weifen Luo, all rights reserved.-->
<!--!!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!!-->
<DockPanel FormatVersion="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.172743055555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="-1" ActivePane="0">
<Contents Count="29">
<Contents Count="27">
<Content ID="0" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.SideBarView" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="3" PersistString="ICSharpCode.SharpDevelop.Gui.ErrorListPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="4" PersistString="ICSharpCode.SharpDevelop.Gui.TaskListPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="5" PersistString="ICSharpCode.SharpDevelop.Gui.CompilerMessageView" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="6" PersistString="ICSharpCode.SharpDevelop.Gui.PropertyPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="7" PersistString="ICSharpCode.SharpDevelop.Gui.FileScout" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="8" PersistString="SearchAndReplace.SearchResultPanel" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="9" PersistString="ICSharpCode.SharpDevelop.Bookmarks.BookmarkPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="10" PersistString="ICSharpCode.CodeCoverage.CodeCoveragePad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="11" PersistString="ICSharpCode.SharpDevelop.Gui.DefinitionViewPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="12" PersistString="Boo.InterpreterAddIn.InterpreterPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="13" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.BreakPointsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="14" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.CallStackPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="15" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="16" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="17" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LocalVarPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="18" PersistString="HtmlHelp2.HtmlHelp2TocPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="19" PersistString="HtmlHelp2.HtmlHelp2IndexPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="20" PersistString="HtmlHelp2.HtmlHelp2SearchPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="21" PersistString="HtmlHelp2.HtmlHelp2IndexResultsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="22" PersistString="HtmlHelp2.HtmlHelp2DynamicHelpPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="23" PersistString="ICSharpCode.NAntAddIn.Gui.NAntPadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="24" PersistString="SharpQuery.Pads.SharpQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="25" PersistString="ICSharpCode.WixBinding.SetupDialogListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="26" PersistString="ICSharpCode.XmlEditor.XPathQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="27" PersistString="ICSharpCode.UnitTesting.UnitTestsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="28" PersistString="ICSharpCode.Reports.Addin.ReportExplorer" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.ErrorListPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="3" PersistString="ICSharpCode.SharpDevelop.Gui.TaskListPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="4" PersistString="ICSharpCode.SharpDevelop.Gui.CompilerMessageView" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="5" PersistString="ICSharpCode.SharpDevelop.Gui.PropertyPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="6" PersistString="ICSharpCode.SharpDevelop.Gui.FileScout" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="7" PersistString="SearchAndReplace.SearchResultPanel" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="8" PersistString="ICSharpCode.SharpDevelop.Bookmarks.BookmarkPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="9" PersistString="ICSharpCode.CodeCoverage.CodeCoveragePad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="10" PersistString="ICSharpCode.SharpDevelop.Gui.DefinitionViewPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="11" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.BreakPointsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="12" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.CallStackPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="13" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="14" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="15" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LocalVarPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="16" PersistString="HtmlHelp2.HtmlHelp2TocPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="17" PersistString="HtmlHelp2.HtmlHelp2IndexPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="18" PersistString="HtmlHelp2.HtmlHelp2SearchPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="19" PersistString="HtmlHelp2.HtmlHelp2IndexResultsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="20" PersistString="HtmlHelp2.HtmlHelp2DynamicHelpPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="21" PersistString="ICSharpCode.WixBinding.SetupDialogListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="22" PersistString="ICSharpCode.XmlEditor.XPathQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="23" PersistString="ICSharpCode.UnitTesting.UnitTestsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="24" PersistString="ICSharpCode.SharpDevelop.Gui.ToolsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="25" PersistString="ClassDiagramAddin.ClassEditorPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="26" PersistString="SharpServerTools.Forms.ServerBrowserTool" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
</Contents>
<Panes Count="5">
<Pane ID="0" DockState="DockRight" ActiveContent="1">
<Pane ID="0" DockState="DockRight" ActiveContent="5">
<Contents Count="7">
<Content ID="0" RefID="6" />
<Content ID="0" RefID="5" />
<Content ID="1" RefID="1" />
<Content ID="2" RefID="24" />
<Content ID="3" RefID="14" />
<Content ID="4" RefID="15" />
<Content ID="5" RefID="27" />
<Content ID="6" RefID="28" />
<Content ID="2" RefID="12" />
<Content ID="3" RefID="13" />
<Content ID="4" RefID="23" />
<Content ID="5" RefID="25" />
<Content ID="6" RefID="26" />
</Contents>
</Pane>
<Pane ID="1" DockState="DockLeft" ActiveContent="0">
<Contents Count="3">
<Content ID="0" RefID="0" />
<Content ID="1" RefID="7" />
<Content ID="2" RefID="2" />
<Content ID="1" RefID="6" />
<Content ID="2" RefID="24" />
</Contents>
</Pane>
<Pane ID="2" DockState="Float" ActiveContent="-1">
<Contents Count="5">
<Content ID="0" RefID="3" />
<Content ID="1" RefID="4" />
<Content ID="2" RefID="8" />
<Content ID="3" RefID="9" />
<Content ID="4" RefID="11" />
<Content ID="0" RefID="2" />
<Content ID="1" RefID="3" />
<Content ID="2" RefID="7" />
<Content ID="3" RefID="8" />
<Content ID="4" RefID="10" />
</Contents>
</Pane>
<Pane ID="3" DockState="DockBottom" ActiveContent="5">
<Contents Count="9">
<Content ID="0" RefID="3" />
<Content ID="1" RefID="5" />
<Content ID="2" RefID="4" />
<Content ID="3" RefID="11" />
<Content ID="4" RefID="8" />
<Content ID="5" RefID="9" />
<Content ID="6" RefID="12" />
<Content ID="7" RefID="17" />
<Content ID="8" RefID="10" />
<Pane ID="3" DockState="DockBottom" ActiveContent="4">
<Contents Count="8">
<Content ID="0" RefID="2" />
<Content ID="1" RefID="4" />
<Content ID="2" RefID="3" />
<Content ID="3" RefID="10" />
<Content ID="4" RefID="7" />
<Content ID="5" RefID="8" />
<Content ID="6" RefID="15" />
<Content ID="7" RefID="9" />
</Contents>
</Pane>
<Pane ID="4" DockState="DockRight" ActiveContent="-1">
<Contents Count="8">
<Content ID="0" RefID="22" />
<Content ID="1" RefID="18" />
<Content ID="2" RefID="19" />
<Content ID="3" RefID="20" />
<Content ID="4" RefID="16" />
<Content ID="5" RefID="21" />
<Content ID="6" RefID="13" />
<Content ID="7" RefID="23" />
<Contents Count="7">
<Content ID="0" RefID="20" />
<Content ID="1" RefID="16" />
<Content ID="2" RefID="17" />
<Content ID="3" RefID="18" />
<Content ID="4" RefID="14" />
<Content ID="5" RefID="19" />
<Content ID="6" RefID="11" />
</Contents>
</Pane>
</Panes>
<DockWindows>
<DockWindow ID="0" DockState="Document" ZOrderIndex="0">
<DockList Count="0" />
<NestedPanes Count="0" />
</DockWindow>
<DockWindow ID="1" DockState="DockLeft" ZOrderIndex="3">
<DockList Count="1">
<NestedPanes Count="1">
<Pane ID="0" RefID="1" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
</DockList>
</NestedPanes>
</DockWindow>
<DockWindow ID="2" DockState="DockRight" ZOrderIndex="4">
<DockList Count="2">
<NestedPanes Count="2">
<Pane ID="0" RefID="0" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
<Pane ID="1" RefID="4" PrevPane="0" Alignment="Top" Proportion="0.353459972862958" />
</DockList>
</NestedPanes>
</DockWindow>
<DockWindow ID="3" DockState="DockTop" ZOrderIndex="2">
<DockList Count="0" />
<NestedPanes Count="0" />
</DockWindow>
<DockWindow ID="4" DockState="DockBottom" ZOrderIndex="1">
<DockList Count="1">
<NestedPanes Count="1">
<Pane ID="0" RefID="3" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</DockList>
</NestedPanes>
</DockWindow>
</DockWindows>
<FloatWindows Count="1">
<FloatWindow ID="0" Bounds="367, 404, 300, 300" AllowRedocking="True" ZOrderIndex="0">
<DockList Count="1">
<FloatWindow ID="0" Bounds="367, 404, 300, 300" ZOrderIndex="0">
<NestedPanes Count="1">
<Pane ID="0" RefID="2" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</DockList>
</NestedPanes>
</FloatWindow>
</FloatWindows>
</DockPanel>

2
data/templates/project/CSharp/DefaultAssemblyInfo.cs

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#region Using directives
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
#endregion

3
src/Libraries/DockPanel_Src/WinFormsUI/Docking/DockPanel.FocusManager.cs

@ -165,6 +165,9 @@ namespace WeifenLuo.WinFormsUI.Docking @@ -165,6 +165,9 @@ namespace WeifenLuo.WinFormsUI.Docking
ContentActivating = content;
return;
}
if (content.IsDisposed)
return;
DockContentHandler handler = content.DockHandler;
if (ContentContains(content, handler.ActiveWindowHandle))

6
src/Libraries/DockPanel_Src/patchnotes.txt

@ -8,3 +8,9 @@ Patch #1: @@ -8,3 +8,9 @@ Patch #1:
Remove redundant finalizers - in AutoHideStripBase.cs, DockPaneStripBase.cs
Changed background color of inactive pads. - in VS2005DockPaneCaption.cs, VS2005DockPaneStip.cs
Committed in revision 2706.
Patch #2:
Prevent crash in DockPanel.FocusManager.Activate when active pane was removed (e.g. the pad
that was active when SharpDevelop was closed does not exist anymore after an AddIn was removed
manually or SharpDevelop was updated)
Committed in revision 2732.

Loading…
Cancel
Save