Fix issues from review

microsoft · Jun 22, 2020 · e4ccf28 · e4ccf28
1 parent 21b163b
commit e4ccf28
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -309,7 +309,7 @@ namespace winrt::TerminalApp::implementation
     //   when this is called, nothing happens. See _ShowDialog for details
     void TerminalPage::_ShowLargePasteWarningDialog()
     {
-        _showDialogHandlers(*this, FindName(L"BigPasteDialog").try_as<WUX::Controls::ContentDialog>());
+        _showDialogHandlers(*this, FindName(L"LargePasteDialog").try_as<WUX::Controls::ContentDialog>());
     }
 
     // Method Description:
@@ -1765,6 +1765,13 @@ namespace winrt::TerminalApp::implementation
         _CloseAllTabs();
     }
 
+    // Method Description:
+    // - Called when the user wants to paste the text anyway after a paste
+    //   warning.
+    // - Sends the clipboard's text to the `TermControl`.
+    // Arguments:
+    // - sender: unused
+    // - ContentDialogButtonClickEventArgs: unused
     void TerminalPage::_AcceptPasteButtonOnClick(WUX::Controls::ContentDialog /* sender */,
                                                  WUX::Controls::ContentDialogButtonClickEventArgs /* eventArgs*/)
     {
@@ -1775,6 +1782,19 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
+    // Method Description:
+    // - Called when the user closes a warning dialog about pasting text.
+    // - Destroys the callback to send the clipboard's text to the
+    //   `TermControl` because the user cancelled the paste operation.
+    // Arguments:
+    // - sender: unused
+    // - ContentDialogButtonClickEventArgs: unused
+    void TerminalPage::_RejectPasteButtonOnClick(WUX::Controls::ContentDialog /* sender */,
+                                                 WUX::Controls::ContentDialogButtonClickEventArgs /* eventArgs*/)
+    {
+        _acceptPaste = nullptr;
+    }
+
     // Method Description:
     // - Hook up keybindings, and refresh the UI of the terminal.
     //   This includes update the settings of all the tabs according

diff --git a/src/cascadia/TerminalApp/TerminalPage.h b/src/cascadia/TerminalApp/TerminalPage.h
@@ -113,6 +113,7 @@ namespace winrt::TerminalApp::implementation
         void _AboutButtonOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
         void _CloseWarningPrimaryButtonOnClick(Windows::UI::Xaml::Controls::ContentDialog sender, Windows::UI::Xaml::Controls::ContentDialogButtonClickEventArgs eventArgs);
         void _AcceptPasteButtonOnClick(Windows::UI::Xaml::Controls::ContentDialog sender, Windows::UI::Xaml::Controls::ContentDialogButtonClickEventArgs eventArgs);
+        void _RejectPasteButtonOnClick(Windows::UI::Xaml::Controls::ContentDialog sender, Windows::UI::Xaml::Controls::ContentDialogButtonClickEventArgs eventArgs);
         void _ThirdPartyNoticesOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
 
         void _HookupKeyBindings(TerminalApp::AppKeyBindings bindings) noexcept;

diff --git a/src/cascadia/TerminalApp/TerminalPage.xaml b/src/cascadia/TerminalApp/TerminalPage.xaml
@@ -59,15 +59,17 @@ the MIT License. See LICENSE in the project root for license information. -->
             x:Name="MultiLinePasteDialog"
             x:Uid="MultiLinePasteDialog"
             DefaultButton="Primary"
-            PrimaryButtonClick="_AcceptPasteButtonOnClick">
+            PrimaryButtonClick="_AcceptPasteButtonOnClick"
+            CloseButtonClick="_RejectPasteButtonOnClick">
         </ContentDialog>
 
         <ContentDialog
             x:Load="False"
             x:Name="LargePasteDialog"
             x:Uid="LargePasteDialog"
             DefaultButton="Primary"
-            PrimaryButtonClick="_AcceptPasteButtonOnClick">
+            PrimaryButtonClick="_AcceptPasteButtonOnClick"
+            CloseButtonClick="_RejectPasteButtonOnClick">
         </ContentDialog>
     </Grid>
 </Page>