From d2a6b8943415e588001859f59b907c6e4aed706e Mon Sep 17 00:00:00 2001 From: danwalmsley Date: Thu, 4 Feb 2016 10:44:25 +0000 Subject: [PATCH] Added initial ContextMenu attachedProperty. --- .../Views/MainWindow.paml | 4 +++- src/Perspex.Controls/ContextMenu.cs | 20 +++++++++++++++++++ src/Perspex.Controls/Perspex.Controls.csproj | 1 + src/Perspex.Themes.Default/ContextMenu.paml | 15 ++++++++++++++ src/Perspex.Themes.Default/DefaultTheme.paml | 1 + .../Perspex.Themes.Default.csproj | 3 +++ 6 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 src/Perspex.Controls/ContextMenu.cs create mode 100644 src/Perspex.Themes.Default/ContextMenu.paml diff --git a/samples/XamlTestApplicationPcl/Views/MainWindow.paml b/samples/XamlTestApplicationPcl/Views/MainWindow.paml index 584c43c3af..169e9eb6a2 100644 --- a/samples/XamlTestApplicationPcl/Views/MainWindow.paml +++ b/samples/XamlTestApplicationPcl/Views/MainWindow.paml @@ -38,7 +38,9 @@ - + + + MenuProperty = + PerspexProperty.RegisterAttached("Menu"); + + public static ContextMenu GetMenu(TextBlock element) + { + return element.GetValue(MenuProperty); + } + + public static void SetMenu(TextBlock element, ContextMenu value) + { + element.SetValue(MenuProperty, value); + } + } +} diff --git a/src/Perspex.Controls/Perspex.Controls.csproj b/src/Perspex.Controls/Perspex.Controls.csproj index 1c2d72190e..9465bed9bb 100644 --- a/src/Perspex.Controls/Perspex.Controls.csproj +++ b/src/Perspex.Controls/Perspex.Controls.csproj @@ -43,6 +43,7 @@ Properties\SharedAssemblyInfo.cs + diff --git a/src/Perspex.Themes.Default/ContextMenu.paml b/src/Perspex.Themes.Default/ContextMenu.paml new file mode 100644 index 0000000000..0665a58531 --- /dev/null +++ b/src/Perspex.Themes.Default/ContextMenu.paml @@ -0,0 +1,15 @@ + \ No newline at end of file diff --git a/src/Perspex.Themes.Default/DefaultTheme.paml b/src/Perspex.Themes.Default/DefaultTheme.paml index e59d1b1713..f1b5776f83 100644 --- a/src/Perspex.Themes.Default/DefaultTheme.paml +++ b/src/Perspex.Themes.Default/DefaultTheme.paml @@ -11,6 +11,7 @@ + diff --git a/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj b/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj index aff93ac443..cc61488af2 100644 --- a/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj +++ b/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj @@ -147,6 +147,9 @@ Designer + + Designer + Designer