Browse Source

Merge branch 'DrawLineOnCanvas'

pull/650/head
jkuehner 11 years ago
parent
commit
d6ec889a87
  1. 2
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/LineExtensionBase.cs
  2. 20
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/NumberEditor.xaml.cs

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

@ -73,7 +73,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
public LineExtensionBase() public LineExtensionBase()
{ {
_surface = new Canvas(); _surface = new Canvas();
adornerPanel = new AdornerPanel(); adornerPanel = new AdornerPanel(){ MinWidth = 10, MinHeight = 10 };
adornerPanel.Order = AdornerOrder.Foreground; adornerPanel.Order = AdornerOrder.Foreground;
adornerPanel.Children.Add(_surface); adornerPanel.Children.Add(_surface);
Adorners.Add(adornerPanel); Adorners.Add(adornerPanel);

20
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/NumberEditor.xaml.cs

@ -117,16 +117,20 @@ namespace ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors
Maximum = range.Max; Maximum = range.Max;
} }
if (Minimum == 0 && Maximum == 1) { if (type == typeof(double) || type == typeof(decimal)) {
DecimalPlaces = 2; DecimalPlaces = 2;
SmallChange = 0.01;
LargeChange = 0.1;
}
else {
ClearValue(DecimalPlacesProperty);
ClearValue(SmallChangeProperty);
ClearValue(LargeChangeProperty);
} }
// if (Minimum == 0 && Maximum == 1) {
// DecimalPlaces = 2;
// SmallChange = 0.01;
// LargeChange = 0.1;
// }
// else {
// ClearValue(DecimalPlacesProperty);
// ClearValue(SmallChangeProperty);
// ClearValue(LargeChangeProperty);
// }
} }
public override void OnApplyTemplate() public override void OnApplyTemplate()

Loading…
Cancel
Save