Try to do a get_weak event, but that's not how this works

microsoft · Mar 6, 2020 · 64e3427 · 64e3427
1 parent 01404a5
commit 64e3427
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp
@@ -76,18 +76,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
 
         // Initialize the terminal only once the swapchainpanel is loaded - that
         //      way, we'll be able to query the real pixel size it got on layout
-        _layoutUpdatedRevoker = SwapChainPanel().LayoutUpdated(winrt::auto_revoke, [this](auto /*s*/, auto /*e*/) {
-            // This event fires every time the layout changes, but it is always the last one to fire
-            // in any layout change chain. That gives us great flexibility in finding the right point
-            // at which to initialize our renderer (and our terminal).
-            // Any earlier than the last layout update and we may not know the terminal's starting size.
-
-            if (_InitializeTerminal())
-            {
-                // Only let this succeed once.
-                _layoutUpdatedRevoker.revoke();
-            }
-        });
+        _layoutUpdatedRevoker = SwapChainPanel().LayoutUpdated({ get_weak(), &TermControl::_LayoutUpdated });
 
         // Subscribe to the connection's disconnected event and call our connection closed handlers.
         _connectionStateChangedRevoker = _connection.StateChanged(winrt::auto_revoke, [this](auto&& /*s*/, auto&& /*v*/) {
@@ -97,6 +86,21 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         _ApplyUISettings();
     }
 
+    void TermControl::_LayoutUpdated(Windows::Foundation::IInspectable const& sender,
+                                     Windows::UI::Xaml::RoutedEventArgs const& e)
+    {
+        // This event fires every time the layout changes, but it is always the last one to fire
+        // in any layout change chain. That gives us great flexibility in finding the right point
+        // at which to initialize our renderer (and our terminal).
+        // Any earlier than the last layout update and we may not know the terminal's starting size.
+
+        if (_InitializeTerminal())
+        {
+            // Only let this succeed once.
+            _layoutUpdatedRevoker.revoke();
+        }
+    }
+
     // Method Description:
     // - Loads the search box from the xaml UI and focuses it.
     void TermControl::CreateSearchBoxControl()

diff --git a/src/cascadia/TerminalControl/TermControl.h b/src/cascadia/TerminalControl/TermControl.h
@@ -179,6 +179,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         void _ScrollbarChangeHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Controls::Primitives::RangeBaseValueChangedEventArgs const& e);
         void _GotFocusHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);
         void _LostFocusHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);
+        void _LayoutUpdated(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);
         void _DragDropHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::DragEventArgs const& e);
         void _DragOverHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::DragEventArgs const& e);
         winrt::fire_and_forget _DoDragDrop(Windows::UI::Xaml::DragEventArgs const e);