From e2cc27889aba9e1ca144dbef17c68321647237ad Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Fri, 24 Feb 2023 16:20:41 -0600
Subject: [PATCH 1/3] POC: We can take it out of the Popup and have it still
 work

(cherry picked from commit 5defde545f6419f333cbdcf624d39616ff5c5ce8)
---
 .../TerminalApp/SuggestionsControl.cpp        | 31 +++++++
 src/cascadia/TerminalApp/SuggestionsControl.h |  3 +
 .../TerminalApp/SuggestionsControl.idl        |  1 +
 src/cascadia/TerminalApp/TerminalPage.cpp     | 83 ++++++++++---------
 src/cascadia/TerminalApp/TerminalPage.xaml    | 14 ++--
 5 files changed, 88 insertions(+), 44 deletions(-)

diff --git a/src/cascadia/TerminalApp/SuggestionsControl.cpp b/src/cascadia/TerminalApp/SuggestionsControl.cpp
index 8a364ed006c..c3c1841394b 100644
--- a/src/cascadia/TerminalApp/SuggestionsControl.cpp
+++ b/src/cascadia/TerminalApp/SuggestionsControl.cpp
@@ -1050,4 +1050,35 @@ namespace winrt::TerminalApp::implementation
             Controls::Grid::SetRow(_searchBox(), 4);
         }
     }
+
+    void SuggestionsControl::Anchor(Windows::Foundation::Point anchor, Windows::Foundation::Size space)
+    {
+        _anchor = anchor;
+        _space = space;
+
+        // TODO! do some clamping
+
+        // // Create a thickness for the new margins
+        auto newMargin = Windows::UI::Xaml::ThicknessHelper::FromLengths(_anchor.X, 0, 0, 0);
+
+        // // SuggestionsPopup().HorizontalOffset(clampedX);
+
+        // // Now, position vertically.
+        if (_direction == TerminalApp::SuggestionsDirection::TopDown)
+        {
+            //     // The control should open right below the cursor, with the list
+            //     // extending below. This is easy, we can just use the cursor as the
+            //     // origin (more or less)
+            //     // SuggestionsPopup().VerticalOffset(realCursorPos.y + characterSize.Height);
+            newMargin.Top = (_anchor.Y + 16); // TODO! 16 is cursor height
+        }
+        else
+        {
+            //     // Position at the cursor. The suggestions UI itself will maintian
+            //     // its own offset such that it's always above its origin
+            //     // SuggestionsPopup().VerticalOffset(realCursorPos.y);
+            newMargin.Top = (_anchor.Y - ActualHeight());
+        }
+        Margin(newMargin);
+    }
 }
diff --git a/src/cascadia/TerminalApp/SuggestionsControl.h b/src/cascadia/TerminalApp/SuggestionsControl.h
index 83cefbd74c8..3f09754286c 100644
--- a/src/cascadia/TerminalApp/SuggestionsControl.h
+++ b/src/cascadia/TerminalApp/SuggestionsControl.h
@@ -38,6 +38,7 @@ namespace winrt::TerminalApp::implementation
 
         TerminalApp::SuggestionsMode Mode() const;
         void Mode(TerminalApp::SuggestionsMode mode);
+        void Anchor(Windows::Foundation::Point anchor, Windows::Foundation::Size space);
 
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
         WINRT_OBSERVABLE_PROPERTY(winrt::hstring, NoMatchesText, _PropertyChangedHandlers);
@@ -65,6 +66,8 @@ namespace winrt::TerminalApp::implementation
         TerminalApp::SuggestionsDirection _direction{ TerminalApp::SuggestionsDirection::TopDown };
 
         bool _lastFilterTextWasEmpty{ true };
+        Windows::Foundation::Point _anchor;
+        Windows::Foundation::Size _space;
 
         void _filterTextChanged(const Windows::Foundation::IInspectable& sender,
                                 const Windows::UI::Xaml::RoutedEventArgs& args);
