Implement first-class inking support (InkCanvas + InkToolBar)

src/controls/FeatureAreas.props

@@ -286,7 +286,7 @@
     <FeatureMapControlEnabled>true</FeatureMapControlEnabled>
     <FeatureSelectorBarEnabled>true</FeatureSelectorBarEnabled>
     <FeatureInkCanvasEnabled>true</FeatureInkCanvasEnabled>
-    <FeatureInkToolBarEnabled>false</FeatureInkToolBarEnabled>
+    <FeatureInkToolBarEnabled>true</FeatureInkToolBarEnabled>
     <FeatureSystemBackdropElementEnabled>true</FeatureSystemBackdropElementEnabled>
   </PropertyGroup>
   <PropertyGroup>

src/controls/dev/Generated/InkCanvas.properties.cpp

@@ -13,15 +13,42 @@ namespace winrt::Microsoft::UI::Xaml::Controls
 
 #include "InkCanvas.g.cpp"
 
+GlobalDependencyProperty InkCanvasProperties::s_AllowedInputTypesProperty{ nullptr };
+GlobalDependencyProperty InkCanvasProperties::s_DefaultDrawingAttributesProperty{ nullptr };
 GlobalDependencyProperty InkCanvasProperties::s_IsEnabledProperty{ nullptr };
+GlobalDependencyProperty InkCanvasProperties::s_ModeProperty{ nullptr };
 
 InkCanvasProperties::InkCanvasProperties()
+    : m_strokeCollectedEventSource{static_cast<InkCanvas*>(this)}
+    , m_strokesErasedEventSource{static_cast<InkCanvas*>(this)}
 {
     EnsureProperties();
 }
 
 void InkCanvasProperties::EnsureProperties()
 {
+    if (!s_AllowedInputTypesProperty)
+    {
+        s_AllowedInputTypesProperty =
+            InitializeDependencyProperty(
+                L"AllowedInputTypes",
+                winrt::name_of<winrt::InkInputType>(),
+                winrt::name_of<winrt::InkCanvas>(),
+                false /* isAttached */,
+                ValueHelper<winrt::InkInputType>::BoxValueIfNecessary(winrt::InkInputType::Pen | winrt::InkInputType::Mouse),
+                winrt::PropertyChangedCallback(&OnAllowedInputTypesPropertyChanged));
+    }
+    if (!s_DefaultDrawingAttributesProperty)
+    {
+        s_DefaultDrawingAttributesProperty =
+            InitializeDependencyProperty(
+                L"DefaultDrawingAttributes",
+                winrt::name_of<winrt::InkDrawingAttributes>(),
+                winrt::name_of<winrt::InkCanvas>(),
+                false /* isAttached */,
+                ValueHelper<winrt::InkDrawingAttributes>::BoxedDefaultValue(),
+                winrt::PropertyChangedCallback(&OnDefaultDrawingAttributesPropertyChanged));
+    }
     if (!s_IsEnabledProperty)
     {
         s_IsEnabledProperty =
@@ -33,11 +60,41 @@ void InkCanvasProperties::EnsureProperties()
                 ValueHelper<bool>::BoxValueIfNecessary(true),
                 winrt::PropertyChangedCallback(&OnIsEnabledPropertyChanged));
     }
