close event

microsoft · Jul 17, 2023 · 84df819 · 84df819
1 parent 5b3aa54
commit 84df819
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/src/cascadia/TerminalApp/IPaneContent.idl b/src/cascadia/TerminalApp/IPaneContent.idl
@@ -21,5 +21,7 @@ namespace TerminalApp
         void Close();
         // event CloseRequested(...);
 
+        event Windows.Foundation.TypedEventHandler<Object, Object> CloseRequested;
+
     };
 }
diff --git a/src/cascadia/TerminalApp/TerminalPaneContent.cpp b/src/cascadia/TerminalApp/TerminalPaneContent.cpp
@@ -65,6 +65,8 @@ namespace winrt::TerminalApp::implementation
             _bellPlayer = nullptr;
             _bellPlayerCreated = false;
         }
+
+        CloseRequested.raise(*this, nullptr);
     }
 
     NewTerminalArgs TerminalPaneContent::GetNewTerminalArgs(const bool asContent) const
@@ -164,8 +166,7 @@ namespace winrt::TerminalApp::implementation
             if ((mode == CloseOnExitMode::Always) ||
                 ((mode == CloseOnExitMode::Graceful || mode == CloseOnExitMode::Automatic) && newConnectionState == ConnectionState::Closed))
             {
-                // TODO! ask the Pane to close
-                // Close();
+                Close();
             }
         }
     }

diff --git a/src/cascadia/TerminalApp/TerminalPaneContent.h b/src/cascadia/TerminalApp/TerminalPaneContent.h
@@ -37,6 +37,7 @@ namespace winrt::TerminalApp::implementation
         bool ReadOnly() { return _control.ReadOnly(); }
 
         til::typed_event<TerminalApp::TerminalPaneContent, winrt::Windows::Foundation::IInspectable> RestartTerminalRequested;
+        til::typed_event<> CloseRequested;
 
     private:
         winrt::Microsoft::Terminal::Control::TermControl _control{ nullptr };

diff --git a/src/cascadia/TerminalApp/TerminalPaneContent.idl b/src/cascadia/TerminalApp/TerminalPaneContent.idl
@@ -16,7 +16,6 @@ namespace TerminalApp
 
         Microsoft.Terminal.Settings.Model.Profile GetProfile();
 
-
         event Windows.Foundation.TypedEventHandler<TerminalPaneContent, Object> RestartTerminalRequested;
     }
 }
diff --git a/src/inc/til/winrt.h b/src/inc/til/winrt.h
@@ -70,7 +70,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"
         winrt::event<ArgsT> _handlers;
     };
 
-    template<typename SenderT, typename ArgsT>
+    template<typename SenderT = winrt::Windows::Foundation::IInspectable, typename ArgsT = winrt::Windows::Foundation::IInspectable>
     struct typed_event
     {
         typed_event<SenderT, ArgsT>() = default;