diff --git a/src/cascadia/TerminalApp/SuggestionsControl.idl b/src/cascadia/TerminalApp/SuggestionsControl.idl
index d48fb6b784b..ccb55b5d058 100644
--- a/src/cascadia/TerminalApp/SuggestionsControl.idl
+++ b/src/cascadia/TerminalApp/SuggestionsControl.idl
@@ -42,6 +42,7 @@ namespace TerminalApp
         void SelectNextItem(Boolean moveDown);
 
         void Direction(SuggestionsDirection direction);
+        void Anchor(Windows.Foundation.Point anchor, Windows.Foundation.Size space);
 
         event Windows.Foundation.TypedEventHandler<SuggestionsControl, Microsoft.Terminal.Settings.Model.Command> DispatchCommandRequested;
         event Windows.Foundation.TypedEventHandler<Object, Microsoft.Terminal.Settings.Model.Command> PreviewAction;
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index 6daf5996c64..cd75d89dfdf 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -293,7 +293,7 @@ namespace winrt::TerminalApp::implementation
             sxnUi.RegisterPropertyChangedCallback(UIElement::VisibilityProperty(), [this](auto&&, auto&&) {
                 if (SuggestionsUI().Visibility() == Visibility::Collapsed)
                 {
-                    SuggestionsPopup().IsOpen(false);
+                    // SuggestionsPopup().IsOpen(false);
                     _FocusActiveControl(nullptr, nullptr);
                 }
             });
@@ -4510,7 +4510,7 @@ namespace winrt::TerminalApp::implementation
         }
         if (commandsCollection.Size() == 0)
         {
-            SuggestionsPopup().IsOpen(false);
+            // SuggestionsPopup().IsOpen(false);
             SuggestionsUI().Visibility(Visibility::Collapsed);
 
             co_return;
@@ -4556,47 +4556,54 @@ namespace winrt::TerminalApp::implementation
                                                   TerminalApp::SuggestionsDirection::BottomUp;
 
         sxnUi.Direction(direction);
+        sxnUi.Anchor(realCursorPos.to_winrt_point(), windowDimensions.to_winrt_size());
         sxnUi.Mode(mode);
 
-        SuggestionsPopup().IsOpen(true);
+        // SuggestionsPopup().IsOpen(true);
         sxnUi.SetCommands(commandsCollection);
         sxnUi.Visibility(commandsCollection.Size() > 0 ? Visibility::Visible : Visibility::Collapsed);
 
-        // Position the suggestions UI relative to the actual term control.
-        //
-        // This needs to be done _after_ it is set to be visible. If not, then
-        // the control won't have an Actual{Width, Height} yet.
-        const til::size actualSuggestionsSize{ til::math::rounding,
-                                               sxnUi.ActualWidth(),
-                                               sxnUi.ActualHeight() };
-
-        // First, position horizonally.
-        //
-        // We want to align the left edge of the text within the control to the
-        // cursor position. We'll need to scoot a little to the left, to align
-        // text with cursor
-        const auto proposedX = realCursorPos.x - 40;
-        // If the control is too wide to fit in the window, clamp it fit inside
-        // the window.
-        const auto maxX = gsl::narrow_cast<int>(windowDimensions.width - actualSuggestionsSize.width);
-        const auto clampedX = std::clamp(proposedX, 0, maxX);
-
-        SuggestionsPopup().HorizontalOffset(clampedX);
-
-        // Now, position vertically.
-        if (direction == TerminalApp::SuggestionsDirection::TopDown)
-        {
-            // The control should open right below the cursor, with the list
-            // extending below. This is easy, we can just use the cursor as the
-            // origin (more or less)
-            SuggestionsPopup().VerticalOffset(realCursorPos.y + characterSize.Height);
-        }
-        else
-        {
-            // Position above the cursor. We'll need to make sure
-            // (origin.y+sxnUi.Height) = cursorPos.y.
-            SuggestionsPopup().VerticalOffset(realCursorPos.y - actualSuggestionsSize.height);
-        }
+        // // Position the suggestions UI relative to the actual term control.
+        // //
+        // // This needs to be done _after_ it is set to be visible. If not, then
+        // // the control won't have an Actual{Width, Height} yet.
+        // const til::size actualSuggestionsSize{ til::math::rounding,
+        //                                        sxnUi.ActualWidth(),
+        //                                        sxnUi.ActualHeight() };
+
+        // // First, position horizonally.
+        // //
+        // // We want to align the left edge of the text within the control to the
+        // // cursor position. We'll need to scoot a little to the left, to align
+        // // text with cursor
+        // const auto proposedX = realCursorPos.x - 40;
+        // // If the control is too wide to fit in the window, clamp it fit inside
+        // // the window.
+        // const auto maxX = gsl::narrow_cast<int>(windowDimensions.width - actualSuggestionsSize.width);
+        // const auto clampedX = std::clamp(proposedX, 0, maxX);
+
+        // // Create a thickness for the new margins
+        // auto newMargin = Windows::UI::Xaml::ThicknessHelper::FromLengths(clampedX, 0, 0, 0);
+
+        // // SuggestionsPopup().HorizontalOffset(clampedX);
+
+        // // Now, position vertically.
+        // if (direction == TerminalApp::SuggestionsDirection::TopDown)
+        // {
+        //     // The control should open right below the cursor, with the list
+        //     // extending below. This is easy, we can just use the cursor as the
+        //     // origin (more or less)
+        //     // SuggestionsPopup().VerticalOffset(realCursorPos.y + characterSize.Height);
+        //     newMargin.Top = (realCursorPos.y + characterSize.Height);
+        // }
+        // else
+        // {
+        //     // Position at the cursor. The suggestions UI itself will maintian
+        //     // its own offset such that it's always above its origin
+        //     // SuggestionsPopup().VerticalOffset(realCursorPos.y);
+        //     newMargin.Top = (realCursorPos.y);
+        // }
+        // sxnUi.Margin(newMargin);
     }
 
 }
