From df4cd4b1c6e42d7ddaa609ef559ab9565e486fc7 Mon Sep 17 00:00:00 2001 From: jkuehner Date: Sun, 4 May 2014 20:43:00 +0200 Subject: [PATCH] A few WhiteSpace fixes and Comments removed. --- .../Project/Controls/RotateThumb.cs | 8 -- .../Project/Controls/SizeDisplay.cs | 40 +++++----- .../Project/Extensions/Initializers.cs | 74 +++++++++---------- .../WpfDesign/WpfDesign/Project/Services.cs | 50 ++++++------- 4 files changed, 82 insertions(+), 90 deletions(-) diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/RotateThumb.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/RotateThumb.cs index f09d24855f..61a9257ee2 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/RotateThumb.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/RotateThumb.cs @@ -32,14 +32,6 @@ namespace ICSharpCode.WpfDesign.Designer.Controls { public class RotateThumb : ResizeThumb { -// private double initialAngle; -// private RotateTransform rotateTransform; -// private Vector startVector; -// private Point centerPoint; -// private Control designerItem; -// private Panel canvas; -// private AdornerPanel parent; - static RotateThumb() { DefaultStyleKeyProperty.OverrideMetadata(typeof(RotateThumb), new FrameworkPropertyMetadata(typeof(RotateThumb))); diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/SizeDisplay.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/SizeDisplay.cs index 9f75cdb161..8f660b84db 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/SizeDisplay.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/SizeDisplay.cs @@ -26,25 +26,25 @@ using System.Windows.Controls; namespace ICSharpCode.WpfDesign.Designer.Controls { - /// - /// Display height of the element. - /// - class HeightDisplay : Control - { - static HeightDisplay() - { - DefaultStyleKeyProperty.OverrideMetadata(typeof(HeightDisplay), new FrameworkPropertyMetadata(typeof(HeightDisplay))); - } - } + /// + /// Display height of the element. + /// + class HeightDisplay : Control + { + static HeightDisplay() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(HeightDisplay), new FrameworkPropertyMetadata(typeof(HeightDisplay))); + } + } - /// - /// Display width of the element. - /// - class WidthDisplay : Control - { - static WidthDisplay() - { - DefaultStyleKeyProperty.OverrideMetadata(typeof(WidthDisplay), new FrameworkPropertyMetadata(typeof(WidthDisplay))); - } - } + /// + /// Display width of the element. + /// + class WidthDisplay : Control + { + static WidthDisplay() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(WidthDisplay), new FrameworkPropertyMetadata(typeof(WidthDisplay))); + } + } } diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/Initializers.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/Initializers.cs index 4486c4730e..433d48f307 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/Initializers.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/Initializers.cs @@ -30,55 +30,55 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions.Initializers { public override void InitializeDefaults(DesignItem item) { - //Not every Content Control can have a text as Content (e.g. ZoomBox of WPF Toolkit) - if (item.Component is Button) - { + //Not every Content Control can have a text as Content (e.g. ZoomBox of WPF Toolkit) + if (item.Component is Button) + { DesignItemProperty contentProperty = item.Properties["Content"]; - if (contentProperty.ValueOnInstance == null) - { + if (contentProperty.ValueOnInstance == null) + { contentProperty.SetValue(item.ComponentType.Name); } } - DesignItemProperty verticalAlignmentProperty = item.Properties["VerticalAlignment"]; - if (verticalAlignmentProperty.ValueOnInstance == null) - { - verticalAlignmentProperty.SetValue(VerticalAlignment.Center); - } + DesignItemProperty verticalAlignmentProperty = item.Properties["VerticalAlignment"]; + if (verticalAlignmentProperty.ValueOnInstance == null) + { + verticalAlignmentProperty.SetValue(VerticalAlignment.Center); + } - DesignItemProperty horizontalAlignmentProperty = item.Properties["HorizontalAlignment"]; - if (horizontalAlignmentProperty.ValueOnInstance == null) - { - horizontalAlignmentProperty.SetValue(HorizontalAlignment.Center); - } + DesignItemProperty horizontalAlignmentProperty = item.Properties["HorizontalAlignment"]; + if (horizontalAlignmentProperty.ValueOnInstance == null) + { + horizontalAlignmentProperty.SetValue(HorizontalAlignment.Center); + } } } [ExtensionFor(typeof(TextBlock))] - public class TextBlockInitializer : DefaultInitializer - { - public override void InitializeDefaults(DesignItem item) - { - DesignItemProperty textProperty = item.Properties["Text"]; - if (textProperty.ValueOnInstance == null || textProperty.ValueOnInstance.ToString() == "") - { - textProperty.SetValue(item.ComponentType.Name); - } + public class TextBlockInitializer : DefaultInitializer + { + public override void InitializeDefaults(DesignItem item) + { + DesignItemProperty textProperty = item.Properties["Text"]; + if (textProperty.ValueOnInstance == null || textProperty.ValueOnInstance.ToString() == "") + { + textProperty.SetValue(item.ComponentType.Name); + } - DesignItemProperty verticalAlignmentProperty = item.Properties["VerticalAlignment"]; - if (verticalAlignmentProperty.ValueOnInstance == null) - { - verticalAlignmentProperty.SetValue(VerticalAlignment.Center); - } + DesignItemProperty verticalAlignmentProperty = item.Properties["VerticalAlignment"]; + if (verticalAlignmentProperty.ValueOnInstance == null) + { + verticalAlignmentProperty.SetValue(VerticalAlignment.Center); + } - DesignItemProperty horizontalAlignmentProperty = item.Properties["HorizontalAlignment"]; - if (horizontalAlignmentProperty.ValueOnInstance == null) - { - horizontalAlignmentProperty.SetValue(HorizontalAlignment.Center); - } - } + DesignItemProperty horizontalAlignmentProperty = item.Properties["HorizontalAlignment"]; + if (horizontalAlignmentProperty.ValueOnInstance == null) + { + horizontalAlignmentProperty.SetValue(HorizontalAlignment.Center); + } + } } - + [ExtensionFor(typeof(HeaderedContentControl), OverrideExtension = typeof(ContentControlInitializer))] public class HeaderedContentControlInitializer : DefaultInitializer { @@ -96,7 +96,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions.Initializers } } - [ExtensionFor(typeof(Shape))] + [ExtensionFor(typeof(Shape))] public class ShapeInitializer : DefaultInitializer { public override void InitializeDefaults(DesignItem item) diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Services.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Services.cs index 45940506e6..2f95f1b266 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Services.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Services.cs @@ -233,33 +233,33 @@ namespace ICSharpCode.WpfDesign #region IKeyBindingService /// - /// Service that handles all the key bindings in the designer. - /// - public interface IKeyBindingService - { - /// - /// Gets the object to which the bindings are being applied - /// - object Owner { get; } + /// Service that handles all the key bindings in the designer. + /// + public interface IKeyBindingService + { + /// + /// Gets the object to which the bindings are being applied + /// + object Owner { get; } - /// - /// Register with . - /// - /// The binding to be applied. - void RegisterBinding(KeyBinding binding); + /// + /// Register with . + /// + /// The binding to be applied. + void RegisterBinding(KeyBinding binding); - /// - /// De-register with . - /// - /// The binding to be applied. - void DeregisterBinding(KeyBinding binding); + /// + /// De-register with . + /// + /// The binding to be applied. + void DeregisterBinding(KeyBinding binding); - /// - /// Gets binding for the corresponding gesture otherwise returns null. - /// - /// The keyboard gesture requested. - KeyBinding GetBinding(KeyGesture gesture); - } - + /// + /// Gets binding for the corresponding gesture otherwise returns null. + /// + /// The keyboard gesture requested. + KeyBinding GetBinding(KeyGesture gesture); + } + #endregion }