From 6817368e3c731532637b3520a2518cd9e58f82c9 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 25 Jul 2023 12:46:32 -0500 Subject: [PATCH 1/4] Updated tooling to latest version --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 99952514..f841534f 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 999525140c222d35862b9f22e402cd8ca58847e9 +Subproject commit f841534f3f0e213603e94de00f8286ceac3d7a6b From 876f3b26b7d4cd73dcef87dae982c30d2cfaa3f1 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 25 Jul 2023 14:03:34 -0500 Subject: [PATCH 2/4] Fixed conflicting generated property name --- .../samples/LayoutTransformControlSample.xaml | 8 ++++---- .../samples/LayoutTransformControlSample.xaml.cs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/LayoutTransformControl/samples/LayoutTransformControlSample.xaml b/components/LayoutTransformControl/samples/LayoutTransformControlSample.xaml index bd4b3fb0..316feabc 100644 --- a/components/LayoutTransformControl/samples/LayoutTransformControlSample.xaml +++ b/components/LayoutTransformControl/samples/LayoutTransformControlSample.xaml @@ -34,7 +34,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -84,7 +84,7 @@ - + diff --git a/components/LayoutTransformControl/samples/LayoutTransformControlSample.xaml.cs b/components/LayoutTransformControl/samples/LayoutTransformControlSample.xaml.cs index bee0dab8..6a7b5ebd 100644 --- a/components/LayoutTransformControl/samples/LayoutTransformControlSample.xaml.cs +++ b/components/LayoutTransformControl/samples/LayoutTransformControlSample.xaml.cs @@ -10,8 +10,8 @@ namespace LayoutTransformControlExperiment.Samples; /// An example sample page of a custom control inheriting from Panel. /// [ToolkitSampleNumericOption("Angle", 0, -180.0, 180.0, 1, false, Title = "Angle")] -[ToolkitSampleNumericOption("ScaleX", 1, 0.0, 5.0, 1, false, Title = "ScaleX")] -[ToolkitSampleNumericOption("ScaleY", 1, 0.0, 5.0, 1, false, Title = "ScaleY")] +[ToolkitSampleNumericOption("CustomScaleX", 1, 0.0, 5.0, 1, false, Title = "ScaleX")] +[ToolkitSampleNumericOption("CustomScaleY", 1, 0.0, 5.0, 1, false, Title = "ScaleY")] [ToolkitSampleNumericOption("SkewX", 0, -180.0, 180.0, 1, false, Title = "SkewX")] [ToolkitSampleNumericOption("SkewY", 0, -180.0, 180.0, 1, false, Title = "SkewY")] From 75113fd6e3c2566a918367395695264a453b3f98 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 25 Jul 2023 16:36:27 -0500 Subject: [PATCH 3/4] [temp] Update tooling to include patch --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index f841534f..fc63e595 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit f841534f3f0e213603e94de00f8286ceac3d7a6b +Subproject commit fc63e595cc4e8bb3c7942421ffd7ba27c050ed34 From bd45775c827d7655957825c9552e4def9e987292 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 25 Jul 2023 17:23:32 -0500 Subject: [PATCH 4/4] Set tooling to latest main --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index fc63e595..36c23c82 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit fc63e595cc4e8bb3c7942421ffd7ba27c050ed34 +Subproject commit 36c23c828c40f0a7b92af542f83d47ff3e1aca16