diff --git a/src/cascadia/TerminalApp/TerminalPage.xaml b/src/cascadia/TerminalApp/TerminalPage.xaml
index 93f64ace9ed..f160ab965e9 100644
--- a/src/cascadia/TerminalApp/TerminalPage.xaml
+++ b/src/cascadia/TerminalApp/TerminalPage.xaml
@@ -195,17 +195,19 @@
                               PreviewKeyDown="_KeyDownHandler"
                               Visibility="Collapsed" />
 
-        <Popup x:Name="SuggestionsPopup"
+        <local:SuggestionsControl x:Name="SuggestionsUI"
+                                  Grid.Row="2"
+                                  HorizontalAlignment="Left"
+                                  VerticalAlignment="Top"
+                                  PreviewKeyDown="_KeyDownHandler"
+                                  Visibility="Collapsed" />
+        <!--<Popup x:Name="SuggestionsPopup"
                HorizontalOffset="200"
                IsOpen="False"
                ShouldConstrainToRootBounds="False"
                VerticalOffset="200">
-            <local:SuggestionsControl x:Name="SuggestionsUI"
-                                      VerticalAlignment="Stretch"
-                                      PreviewKeyDown="_KeyDownHandler"
-                                      Visibility="Collapsed" />
 
-        </Popup>
+        </Popup>-->
 
         <!--
             A TeachingTip with IsLightDismissEnabled="True" will immediately

From e544871893266fb2cd8643bda4d9ecc77d5b066a Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Fri, 24 Feb 2023 16:43:02 -0600
Subject: [PATCH 2/3] very confident we can get all the logic into the sxnui

