Browse Source

Fix unit tests.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4776 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 16 years ago
parent
commit
1884f91c61
  1. 16
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/BorderForInvisibleControl.cs
  2. 2
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Adorners/AdornerProviderClasses.cs
  3. 10
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Extensions/DefaultExtension.cs

16
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/BorderForInvisibleControl.cs

@ -18,14 +18,14 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions @@ -18,14 +18,14 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
{
base.OnInitialized();
var adornerPanel = new AdornerPanel();
var border = new Border();
border.BorderThickness = new Thickness(1);
border.BorderBrush = Brushes.WhiteSmoke;
border.IsHitTestVisible = false;
AdornerPanel.SetPlacement(border, AdornerPlacement.FillContent);
adornerPanel.Children.Add(border);
Adorners.Add(adornerPanel);
var adornerPanel = new AdornerPanel();
var border = new Border();
border.BorderThickness = new Thickness(1);
border.BorderBrush = Brushes.WhiteSmoke;
border.IsHitTestVisible = false;
AdornerPanel.SetPlacement(border, AdornerPlacement.FillContent);
adornerPanel.Children.Add(border);
Adorners.Add(adornerPanel);
}
}
}

2
src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Adorners/AdornerProviderClasses.cs

@ -15,7 +15,7 @@ namespace ICSharpCode.WpfDesign.Adorners @@ -15,7 +15,7 @@ namespace ICSharpCode.WpfDesign.Adorners
/// <summary>
/// An adorner extension that is attached permanently.
/// </summary>
[ExtensionServer(typeof(DefaultExtensionServer.Permanent))]
[ExtensionServer(typeof(DefaultExtensionServer.PermanentWithDesignPanel))]
public abstract class PermanentAdornerProvider : AdornerProvider
{

10
src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Extensions/DefaultExtension.cs

@ -124,5 +124,15 @@ namespace ICSharpCode.WpfDesign.Extensions @@ -124,5 +124,15 @@ namespace ICSharpCode.WpfDesign.Extensions
return true;
}
}
// special extension server like 'permanent' - skips applying extensions if there
// is no design panel (e.g. in designer unit tests).
internal sealed class PermanentWithDesignPanel : DefaultExtensionServer
{
public override bool ShouldApplyExtensions(DesignItem extendedItem)
{
return Services.GetService(typeof(IDesignPanel)) != null;
}
}
}
}

Loading…
Cancel
Save