diff --git a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj index b0f2f73d..b87ba43d 100644 --- a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj +++ b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj @@ -350,9 +350,6 @@ Resources\Img\LeftMainContent\brackets_Square_16xLG.png - - Resources\Img\LeftMainContent\PaneLayout_16x.png - diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj index c46db263..61536a9e 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -395,9 +395,6 @@ TextTemplatingFileGenerator MessageToken.cs - - Resources\Img\LeftMainContent\PaneLayout_16x.png - Resources\Img\LeftMainContent\brackets_Square_16xLG.png diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs index ae9773a7..10cb3212 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs @@ -98,8 +98,6 @@ public static readonly string RangeSliderDemoCtl = nameof(RangeSliderDemoCtl); - public static readonly string RelativePanelDemoCtl = nameof(RelativePanelDemoCtl); - public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl); public static readonly string RepeatButtonDemoCtl = nameof(RepeatButtonDemoCtl); diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt index c2da95c5..23421817 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt @@ -51,8 +51,7 @@ var controlList = new List "DialogDemoCtl", "SideMenuDemoCtl", "GridDemoCtl", - "RangeSliderDemoCtl", - "RelativePanelDemoCtl" + "RangeSliderDemoCtl" }; var styleList = new List { diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/PaneLayout_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/PaneLayout_16x.png deleted file mode 100644 index 9ee0b431..00000000 Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/PaneLayout_16x.png and /dev/null differ diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml index 619c18bb..ebcdc91b 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml @@ -325,11 +325,6 @@ - - - - - diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs deleted file mode 100644 index 85993180..00000000 --- a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs +++ /dev/null @@ -1,132 +0,0 @@ -using System.ComponentModel; -using System.Windows; -using System.Windows.Controls; -using HandyControl.Tools.Converter; - -namespace HandyControl.Controls -{ - public class RelativePanel : Panel - { - public static readonly DependencyProperty AboveProperty = DependencyProperty.RegisterAttached( - "Above", typeof(DependencyObject), typeof(RelativePanel), new PropertyMetadata(default(DependencyObject))); - - public static void SetAbove(DependencyObject element, DependencyObject value) => element.SetValue(AboveProperty, value); - - [TypeConverter(typeof(NameReferenceConverter))] - public static DependencyObject GetAbove(DependencyObject element) => (DependencyObject)element.GetValue(AboveProperty); - - public static readonly DependencyProperty AlignBottomWithProperty = DependencyProperty.RegisterAttached( - "AlignBottomWith", typeof(DependencyObject), typeof(RelativePanel), new PropertyMetadata(default(DependencyObject))); - - public static void SetAlignBottomWith(DependencyObject element, DependencyObject value) => element.SetValue(AlignBottomWithProperty, value); - - [TypeConverter(typeof(NameReferenceConverter))] - public static DependencyObject GetAlignBottomWith(DependencyObject element) => (DependencyObject)element.GetValue(AlignBottomWithProperty); - - public static readonly DependencyProperty AlignBottomWithPanelProperty = DependencyProperty.RegisterAttached( - "AlignBottomWithPanel", typeof(bool), typeof(RelativePanel), new PropertyMetadata(default(bool))); - - public static void SetAlignBottomWithPanel(DependencyObject element, bool value) => element.SetValue(AlignBottomWithPanelProperty, value); - - public static bool GetAlignBottomWithPanel(DependencyObject element) => (bool)element.GetValue(AlignBottomWithPanelProperty); - - public static readonly DependencyProperty AlignHorizontalCenterWithProperty = DependencyProperty.RegisterAttached( - "AlignHorizontalCenterWith", typeof(DependencyObject), typeof(RelativePanel), new PropertyMetadata(default(DependencyObject))); - - public static void SetAlignHorizontalCenterWith(DependencyObject element, DependencyObject value) => element.SetValue(AlignHorizontalCenterWithProperty, value); - - [TypeConverter(typeof(NameReferenceConverter))] - public static DependencyObject GetAlignHorizontalCenterWith(DependencyObject element) => (DependencyObject)element.GetValue(AlignHorizontalCenterWithProperty); - - public static readonly DependencyProperty AlignHorizontalCenterWithPanelProperty = DependencyProperty.RegisterAttached( - "AlignHorizontalCenterWithPanel", typeof(bool), typeof(RelativePanel), new PropertyMetadata(default(bool))); - - public static void SetAlignHorizontalCenterWithPanel(DependencyObject element, bool value) => element.SetValue(AlignHorizontalCenterWithPanelProperty, value); - - public static bool GetAlignHorizontalCenterWithPanel(DependencyObject element) => (bool)element.GetValue(AlignHorizontalCenterWithPanelProperty); - - public static readonly DependencyProperty AlignLeftWithProperty = DependencyProperty.RegisterAttached( - "AlignLeftWith", typeof(DependencyObject), typeof(RelativePanel), new PropertyMetadata(default(DependencyObject))); - - public static void SetAlignLeftWith(DependencyObject element, DependencyObject value) => element.SetValue(AlignLeftWithProperty, value); - - [TypeConverter(typeof(NameReferenceConverter))] - public static DependencyObject GetAlignLeftWith(DependencyObject element) => (DependencyObject)element.GetValue(AlignLeftWithProperty); - - public static readonly DependencyProperty AlignLeftWithPanelProperty = DependencyProperty.RegisterAttached( - "AlignLeftWithPanel", typeof(bool), typeof(RelativePanel), new PropertyMetadata(default(bool))); - - public static void SetAlignLeftWithPanel(DependencyObject element, bool value) => element.SetValue(AlignLeftWithPanelProperty, value); - - public static bool GetAlignLeftWithPanel(DependencyObject element) => (bool)element.GetValue(AlignLeftWithPanelProperty); - - public static readonly DependencyProperty AlignRightWithProperty = DependencyProperty.RegisterAttached( - "AlignRightWith", typeof(DependencyObject), typeof(RelativePanel), new PropertyMetadata(default(DependencyObject))); - - public static void SetAlignRightWith(DependencyObject element, DependencyObject value) => element.SetValue(AlignRightWithProperty, value); - - [TypeConverter(typeof(NameReferenceConverter))] - public static DependencyObject GetAlignRightWith(DependencyObject element) => (DependencyObject)element.GetValue(AlignRightWithProperty); - - public static readonly DependencyProperty AlignRightWithPanelProperty = DependencyProperty.RegisterAttached( - "AlignRightWithPanel", typeof(bool), typeof(RelativePanel), new PropertyMetadata(default(bool))); - - public static void SetAlignRightWithPanel(DependencyObject element, bool value) => element.SetValue(AlignRightWithPanelProperty, value); - - public static bool GetAlignRightWithPanel(DependencyObject element) => (bool)element.GetValue(AlignRightWithPanelProperty); - - public static readonly DependencyProperty AlignTopWithProperty = DependencyProperty.RegisterAttached( - "AlignTopWith", typeof(DependencyObject), typeof(RelativePanel), new PropertyMetadata(default(DependencyObject))); - - public static void SetAlignTopWith(DependencyObject element, DependencyObject value) => element.SetValue(AlignTopWithProperty, value); - - [TypeConverter(typeof(NameReferenceConverter))] - public static DependencyObject GetAlignTopWith(DependencyObject element) => (DependencyObject)element.GetValue(AlignTopWithProperty); - - public static readonly DependencyProperty AlignTopWithPanelProperty = DependencyProperty.RegisterAttached( - "AlignTopWithPanel", typeof(bool), typeof(RelativePanel), new PropertyMetadata(default(bool))); - - public static void SetAlignTopWithPanel(DependencyObject element, bool value) => element.SetValue(AlignTopWithPanelProperty, value); - - public static bool GetAlignTopWithPanel(DependencyObject element) => (bool)element.GetValue(AlignTopWithPanelProperty); - - public static readonly DependencyProperty AlignVerticalCenterWithProperty = DependencyProperty.RegisterAttached( - "AlignVerticalCenterWith", typeof(DependencyObject), typeof(RelativePanel), new PropertyMetadata(default(DependencyObject))); - - public static void SetAlignVerticalCenterWith(DependencyObject element, DependencyObject value) => element.SetValue(AlignVerticalCenterWithProperty, value); - - [TypeConverter(typeof(NameReferenceConverter))] - public static DependencyObject GetAlignVerticalCenterWith(DependencyObject element) => (DependencyObject)element.GetValue(AlignVerticalCenterWithProperty); - - public static readonly DependencyProperty AlignVerticalCenterWithPanelProperty = DependencyProperty.RegisterAttached( - "AlignVerticalCenterWithPanel", typeof(bool), typeof(RelativePanel), new PropertyMetadata(default(bool))); - - public static void SetAlignVerticalCenterWithPanel(DependencyObject element, bool value) => element.SetValue(AlignVerticalCenterWithPanelProperty, value); - - public static bool GetAlignVerticalCenterWithPanel(DependencyObject element) => (bool)element.GetValue(AlignVerticalCenterWithPanelProperty); - - public static readonly DependencyProperty BelowProperty = DependencyProperty.RegisterAttached( - "Below", typeof(DependencyObject), typeof(RelativePanel), new PropertyMetadata(default(DependencyObject))); - - public static void SetBelow(DependencyObject element, DependencyObject value) => element.SetValue(BelowProperty, value); - - [TypeConverter(typeof(NameReferenceConverter))] - public static DependencyObject GetBelow(DependencyObject element) => (DependencyObject)element.GetValue(BelowProperty); - - public static readonly DependencyProperty LeftOfProperty = DependencyProperty.RegisterAttached( - "LeftOf", typeof(DependencyObject), typeof(RelativePanel), new PropertyMetadata(default(DependencyObject))); - - public static void SetLeftOf(DependencyObject element, DependencyObject value) => element.SetValue(LeftOfProperty, value); - - [TypeConverter(typeof(NameReferenceConverter))] - public static DependencyObject GetLeftOf(DependencyObject element) => (DependencyObject)element.GetValue(LeftOfProperty); - - public static readonly DependencyProperty RightOfProperty = DependencyProperty.RegisterAttached( - "RightOf", typeof(DependencyObject), typeof(RelativePanel), new PropertyMetadata(default(DependencyObject))); - - public static void SetRightOf(DependencyObject element, DependencyObject value) => element.SetValue(RightOfProperty, value); - - [TypeConverter(typeof(NameReferenceConverter))] - public static DependencyObject GetRightOf(DependencyObject element) => (DependencyObject)element.GetValue(RightOfProperty); - } -} \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Data/Enum/RelativeStatus.cs b/src/Shared/HandyControl_Shared/Data/Enum/RelativeStatus.cs deleted file mode 100644 index 9712713f..00000000 --- a/src/Shared/HandyControl_Shared/Data/Enum/RelativeStatus.cs +++ /dev/null @@ -1,37 +0,0 @@ -namespace HandyControl_Shared.Data.Enum -{ - public enum RelativeStatus - { - LeftOf, - - Above, - - RightOf, - - Below, - - AlignLeftWith, - - AlignTopWith, - - AlignRightWith, - - AlignBottomWith, - - AlignHorizontalCenterWith, - - AlignVerticalCenterWith, - - AlignLeftWithPanel, - - AlignTopWithPanel, - - AlignRightWithPanel, - - AlignBottomWithPanel, - - AlignHorizontalCenterWithPanel, - - AlignVerticalCenterWithPanel - } -} diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems index 780c94e0..2253c400 100644 --- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems +++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems @@ -18,11 +18,9 @@ - -