(cherry picked from commit 57a53279ae03d801e46a07e59dc95509e8518437)
---
 .../TerminalApp/SuggestionsControl.cpp        | 21 +++++++++++++---
 src/cascadia/TerminalApp/TerminalPage.cpp     | 25 +++++++++++++------
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/cascadia/TerminalApp/SuggestionsControl.cpp b/src/cascadia/TerminalApp/SuggestionsControl.cpp
index c3c1841394b..4bed17c933f 100644
--- a/src/cascadia/TerminalApp/SuggestionsControl.cpp
+++ b/src/cascadia/TerminalApp/SuggestionsControl.cpp
@@ -1051,15 +1051,28 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    void SuggestionsControl::Anchor(Windows::Foundation::Point anchor, Windows::Foundation::Size space)
+    void SuggestionsControl::Anchor(Windows::Foundation::Point anchor,
+                                    Windows::Foundation::Size space)
     {
         _anchor = anchor;
         _space = space;
 
         // TODO! do some clamping
 
+        const til::size actualSize{ til::math::rounding, ActualWidth(), ActualHeight() };
+        // First, position horizonally.
+        //
+        // We want to align the left edge of the text within the control to the
+        // cursor position. We'll need to scoot a little to the left, to align
+        // text with cursor
+        const auto proposedX = gsl::narrow_cast<int>(_anchor.X - 40);
+        // If the control is too wide to fit in the window, clamp it fit inside
+        // the window.
+        const auto maxX = gsl::narrow_cast<int>(space.Width - actualSize.width);
+        const auto clampedX = std::clamp(proposedX, 0, maxX);
+
         // // Create a thickness for the new margins
-        auto newMargin = Windows::UI::Xaml::ThicknessHelper::FromLengths(_anchor.X, 0, 0, 0);
+        auto newMargin = Windows::UI::Xaml::ThicknessHelper::FromLengths(clampedX, 0, 0, 0);
 
         // // SuggestionsPopup().HorizontalOffset(clampedX);
 
@@ -1070,14 +1083,14 @@ namespace winrt::TerminalApp::implementation
             //     // extending below. This is easy, we can just use the cursor as the
             //     // origin (more or less)
             //     // SuggestionsPopup().VerticalOffset(realCursorPos.y + characterSize.Height);
-            newMargin.Top = (_anchor.Y + 16); // TODO! 16 is cursor height
+            newMargin.Top = (_anchor.Y);
         }
         else
         {
             //     // Position at the cursor. The suggestions UI itself will maintian
             //     // its own offset such that it's always above its origin
             //     // SuggestionsPopup().VerticalOffset(realCursorPos.y);
-            newMargin.Top = (_anchor.Y - ActualHeight());
+            newMargin.Top = (_anchor.Y - actualSize.height);
         }
         Margin(newMargin);
     }
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index cd75d89dfdf..9eacb0c0275 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -4539,6 +4539,7 @@ namespace winrt::TerminalApp::implementation
         const auto controlTransform = control.TransformToVisual(this->Root());
         const til::point controlOrigin{ til::math::rounding, controlTransform.TransformPoint(Windows::Foundation::Point{ 0, 0 }) };
         const til::point realCursorPos = controlOrigin + cursorPos;
+        // const til::point anchor = realCursorPos + til::point{ 0, characterSize.Height };
 
         const auto currentWindow = CoreWindow::GetForCurrentThread();
         const auto currentWindowBounds = currentWindow.Bounds();
@@ -4550,18 +4551,28 @@ namespace winrt::TerminalApp::implementation
         const til::size windowDimensions{ til::math::rounding, ActualWidth(), ActualHeight() };
 
         // Is there space in the window below the cursor to open the menu downwards?
