Browse Source

Update to AvalonDock 1.2.2702.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5557 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Daniel Grunwald 16 years ago
parent
commit
0e6e93c019
  1. 17
      src/Libraries/AvalonDock/DockableFloatingWindow.cs
  2. 2
      src/Libraries/AvalonDock/DockableTabPanel.cs
  3. 3
      src/Libraries/AvalonDock/DocumentPane.cs
  4. 2
      src/Libraries/AvalonDock/FlyoutDockablePane.cs
  5. 2
      src/Libraries/AvalonDock/Properties/AssemblyInfo.cs

17
src/Libraries/AvalonDock/DockableFloatingWindow.cs

@ -86,9 +86,7 @@ namespace AvalonDock @@ -86,9 +86,7 @@ namespace AvalonDock
_previousPane = content.ContainerPane;
_arrayIndexPreviousPane = _previousPane.Items.IndexOf(content);
//pane.SetValue(ResizingPanel.ResizeWidthProperty, _previousPane.GetValue(ResizingPanel.ResizeWidthProperty));
//pane.SetValue(ResizingPanel.ResizeHeightProperty, _previousPane.GetValue(ResizingPanel.ResizeHeightProperty));
pane.Style = content.ContainerPane.Style;
//remove content from container pane
content.ContainerPane.RemoveContent(_arrayIndexPreviousPane);
@ -131,6 +129,8 @@ namespace AvalonDock @@ -131,6 +129,8 @@ namespace AvalonDock
Height = dockablePane.ActualHeight;
}
//transfer the style from the original dockablepane
pane.Style = dockablePane.Style;
//Width = dockablePane.ActualWidth;
//Height = dockablePane.ActualHeight;
@ -193,13 +193,10 @@ namespace AvalonDock @@ -193,13 +193,10 @@ namespace AvalonDock
{
DockablePane paneToAnchor = new DockablePane();
//transfer the resizing panel sizes
//paneToAnchor.SetValue(ResizingPanel.ResizeWidthProperty,
// HostedPane.GetValue(ResizingPanel.ResizeWidthProperty));
//paneToAnchor.SetValue(ResizingPanel.ResizeHeightProperty,
// HostedPane.GetValue(ResizingPanel.ResizeHeightProperty));
ResizingPanel.SetEffectiveSize(paneToAnchor, new Size(Width, Height));
if (HostedPane.Style != null)
paneToAnchor.Style = HostedPane.Style;
int selectedIndex = HostedPane.SelectedIndex;
@ -254,6 +251,10 @@ namespace AvalonDock @@ -254,6 +251,10 @@ namespace AvalonDock
newContainerPane.Items.Add(HostedPane.RemoveContent(0));
newContainerPane.SetValue(ResizingPanel.ResizeWidthProperty, _previousPane.GetValue(ResizingPanel.ResizeWidthProperty));
newContainerPane.SetValue(ResizingPanel.ResizeHeightProperty, _previousPane.GetValue(ResizingPanel.ResizeHeightProperty));
if (_previousPane.Style != null)
newContainerPane.Style = _previousPane.Style;
Manager.Anchor(newContainerPane, ((DockablePane)_previousPane).Anchor);
}
else

2
src/Libraries/AvalonDock/DockableTabPanel.cs

@ -51,7 +51,7 @@ namespace AvalonDock @@ -51,7 +51,7 @@ namespace AvalonDock
List<UIElement> childsOrderedByWidth = new List<UIElement>();
foreach (DockableContent child in Children)
foreach (FrameworkElement child in Children)
{
child.Width = double.NaN;
child.Height = double.NaN;

3
src/Libraries/AvalonDock/DocumentPane.cs

@ -55,6 +55,9 @@ namespace AvalonDock @@ -55,6 +55,9 @@ namespace AvalonDock
void DocumentPane_Loaded(object sender, RoutedEventArgs e)
{
if (Parent == null)
return;
if (GetManager() == null)
throw new InvalidOperationException("DocumentPane must be put under a DockingManager!");

2
src/Libraries/AvalonDock/FlyoutDockablePane.cs

@ -62,6 +62,8 @@ namespace AvalonDock @@ -62,6 +62,8 @@ namespace AvalonDock
//if (double.IsInfinity(ResizingPanel.GetResizeHeight(this)))
// ResizingPanel.SetResizeHeight(this, 200);
this.Style = _referencedPane.Style;
//remove content from container pane
//and add content to my temporary pane
_referencedPane.Items.RemoveAt(_arrayIndexPreviousPane);

2
src/Libraries/AvalonDock/Properties/AssemblyInfo.cs

@ -59,4 +59,4 @@ using System.Runtime.InteropServices; @@ -59,4 +59,4 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.2.2691")]
[assembly: AssemblyVersion("1.2.2702")]

Loading…
Cancel
Save