Merge 022bc12 into 5a5687c

jingkecn · Feb 23, 2022 · 3521791 · 3521791
2 parents 5a5687c + 022bc12
commit 3521791
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/Main/Views/Page/PageViewPage.xaml b/src/Main/Views/Page/PageViewPage.xaml
@@ -22,10 +22,6 @@
         <muxc:NavigationView.AutoSuggestBox>
             <AutoSuggestBox QueryIcon="Find" />
         </muxc:NavigationView.AutoSuggestBox>
-        <muxc:NavigationView.Header>
-            <iink:InteractiveInkToolbar HorizontalAlignment="Center"
-                                        TargetInkCanvas="{x:Bind InteractiveInkCanvas}" />
-        </muxc:NavigationView.Header>
         <muxc:NavigationView.PaneFooter>
             <page:PageCommandBar x:Name="TopCommandBar"
                                  Background="Transparent"
@@ -45,7 +41,6 @@
             </Grid.RowDefinitions>
             <Grid Grid.Row="0">
                 <iink:InteractiveInkCanvas x:Name="InteractiveInkCanvas"
-                                           Background="White"
                                            Editor="{x:Bind ViewModel.Editor, Mode=OneWay}"
                                            Holding="OnHolding"
                                            MaxZoomFactor="3"
@@ -112,6 +107,8 @@
                                            Label="{x:Bind Converter={StaticResource StringLocalizationConverter}, ConverterParameter=CommandPaste}" />
                     </iink:InteractiveInkCanvas.Resources>
                 </iink:InteractiveInkCanvas>
+                <iink:InteractiveInkToolbar HorizontalAlignment="Center" VerticalAlignment="Top"
+                                            TargetInkCanvas="{x:Bind InteractiveInkCanvas}" />
                 <muxc:InfoBar IsClosable="True"
                               IsOpen="{x:Bind ViewModel.IsInfoBarOpen, Mode=TwoWay}"
                               Message="{x:Bind ViewModel.InfoMessage, Mode=OneWay}"

diff --git a/src/SDK/UI/Xaml/Controls/InteractiveInkToolbar.xaml b/src/SDK/UI/Xaml/Controls/InteractiveInkToolbar.xaml
@@ -8,12 +8,12 @@
     mc:Ignorable="d"
     d:DesignHeight="300"
     d:DesignWidth="400"
-    x:Name="UserControl">
+    x:Name="Container">
     <UserControl.Resources>
         <x:String x:Key="FontIconFingerInking">&#xED5F;</x:String>
         <x:String x:Key="FontIconMouse">&#xE962;</x:String>
     </UserControl.Resources>
-    <Grid Background="{x:Bind UserControl.Background, Mode=OneWay}">
+    <Grid Background="{x:Bind Container.Background, Mode=OneWay}">
         <InkToolbar ActiveToolChanged="OnActiveToolChanged"
                     EraseAllClicked="OnEraseAllClicked"
                     InkDrawingAttributesChanged="OnInkDrawingAttributesChanged">