-        const bool canOpenDownwards = ((realCursorPos.y) + characterSize.Height + maxSize.Height) < windowDimensions.height;
-
-        const auto direction = canOpenDownwards ? TerminalApp::SuggestionsDirection::TopDown :
-                                                  TerminalApp::SuggestionsDirection::BottomUp;
-
-        sxnUi.Direction(direction);
-        sxnUi.Anchor(realCursorPos.to_winrt_point(), windowDimensions.to_winrt_size());
+        // const bool canOpenDownwards = ((realCursorPos.y) + characterSize.Height + maxSize.Height) < windowDimensions.height;
+
+        // const auto direction = canOpenDownwards ? TerminalApp::SuggestionsDirection::TopDown :
+        //                                           TerminalApp::SuggestionsDirection::BottomUp;
+        const til::size actualSuggestionsSizeBefore{ til::math::rounding, sxnUi.ActualWidth(), sxnUi.ActualHeight() };
+        actualSuggestionsSizeBefore;
+        // sxnUi.Direction(direction);
+        // sxnUi.Anchor(realCursorPos.to_winrt_point(), windowDimensions.to_winrt_size());
         sxnUi.Mode(mode);
 
         // SuggestionsPopup().IsOpen(true);
         sxnUi.SetCommands(commandsCollection);
         sxnUi.Visibility(commandsCollection.Size() > 0 ? Visibility::Visible : Visibility::Collapsed);
+        const til::size actualSuggestionsSizeAfter{ til::math::rounding, sxnUi.ActualWidth(), sxnUi.ActualHeight() };
+        actualSuggestionsSizeAfter;
+
+        const bool canOpenDownwards = ((realCursorPos.y) + characterSize.Height + actualSuggestionsSizeAfter.height) < windowDimensions.height;
+        const auto direction = canOpenDownwards ? TerminalApp::SuggestionsDirection::TopDown :
+                                                  TerminalApp::SuggestionsDirection::BottomUp;
+        const auto anchor = realCursorPos + til::point{ til::math::rounding, 0.0f, canOpenDownwards ? characterSize.Height : 0 };
+        sxnUi.Anchor(anchor.to_winrt_point(), windowDimensions.to_winrt_size());
+        sxnUi.Direction(direction);
 
         // // Position the suggestions UI relative to the actual term control.
         // //

From 173a830339ac66e26b165ccdeeb60f1a08cb7fcb Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Wed, 1 Mar 2023 08:19:07 -0600
Subject: [PATCH 3/3] Finish detaching it from the popup

(cherry picked from commit a172f535971277173faf1cf3fe81608e1a353ce2)
---
 .../TerminalApp/SuggestionsControl.cpp        | 33 ++++----
 src/cascadia/TerminalApp/SuggestionsControl.h |  5 +-
 .../TerminalApp/SuggestionsControl.idl        |  3 +-
 src/cascadia/TerminalApp/TerminalPage.cpp     | 81 +------------------
 src/cascadia/TerminalApp/TerminalPage.xaml    | 11 +--
 5 files changed, 27 insertions(+), 106 deletions(-)