+    if (!s_ModeProperty)
+    {
+        s_ModeProperty =
+            InitializeDependencyProperty(
+                L"Mode",
+                winrt::name_of<winrt::InkCanvasMode>(),
+                winrt::name_of<winrt::InkCanvas>(),
+                false /* isAttached */,
+                ValueHelper<winrt::InkCanvasMode>::BoxValueIfNecessary(winrt::InkCanvasMode::Draw),
+                winrt::PropertyChangedCallback(&OnModePropertyChanged));
+    }
 }
 
 void InkCanvasProperties::ClearProperties()
 {
+    s_AllowedInputTypesProperty = nullptr;
+    s_DefaultDrawingAttributesProperty = nullptr;
     s_IsEnabledProperty = nullptr;
+    s_ModeProperty = nullptr;
+}
+
+void InkCanvasProperties::OnAllowedInputTypesPropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::InkCanvas>();
+    winrt::get_self<InkCanvas>(owner)->OnAllowedInputTypesPropertyChanged(args);
+}
+
+void InkCanvasProperties::OnDefaultDrawingAttributesPropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::InkCanvas>();
+    winrt::get_self<InkCanvas>(owner)->OnDefaultDrawingAttributesPropertyChanged(args);
 }
 
 void InkCanvasProperties::OnIsEnabledPropertyChanged(
@@ -48,6 +105,40 @@ void InkCanvasProperties::OnIsEnabledPropertyChanged(
     winrt::get_self<InkCanvas>(owner)->OnIsEnabledPropertyChanged(args);
 }
 
+void InkCanvasProperties::OnModePropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::InkCanvas>();
+    winrt::get_self<InkCanvas>(owner)->OnModePropertyChanged(args);
+}
+
+void InkCanvasProperties::AllowedInputTypes(winrt::InkInputType const& value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<InkCanvas*>(this)->SetValue(s_AllowedInputTypesProperty, ValueHelper<winrt::InkInputType>::BoxValueIfNecessary(value));
+    }
+}
+
+winrt::InkInputType InkCanvasProperties::AllowedInputTypes()
+{
+    return ValueHelper<winrt::InkInputType>::CastOrUnbox(static_cast<InkCanvas*>(this)->GetValue(s_AllowedInputTypesProperty));
+}
+
+void InkCanvasProperties::DefaultDrawingAttributes(winrt::InkDrawingAttributes const& value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<InkCanvas*>(this)->SetValue(s_DefaultDrawingAttributesProperty, ValueHelper<winrt::InkDrawingAttributes>::BoxValueIfNecessary(value));
+    }
+}
+
+winrt::InkDrawingAttributes InkCanvasProperties::DefaultDrawingAttributes()
+{
+    return ValueHelper<winrt::InkDrawingAttributes>::CastOrUnbox(static_cast<InkCanvas*>(this)->GetValue(s_DefaultDrawingAttributesProperty));
+}
+
 void InkCanvasProperties::IsEnabled(bool value)
 {
     [[gsl::suppress(con)]]
@@ -60,3 +151,36 @@ bool InkCanvasProperties::IsEnabled()
 {
     return ValueHelper<bool>::CastOrUnbox(static_cast<InkCanvas*>(this)->GetValue(s_IsEnabledProperty));
 }
+
+void InkCanvasProperties::Mode(winrt::InkCanvasMode const& value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<InkCanvas*>(this)->SetValue(s_ModeProperty, ValueHelper<winrt::InkCanvasMode>::BoxValueIfNecessary(value));
+    }
+}
+
+winrt::InkCanvasMode InkCanvasProperties::Mode()
+{
+    return ValueHelper<winrt::InkCanvasMode>::CastOrUnbox(static_cast<InkCanvas*>(this)->GetValue(s_ModeProperty));
+}
+
+winrt::event_token InkCanvasProperties::StrokeCollected(winrt::TypedEventHandler<winrt::InkCanvas, winrt::InkCanvasStrokeCollectedEventArgs> const& value)
+{
+    return m_strokeCollectedEventSource.add(value);
+}
+
+void InkCanvasProperties::StrokeCollected(winrt::event_token const& token)
+{
+    m_strokeCollectedEventSource.remove(token);
+}
+
+winrt::event_token InkCanvasProperties::StrokesErased(winrt::TypedEventHandler<winrt::InkCanvas, winrt::InkCanvasStrokesErasedEventArgs> const& value)
+{
+    return m_strokesErasedEventSource.add(value);
+}
+
+void InkCanvasProperties::StrokesErased(winrt::event_token const& token)
+{
+    m_strokesErasedEventSource.remove(token);
+}

src/controls/dev/Generated/InkCanvas.properties.h

@@ -9,17 +9,52 @@ class InkCanvasProperties
 public:
     InkCanvasProperties();
 
+    void AllowedInputTypes(winrt::InkInputType const& value);
+    winrt::InkInputType AllowedInputTypes();
+
+    void DefaultDrawingAttributes(winrt::InkDrawingAttributes const& value);
+    winrt::InkDrawingAttributes DefaultDrawingAttributes();
+
     void IsEnabled(bool value);
     bool IsEnabled();
 
+    void Mode(winrt::InkCanvasMode const& value);
+    winrt::InkCanvasMode Mode();
+
+    static winrt::DependencyProperty AllowedInputTypesProperty() { return s_AllowedInputTypesProperty; }
+    static winrt::DependencyProperty DefaultDrawingAttributesProperty() { return s_DefaultDrawingAttributesProperty; }
     static winrt::DependencyProperty IsEnabledProperty() { return s_IsEnabledProperty; }
+    static winrt::DependencyProperty ModeProperty() { return s_ModeProperty; }
 
+    static GlobalDependencyProperty s_AllowedInputTypesProperty;
+    static GlobalDependencyProperty s_DefaultDrawingAttributesProperty;
     static GlobalDependencyProperty s_IsEnabledProperty;
