diff --git a/WpfDesign.Designer/Project/Controls/GrayOutDesignerExceptActiveArea.cs b/WpfDesign.Designer/Project/Controls/GrayOutDesignerExceptActiveArea.cs index 19069ff..42c988d 100644 --- a/WpfDesign.Designer/Project/Controls/GrayOutDesignerExceptActiveArea.cs +++ b/WpfDesign.Designer/Project/Controls/GrayOutDesignerExceptActiveArea.cs @@ -31,7 +31,7 @@ namespace ICSharpCode.WpfDesign.Designer.Controls /// /// Gray out everything except a specific area. /// - sealed class GrayOutDesignerExceptActiveArea : FrameworkElement + public sealed class GrayOutDesignerExceptActiveArea : FrameworkElement { Geometry designSurfaceRectangle; Geometry activeAreaGeometry; diff --git a/WpfDesign.Designer/Project/Controls/InfoTextEnterArea.cs b/WpfDesign.Designer/Project/Controls/InfoTextEnterArea.cs index 07182e4..a03cc95 100644 --- a/WpfDesign.Designer/Project/Controls/InfoTextEnterArea.cs +++ b/WpfDesign.Designer/Project/Controls/InfoTextEnterArea.cs @@ -21,7 +21,6 @@ using System.Diagnostics; using System.Windows; using System.Windows.Controls; using System.Windows.Media; -using System.Windows.Threading; using System.Windows.Media.Animation; using ICSharpCode.WpfDesign.Adorners; using ICSharpCode.WpfDesign.Designer.Services; @@ -29,16 +28,13 @@ using ICSharpCode.WpfDesign.Designer.Services; namespace ICSharpCode.WpfDesign.Designer.Controls { /// - /// Gray out everything except a specific area. + /// A Info text area. /// - sealed class InfoTextEnterArea : FrameworkElement + public sealed class InfoTextEnterArea : FrameworkElement { - Geometry designSurfaceRectangle; Geometry activeAreaGeometry; - Geometry combinedGeometry; AdornerPanel adornerPanel; IDesignPanel designPanel; - const double MaxOpacity = 0.3; public InfoTextEnterArea() { @@ -49,7 +45,6 @@ namespace ICSharpCode.WpfDesign.Designer.Controls get { return activeAreaGeometry; } set { activeAreaGeometry = value; - combinedGeometry = activeAreaGeometry; } } @@ -80,8 +75,6 @@ namespace ICSharpCode.WpfDesign.Designer.Controls OptionService optionService = services.GetService(); if (designPanel != null && grayOut == null && optionService != null && optionService.GrayOutDesignSurfaceExceptParentContainerWhenDragging) { grayOut = new InfoTextEnterArea(); - grayOut.designSurfaceRectangle = new RectangleGeometry( - new Rect(0, 0, ((Border)designPanel.Child).Child.RenderSize.Width, ((Border)designPanel.Child).Child.RenderSize.Height)); grayOut.designPanel = designPanel; grayOut.adornerPanel = new AdornerPanel(); grayOut.adornerPanel.Order = AdornerOrder.Background; @@ -100,9 +93,7 @@ namespace ICSharpCode.WpfDesign.Designer.Controls designPanel.Adorners.Add(grayOut.adornerPanel); } } - - static readonly TimeSpan animationTime = new TimeSpan(2000000); - + internal static void Stop(ref InfoTextEnterArea grayOut) { if (grayOut != null) { diff --git a/WpfDesign.Designer/Project/Controls/SizeDisplay.cs b/WpfDesign.Designer/Project/Controls/SizeDisplay.cs index 8f660b8..014d751 100644 --- a/WpfDesign.Designer/Project/Controls/SizeDisplay.cs +++ b/WpfDesign.Designer/Project/Controls/SizeDisplay.cs @@ -16,11 +16,6 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -using System; -using System.Diagnostics; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; using System.Windows.Controls; @@ -29,7 +24,7 @@ namespace ICSharpCode.WpfDesign.Designer.Controls /// /// Display height of the element. /// - class HeightDisplay : Control + public class HeightDisplay : Control { static HeightDisplay() { @@ -40,7 +35,7 @@ namespace ICSharpCode.WpfDesign.Designer.Controls /// /// Display width of the element. /// - class WidthDisplay : Control + public class WidthDisplay : Control { static WidthDisplay() { diff --git a/WpfDesign.Designer/Project/Controls/Thumbs/DesignerThumb.cs b/WpfDesign.Designer/Project/Controls/Thumbs/DesignerThumb.cs index d47c3d8..a5c2e94 100644 --- a/WpfDesign.Designer/Project/Controls/Thumbs/DesignerThumb.cs +++ b/WpfDesign.Designer/Project/Controls/Thumbs/DesignerThumb.cs @@ -46,7 +46,7 @@ namespace ICSharpCode.WpfDesign.Designer.Controls public static readonly DependencyProperty OperationMenuProperty = DependencyProperty.Register("OperationMenu", typeof(Control[]), typeof(DesignerThumb), new PropertyMetadata(null)); - internal PlacementAlignment Alignment; + public PlacementAlignment Alignment; static DesignerThumb() { diff --git a/WpfDesign.Designer/Project/Controls/Thumbs/ResizeThumb.cs b/WpfDesign.Designer/Project/Controls/Thumbs/ResizeThumb.cs index 06e9c40..c184acd 100644 --- a/WpfDesign.Designer/Project/Controls/Thumbs/ResizeThumb.cs +++ b/WpfDesign.Designer/Project/Controls/Thumbs/ResizeThumb.cs @@ -29,7 +29,7 @@ namespace ICSharpCode.WpfDesign.Designer.Controls { bool checkWidth, checkHeight; - internal ResizeThumb(bool checkWidth, bool checkHeight) + public ResizeThumb(bool checkWidth, bool checkHeight) { Debug.Assert((checkWidth && checkHeight) == false); this.checkWidth = checkWidth;