diff --git a/src/cascadia/TerminalApp/SuggestionsControl.cpp b/src/cascadia/TerminalApp/SuggestionsControl.cpp
index 4bed17c933f..a6ffd0e5e27 100644
--- a/src/cascadia/TerminalApp/SuggestionsControl.cpp
+++ b/src/cascadia/TerminalApp/SuggestionsControl.cpp
@@ -1038,7 +1038,7 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    void SuggestionsControl::Direction(TerminalApp::SuggestionsDirection direction)
+    void SuggestionsControl::_setDirection(TerminalApp::SuggestionsDirection direction)
     {
         _direction = direction;
         if (_direction == TerminalApp::SuggestionsDirection::TopDown)
@@ -1052,14 +1052,20 @@ namespace winrt::TerminalApp::implementation
     }
 
     void SuggestionsControl::Anchor(Windows::Foundation::Point anchor,
-                                    Windows::Foundation::Size space)
+                                    Windows::Foundation::Size space,
+                                    float characterHeight)
     {
         _anchor = anchor;
         _space = space;
 
-        // TODO! do some clamping
-
         const til::size actualSize{ til::math::rounding, ActualWidth(), ActualHeight() };
+        // Is there space in the window below the cursor to open the menu downwards?
+        const bool canOpenDownwards = (_anchor.Y + characterHeight + actualSize.height) < space.Height;
+        _setDirection(canOpenDownwards ? TerminalApp::SuggestionsDirection::TopDown :
+                                         TerminalApp::SuggestionsDirection::BottomUp);
+        // Set the anchor below by a character height
+        _anchor.Y += canOpenDownwards ? characterHeight : 0;
+
         // First, position horizonally.
         //
         // We want to align the left edge of the text within the control to the
@@ -1071,25 +1077,20 @@ namespace winrt::TerminalApp::implementation
         const auto maxX = gsl::narrow_cast<int>(space.Width - actualSize.width);
         const auto clampedX = std::clamp(proposedX, 0, maxX);
 
-        // // Create a thickness for the new margins
+        // Create a thickness for the new margins
         auto newMargin = Windows::UI::Xaml::ThicknessHelper::FromLengths(clampedX, 0, 0, 0);
-
-        // // SuggestionsPopup().HorizontalOffset(clampedX);
-
-        // // Now, position vertically.
+        // Now, position vertically.
         if (_direction == TerminalApp::SuggestionsDirection::TopDown)
         {
-            //     // The control should open right below the cursor, with the list
-            //     // extending below. This is easy, we can just use the cursor as the
-            //     // origin (more or less)
-            //     // SuggestionsPopup().VerticalOffset(realCursorPos.y + characterSize.Height);
+            // The control should open right below the cursor, with the list
+            // extending below. This is easy, we can just use the cursor as the
+            // origin (more or less)
             newMargin.Top = (_anchor.Y);
         }
         else
         {
-            //     // Position at the cursor. The suggestions UI itself will maintian
-            //     // its own offset such that it's always above its origin
-            //     // SuggestionsPopup().VerticalOffset(realCursorPos.y);
+            // Position at the cursor. The suggestions UI itself will maintian
+            // its own offset such that it's always above its origin
             newMargin.Top = (_anchor.Y - actualSize.height);
         }
         Margin(newMargin);
diff --git a/src/cascadia/TerminalApp/SuggestionsControl.h b/src/cascadia/TerminalApp/SuggestionsControl.h
index 3f09754286c..72e98283213 100644
--- a/src/cascadia/TerminalApp/SuggestionsControl.h
+++ b/src/cascadia/TerminalApp/SuggestionsControl.h
@@ -34,11 +34,10 @@ namespace winrt::TerminalApp::implementation
         void ScrollToBottom();
 
         Windows::UI::Xaml::FrameworkElement SelectedItem();
-        void Direction(TerminalApp::SuggestionsDirection direction);
 
         TerminalApp::SuggestionsMode Mode() const;
         void Mode(TerminalApp::SuggestionsMode mode);
-        void Anchor(Windows::Foundation::Point anchor, Windows::Foundation::Size space);
+        void Anchor(Windows::Foundation::Point anchor, Windows::Foundation::Size space, float characterHeight);
 
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
         WINRT_OBSERVABLE_PROPERTY(winrt::hstring, NoMatchesText, _PropertyChangedHandlers);
@@ -104,6 +103,8 @@ namespace winrt::TerminalApp::implementation
 
         void _switchToMode();
 
+        void _setDirection(TerminalApp::SuggestionsDirection direction);
+
         std::wstring _getTrimmedInput();
 
         Microsoft::Terminal::Settings::Model::IActionMapView _actionMap{ nullptr };
diff --git a/src/cascadia/TerminalApp/SuggestionsControl.idl b/src/cascadia/TerminalApp/SuggestionsControl.idl
index ccb55b5d058..efb6adf0aa4 100644
--- a/src/cascadia/TerminalApp/SuggestionsControl.idl
+++ b/src/cascadia/TerminalApp/SuggestionsControl.idl
@@ -41,8 +41,7 @@ namespace TerminalApp
         void SetActionMap(Microsoft.Terminal.Settings.Model.IActionMapView actionMap);
         void SelectNextItem(Boolean moveDown);
 
-        void Direction(SuggestionsDirection direction);
-        void Anchor(Windows.Foundation.Point anchor, Windows.Foundation.Size space);
+        void Anchor(Windows.Foundation.Point anchor, Windows.Foundation.Size space, Single characterHeight);
 
         event Windows.Foundation.TypedEventHandler<SuggestionsControl, Microsoft.Terminal.Settings.Model.Command> DispatchCommandRequested;
         event Windows.Foundation.TypedEventHandler<Object, Microsoft.Terminal.Settings.Model.Command> PreviewAction;
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index 9eacb0c0275..cee6b5c22aa 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -4510,7 +4510,6 @@ namespace winrt::TerminalApp::implementation
         }
         if (commandsCollection.Size() == 0)
         {
-            // SuggestionsPopup().IsOpen(false);
             SuggestionsUI().Visibility(Visibility::Collapsed);
 
             co_return;
@@ -4530,8 +4529,9 @@ namespace winrt::TerminalApp::implementation
         }
         const auto& sxnUi{ SuggestionsUI() };
 
