Browse Source

Merge pull request #54 from jogibear9988/master

Two small XAML Designer fixes
pull/31/merge
Siegfried Oleg Pammer 12 years ago
parent
commit
f4ca65825a
  1. 7
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/MyTypeFinder.cs
  2. 4
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
  3. 2
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/RenderTransformOriginExtension.cs

7
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/MyTypeFinder.cs

@ -24,8 +24,8 @@ namespace ICSharpCode.WpfDesign.AddIn @@ -24,8 +24,8 @@ namespace ICSharpCode.WpfDesign.AddIn
var pc = MyTypeFinder.GetProjectContent(file);
foreach (var referencedProjectContent in pc.ThreadSafeGetReferencedContents()) {
string fileName = null;
try{
string fileName = null;
if (referencedProjectContent is ParseProjectContent)
{
var prj = ((ParseProjectContent)referencedProjectContent).Project as AbstractProject;
@ -39,8 +39,9 @@ namespace ICSharpCode.WpfDesign.AddIn @@ -39,8 +39,9 @@ namespace ICSharpCode.WpfDesign.AddIn
var assembly = Assembly.LoadFrom(fileName);
f.RegisterAssembly(assembly);
}
catch (Exception ex)
{}
catch (Exception ex) {
ICSharpCode.Core.LoggingService.Warn("Error loading Assembly : "+ (fileName ?? ""), ex);
}
}
return f;
}

4
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml

@ -585,9 +585,9 @@ @@ -585,9 +585,9 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Controls:RenderTransformOriginThumb}">
<Grid>
<Grid Width="10" Height="10" Margin="-5,-5,-5,-5">
<Ellipse Width="2" Height="2" Fill="Black"/>
<Ellipse Width="10" Height="10" Fill="Transparent" Stroke="Black" StrokeThickness="2" />
<Ellipse Width="10" Height="10" Fill="Transparent" Stroke="Black" StrokeThickness="1" />
</Grid>
</ControlTemplate>
</Setter.Value>

2
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/RenderTransformOriginExtension.cs

@ -58,7 +58,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions @@ -58,7 +58,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
AdornerPanel.SetPlacement(renderTransformOriginThumb,
new RelativePlacement(HorizontalAlignment.Left, VerticalAlignment.Top){ XRelativeToContentWidth = pRel.X, YRelativeToContentHeight = pRel.Y });
this.ExtendedItem.Properties.GetProperty(FrameworkElement.RenderTransformOriginProperty).SetValue(new Point(pRel.X,pRel.Y));
this.ExtendedItem.Properties.GetProperty(FrameworkElement.RenderTransformOriginProperty).SetValue(new Point(Math.Round(pRel.X, 4), Math.Round(pRel.Y, 4)));
}
Point renderTransformOrigin = new Point(0.5, 0.5);

Loading…
Cancel
Save