+    static GlobalDependencyProperty s_ModeProperty;
+
+    winrt::event_token StrokeCollected(winrt::TypedEventHandler<winrt::InkCanvas, winrt::InkCanvasStrokeCollectedEventArgs> const& value);
+    void StrokeCollected(winrt::event_token const& token);
+    winrt::event_token StrokesErased(winrt::TypedEventHandler<winrt::InkCanvas, winrt::InkCanvasStrokesErasedEventArgs> const& value);
+    void StrokesErased(winrt::event_token const& token);
+
+    event_source<winrt::TypedEventHandler<winrt::InkCanvas, winrt::InkCanvasStrokeCollectedEventArgs>> m_strokeCollectedEventSource;
+    event_source<winrt::TypedEventHandler<winrt::InkCanvas, winrt::InkCanvasStrokesErasedEventArgs>> m_strokesErasedEventSource;
 
     static void EnsureProperties();
     static void ClearProperties();
 
+    static void OnAllowedInputTypesPropertyChanged(
+        winrt::DependencyObject const& sender,
+        winrt::DependencyPropertyChangedEventArgs const& args);
+
+    static void OnDefaultDrawingAttributesPropertyChanged(
+        winrt::DependencyObject const& sender,
+        winrt::DependencyPropertyChangedEventArgs const& args);
+
     static void OnIsEnabledPropertyChanged(
         winrt::DependencyObject const& sender,
         winrt::DependencyPropertyChangedEventArgs const& args);
+
+    static void OnModePropertyChanged(
+        winrt::DependencyObject const& sender,
+        winrt::DependencyPropertyChangedEventArgs const& args);
 };

src/controls/dev/Generated/InkToolBarMenuButton.properties.cpp

@@ -14,7 +14,6 @@ namespace winrt::Microsoft::UI::Xaml::Controls
 #include "InkToolBarMenuButton.g.cpp"
 
 GlobalDependencyProperty InkToolBarMenuButtonProperties::s_IsExtensionGlyphShownProperty{ nullptr };
-GlobalDependencyProperty InkToolBarMenuButtonProperties::s_MenuKindProperty{ nullptr };
 
 InkToolBarMenuButtonProperties::InkToolBarMenuButtonProperties()
 {
@@ -34,23 +33,11 @@ void InkToolBarMenuButtonProperties::EnsureProperties()
                 ValueHelper<bool>::BoxedDefaultValue(),
                 nullptr);
     }
-    if (!s_MenuKindProperty)
-    {
-        s_MenuKindProperty =
-            InitializeDependencyProperty(
-                L"MenuKind",
-                winrt::name_of<winrt::InkToolBarMenuKind>(),
-                winrt::name_of<winrt::InkToolBarMenuButton>(),
-                false /* isAttached */,
-                ValueHelper<winrt::InkToolBarMenuKind>::BoxedDefaultValue(),
-                nullptr);
-    }
 }
 
 void InkToolBarMenuButtonProperties::ClearProperties()
 {
     s_IsExtensionGlyphShownProperty = nullptr;
-    s_MenuKindProperty = nullptr;
 }
 
 void InkToolBarMenuButtonProperties::IsExtensionGlyphShown(bool value)
@@ -65,16 +52,3 @@ bool InkToolBarMenuButtonProperties::IsExtensionGlyphShown()
 {
     return ValueHelper<bool>::CastOrUnbox(static_cast<InkToolBarMenuButton*>(this)->GetValue(s_IsExtensionGlyphShownProperty));
 }
-
-void InkToolBarMenuButtonProperties::MenuKind(winrt::InkToolBarMenuKind const& value)
-{
-    [[gsl::suppress(con)]]
-    {
-    static_cast<InkToolBarMenuButton*>(this)->SetValue(s_MenuKindProperty, ValueHelper<winrt::InkToolBarMenuKind>::BoxValueIfNecessary(value));
-    }
-}
-
-winrt::InkToolBarMenuKind InkToolBarMenuButtonProperties::MenuKind()
-{
-    return ValueHelper<winrt::InkToolBarMenuKind>::CastOrUnbox(static_cast<InkToolBarMenuButton*>(this)->GetValue(s_MenuKindProperty));
-}

src/controls/dev/Generated/InkToolBarMenuButton.properties.h

@@ -12,14 +12,9 @@ class InkToolBarMenuButtonProperties
     void IsExtensionGlyphShown(bool value);
     bool IsExtensionGlyphShown();
 
-    void MenuKind(winrt::InkToolBarMenuKind const& value);
-    winrt::InkToolBarMenuKind MenuKind();
-
     static winrt::DependencyProperty IsExtensionGlyphShownProperty() { return s_IsExtensionGlyphShownProperty; }
-    static winrt::DependencyProperty MenuKindProperty() { return s_MenuKindProperty; }
 
     static GlobalDependencyProperty s_IsExtensionGlyphShownProperty;
-    static GlobalDependencyProperty s_MenuKindProperty;
 
     static void EnsureProperties();
     static void ClearProperties();