-        // A handy local to know how much space the suggestions UI might take up.
-        static const Windows::Foundation::Size maxSize{ 300, 300 };
+        sxnUi.Mode(mode);
+        sxnUi.SetCommands(commandsCollection);
+        sxnUi.Visibility(commandsCollection.Size() > 0 ? Visibility::Visible : Visibility::Collapsed);
 
         const auto characterSize{ control.CharacterDimensions() };
         // This is in control-relative space. We'll need to convert it to page-relative space.
@@ -4539,82 +4539,9 @@ namespace winrt::TerminalApp::implementation
         const auto controlTransform = control.TransformToVisual(this->Root());
         const til::point controlOrigin{ til::math::rounding, controlTransform.TransformPoint(Windows::Foundation::Point{ 0, 0 }) };
         const til::point realCursorPos = controlOrigin + cursorPos;
-        // const til::point anchor = realCursorPos + til::point{ 0, characterSize.Height };
-
-        const auto currentWindow = CoreWindow::GetForCurrentThread();
-        const auto currentWindowBounds = currentWindow.Bounds();
-        // Using CoreWindow::GetForCurrentThread().Bounds().{Width, Height}
-        // seemed like a dead end. Those were both just 1. I suspect that
-        // doesn't work for XAML Islands at all.
-        const til::point windowOrigin{ til::math::rounding, currentWindowBounds.X, currentWindowBounds.Y };
-        // Fortunately, we can just use the Actual{Width,Height} of ourselves.
         const til::size windowDimensions{ til::math::rounding, ActualWidth(), ActualHeight() };
 
