goin back to good ol' GetStrongTabImpl

microsoft · Sep 30, 2020 · 3fdb0f1 · 3fdb0f1
1 parent 8882f66
commit 3fdb0f1
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 9 deletions.
diff --git a/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj b/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj
@@ -100,6 +100,8 @@
       <Project>{ca5cad1a-44bd-4ac7-ac72-f16e576fdd12}</Project>
     </ProjectReference>
 
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsEditor\Microsoft.Terminal.Settings.Editor.vcxproj" />
+
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -1015,7 +1015,7 @@ namespace winrt::TerminalApp::implementation
     {
         if (auto index{ _GetFocusedTabIndex() })
         {
-            if (auto terminalTab = _tabs.GetAt(*index).try_as<TerminalApp::TerminalTab>())
+            if (auto terminalTab = _GetStrongTabImpl(*index))
             {
                 try
                 {
@@ -1297,7 +1297,7 @@ namespace winrt::TerminalApp::implementation
     {
         if (auto index{ _GetFocusedTabIndex() })
         {
-            if (auto terminalTab = _tabs.GetAt(*index).try_as<TerminalTab>())
+            if (auto terminalTab = _GetStrongTabImpl(*index))
             {
                 _UnZoomIfNeeded();
                 terminalTab->NavigateFocus(direction);
@@ -1309,7 +1309,7 @@ namespace winrt::TerminalApp::implementation
     {
         if (auto index{ _GetFocusedTabIndex() })
         {
-            if (auto terminalTab = _tabs.GetAt(*index).try_as<TerminalTab>())
+            if (auto terminalTab = _GetStrongTabImpl(*index))
             {
                 return terminalTab->GetActiveTerminalControl();
             }
@@ -1389,7 +1389,7 @@ namespace winrt::TerminalApp::implementation
     {
         if (auto index{ _GetFocusedTabIndex() })
         {
-            if (auto terminalTab = _tabs.GetAt(*index).try_as<TerminalTab>())
+            if (auto terminalTab = _GetStrongTabImpl(*index))
             {
                 _UnZoomIfNeeded();
                 terminalTab->ClosePane();
@@ -1433,7 +1433,7 @@ namespace winrt::TerminalApp::implementation
     {
         if (auto index{ _GetFocusedTabIndex() })
         {
-            if (auto terminalTab = _tabs.GetAt(*index).try_as<TerminalTab>())
+            if (auto terminalTab = _GetStrongTabImpl(*index))
             {
                 terminalTab->Scroll(delta);
             }
@@ -1469,7 +1469,7 @@ namespace winrt::TerminalApp::implementation
             return;
         }
 
-        auto focusedTab = _tabs.GetAt(*indexOpt).try_as<TerminalTab>();
+        auto focusedTab = _GetStrongTabImpl(*indexOpt);
 
         // Do nothing if the focused tab isn't a TerminalTab
         if (!focusedTab)
@@ -1552,7 +1552,7 @@ namespace winrt::TerminalApp::implementation
     {
         if (auto index{ _GetFocusedTabIndex() })
         {
-            if (auto terminalTab = _tabs.GetAt(*index).try_as<TerminalTab>())
+            if (auto terminalTab = _GetStrongTabImpl(*index))
             {
                 _UnZoomIfNeeded();
                 terminalTab->ResizePane(direction);
@@ -1577,7 +1577,7 @@ namespace winrt::TerminalApp::implementation
             return;
         }
 
-        if (auto terminalTab = _tabs.GetAt(*indexOpt).try_as<TerminalTab>())
+        if (auto terminalTab = _GetStrongTabImpl(*indexOpt))
         {
             delta = std::clamp(delta, -1, 1);
             const auto control = _GetActiveControl();
@@ -1694,7 +1694,7 @@ namespace winrt::TerminalApp::implementation
         {
             if (auto index{ _GetFocusedTabIndex() })
             {
-                if (auto terminalTab = _tabs.GetAt(*index).try_as<TerminalTab>())
+                if (auto terminalTab = _GetStrongTabImpl(*index))
                 {
                     return terminalTab->CalcSnappedDimension(widthOrHeight, dimension);
                 }
@@ -2590,6 +2590,39 @@ namespace winrt::TerminalApp::implementation
         _tabView.SelectedItem(tabViewItem);
     }
 
+    // Method Description:
+    // - Returns a com_ptr to the implementation type of the tab at the given index
+    // Arguments:
+    // - index: an unsigned integer index to a tab in _tabs
+    // Return Value:
+    // - a com_ptr to the implementation type of the Tab
+    winrt::com_ptr<TerminalTab> TerminalPage::_GetStrongTabImpl(const uint32_t index) const
+    {
+        if (auto tab = _tabs.GetAt(index).try_as<TerminalApp::TerminalTab>())
+        {
+            winrt::com_ptr<TerminalTab> tabImpl;
+            tabImpl.copy_from(winrt::get_self<TerminalTab>(tab));
+            return tabImpl;
+        }
+        else
+        {
+            return nullptr;
+        }
+    }
+
+    // Method Description:
+    // - Returns a com_ptr to the implementation type of the given projected Tab
+    // Arguments:
+    // - tab: the projected type of a Tab
+    // Return Value:
+    // - a com_ptr to the implementation type of the Tab
+    winrt::com_ptr<TerminalTab> TerminalPage::_GetStrongTabImpl(const ::winrt::TerminalApp::TerminalTab& tab) const
+    {
+        winrt::com_ptr<TerminalTab> tabImpl;
+        tabImpl.copy_from(winrt::get_self<TerminalTab>(tab));
+        return tabImpl;
+    }
+
     // -------------------------------- WinRT Events ---------------------------------
     // Winrt events need a method for adding a callback to the event and removing the callback.
     // These macros will define them both for you.

diff --git a/src/cascadia/TerminalApp/TerminalPage.h b/src/cascadia/TerminalApp/TerminalPage.h
@@ -92,6 +92,8 @@ namespace winrt::TerminalApp::implementation
         TerminalApp::CascadiaSettings _settings{ nullptr };
 
         Windows::Foundation::Collections::IObservableVector<TerminalApp::ITab> _tabs;
+        winrt::com_ptr<TerminalTab> _GetStrongTabImpl(const uint32_t index) const;
+        winrt::com_ptr<TerminalTab> _GetStrongTabImpl(const ::winrt::TerminalApp::TerminalTab& tab) const;
         void _UpdateTabIndices();
 
         bool _isInFocusMode{ false };