now this works!

microsoft · May 7, 2021 · 47410c9 · 47410c9
1 parent 6e031e5
commit 47410c9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp
@@ -1537,8 +1537,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         if (auto ap{ _automationPeer.get() })
         {
-            auto controlOrigin{ ActualOffset() };
-            ap.SetControlBounds(Windows::Foundation::Rect{ controlOrigin.x, controlOrigin.y, newSize.Width, newSize.Height });
+            ap.UpdateControlBounds();
         }
     }
 

diff --git a/src/cascadia/TerminalControl/TermControlAutomationPeer.cpp b/src/cascadia/TerminalControl/TermControlAutomationPeer.cpp
@@ -36,14 +36,15 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         _termControl{ owner },
         _implementation{ impl }
     {
-        auto controlOrigin{ owner->ActualOffset() };
-        auto controlSize{ owner->ActualSize() };
-        impl.SetControlBounds(Windows::Foundation::Rect{ controlOrigin.x, controlOrigin.y, controlSize.x, controlSize.y });
+        UpdateControlBounds();
     };
 
-    void TermControlAutomationPeer::SetControlBounds(const Windows::Foundation::Rect bounds)
+    void TermControlAutomationPeer::UpdateControlBounds()
     {
-        _implementation.SetControlBounds(bounds);
+        // FrameworkElementAutomationPeer has this great GetBoundingRectangle
+        // method that's seemingly impossible to recreate just from the
+        // UserControl itself. Weird. But we can use it handily here!
+        _implementation.SetControlBounds(GetBoundingRectangle());
     }
     void TermControlAutomationPeer::SetControlPadding(const Core::Padding padding)
     {

diff --git a/src/cascadia/TerminalControl/TermControlAutomationPeer.h b/src/cascadia/TerminalControl/TermControlAutomationPeer.h
@@ -45,7 +45,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         TermControlAutomationPeer(Microsoft::Terminal::Control::implementation::TermControl* owner,
                                   Control::InteractivityAutomationPeer implementation);
 
-        void SetControlBounds(const Windows::Foundation::Rect bounds);
+        void UpdateControlBounds();
         void SetControlPadding(const Core::Padding padding);
 
 #pragma region FrameworkElementAutomationPeer

diff --git a/src/cascadia/TerminalControl/TermControlAutomationPeer.idl b/src/cascadia/TerminalControl/TermControlAutomationPeer.idl
@@ -10,7 +10,7 @@ namespace Microsoft.Terminal.Control
         Windows.UI.Xaml.Automation.Provider.ITextProvider
     {
 
-        void SetControlBounds(Windows.Foundation.Rect bounds);
+        void UpdateControlBounds();
         void SetControlPadding(Microsoft.Terminal.Core.Padding padding);
     }
 }