-        // Is there space in the window below the cursor to open the menu downwards?
-        // const bool canOpenDownwards = ((realCursorPos.y) + characterSize.Height + maxSize.Height) < windowDimensions.height;
-
-        // const auto direction = canOpenDownwards ? TerminalApp::SuggestionsDirection::TopDown :
-        //                                           TerminalApp::SuggestionsDirection::BottomUp;
-        const til::size actualSuggestionsSizeBefore{ til::math::rounding, sxnUi.ActualWidth(), sxnUi.ActualHeight() };
-        actualSuggestionsSizeBefore;
-        // sxnUi.Direction(direction);
-        // sxnUi.Anchor(realCursorPos.to_winrt_point(), windowDimensions.to_winrt_size());
-        sxnUi.Mode(mode);
-
-        // SuggestionsPopup().IsOpen(true);
-        sxnUi.SetCommands(commandsCollection);
-        sxnUi.Visibility(commandsCollection.Size() > 0 ? Visibility::Visible : Visibility::Collapsed);
-        const til::size actualSuggestionsSizeAfter{ til::math::rounding, sxnUi.ActualWidth(), sxnUi.ActualHeight() };
-        actualSuggestionsSizeAfter;
-
-        const bool canOpenDownwards = ((realCursorPos.y) + characterSize.Height + actualSuggestionsSizeAfter.height) < windowDimensions.height;
-        const auto direction = canOpenDownwards ? TerminalApp::SuggestionsDirection::TopDown :
-                                                  TerminalApp::SuggestionsDirection::BottomUp;
-        const auto anchor = realCursorPos + til::point{ til::math::rounding, 0.0f, canOpenDownwards ? characterSize.Height : 0 };
-        sxnUi.Anchor(anchor.to_winrt_point(), windowDimensions.to_winrt_size());
-        sxnUi.Direction(direction);
-
-        // // Position the suggestions UI relative to the actual term control.
-        // //
-        // // This needs to be done _after_ it is set to be visible. If not, then
-        // // the control won't have an Actual{Width, Height} yet.
-        // const til::size actualSuggestionsSize{ til::math::rounding,
-        //                                        sxnUi.ActualWidth(),
-        //                                        sxnUi.ActualHeight() };
-
-        // // First, position horizonally.
-        // //
-        // // We want to align the left edge of the text within the control to the
-        // // cursor position. We'll need to scoot a little to the left, to align
-        // // text with cursor
-        // const auto proposedX = realCursorPos.x - 40;
-        // // If the control is too wide to fit in the window, clamp it fit inside
-        // // the window.
-        // const auto maxX = gsl::narrow_cast<int>(windowDimensions.width - actualSuggestionsSize.width);
-        // const auto clampedX = std::clamp(proposedX, 0, maxX);
-
-        // // Create a thickness for the new margins
-        // auto newMargin = Windows::UI::Xaml::ThicknessHelper::FromLengths(clampedX, 0, 0, 0);
-
-        // // SuggestionsPopup().HorizontalOffset(clampedX);
-
-        // // Now, position vertically.
-        // if (direction == TerminalApp::SuggestionsDirection::TopDown)
-        // {
-        //     // The control should open right below the cursor, with the list
-        //     // extending below. This is easy, we can just use the cursor as the
-        //     // origin (more or less)
-        //     // SuggestionsPopup().VerticalOffset(realCursorPos.y + characterSize.Height);
-        //     newMargin.Top = (realCursorPos.y + characterSize.Height);
-        // }
-        // else
-        // {
-        //     // Position at the cursor. The suggestions UI itself will maintian
-        //     // its own offset such that it's always above its origin
-        //     // SuggestionsPopup().VerticalOffset(realCursorPos.y);
-        //     newMargin.Top = (realCursorPos.y);
-        // }
-        // sxnUi.Margin(newMargin);
+        sxnUi.Anchor(realCursorPos.to_winrt_point(), windowDimensions.to_winrt_size(), characterSize.Height);
     }
 
 }
diff --git a/src/cascadia/TerminalApp/TerminalPage.xaml b/src/cascadia/TerminalApp/TerminalPage.xaml
index f160ab965e9..da572d25e92 100644
--- a/src/cascadia/TerminalApp/TerminalPage.xaml
+++ b/src/cascadia/TerminalApp/TerminalPage.xaml
@@ -86,11 +86,11 @@
             ContentDialog a Row, I believe it's assigned Row 0 by default. So,
             when the dialog gets opened, the dialog seemingly causes a giant
             hole to appear in the body of the app.
-            
+
             Assigning all the dialogs to Row 2 (where the rest of the content
             is) makes the "hole" appear in the same space as the rest of the
             TabContent, fixing the issue.
-            
+
             Note that the actual content in a content dialog gets parented to
             the PopupRoot, so it actually always appeared in the correct place, it's
             just this weird hole that appeared in Row 0.
@@ -201,13 +201,6 @@
                                   VerticalAlignment="Top"
                                   PreviewKeyDown="_KeyDownHandler"
                                   Visibility="Collapsed" />
-        <!--<Popup x:Name="SuggestionsPopup"
-               HorizontalOffset="200"
-               IsOpen="False"
-               ShouldConstrainToRootBounds="False"
-               VerticalOffset="200">
-
-        </Popup>-->
 
         <!--
             A TeachingTip with IsLightDismissEnabled="True" will immediately