heyo this works.

I'm not entirely sure why. But if we only update the titlebar drag region when that actually changes, it's a _lot_ smoother. I'm not super happy with the duplicated work in _UpdateDragRegion and OnSize, but checking this in in case I can't figure that out.
microsoft · Jul 9, 2019 · aad9f56 · aad9f56
1 parent 22e1023
commit aad9f56
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 6 deletions.
diff --git a/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp b/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp
@@ -36,8 +36,9 @@ NonClientIslandWindow::~NonClientIslandWindow()
 
 void NonClientIslandWindow::OnDragBarSizeChanged(winrt::Windows::Foundation::IInspectable sender, winrt::Windows::UI::Xaml::SizeChangedEventArgs eventArgs)
 {
-    InvalidateRect(NULL, NULL, TRUE);
-    ForceResize();
+    // InvalidateRect(NULL, NULL, TRUE);
+    // ForceResize();
+    _UpdateDragRegion();
 }
 
 void NonClientIslandWindow::OnAppInitialized(winrt::TerminalApp::App app)
@@ -101,8 +102,6 @@ void NonClientIslandWindow::OnSize(const UINT width, const UINT height)
     const auto xPos = _isMaximized ? _maximizedMargins.cxLeftWidth : dragX;
     const auto yPos = _isMaximized ? _maximizedMargins.cyTopHeight : dragY;
 
-    winrt::check_bool(SetWindowPos(_interopWindowHandle, HWND_BOTTOM, xPos, yPos, windowsWidth, windowsHeight, SWP_SHOWWINDOW));
-
     if (_rootGrid)
     {
         winrt::Windows::Foundation::Size size{ (windowsWidth / scale) + 0.5f, (windowsHeight / scale) + 0.5f };
@@ -113,8 +112,40 @@ void NonClientIslandWindow::OnSize(const UINT width, const UINT height)
         _rootGrid.Arrange(finalRect);
     }
 
+    winrt::check_bool(SetWindowPos(_interopWindowHandle, HWND_TOP, xPos, yPos, windowsWidth, windowsHeight, SWP_SHOWWINDOW));
+}
+
+void NonClientIslandWindow::_UpdateDragRegion()
+{
     if (_dragBar)
     {
+        const auto windowRect = GetWindowRect();
+        const auto width = windowRect.right - windowRect.left;
+        const auto height = windowRect.bottom - windowRect.top;
+
+        const auto scale = GetCurrentDpiScale();
+        const auto dpi = ::GetDpiForWindow(_window.get());
+
+        const auto dragY = ::GetSystemMetricsForDpi(SM_CYDRAG, dpi);
+        const auto dragX = ::GetSystemMetricsForDpi(SM_CXDRAG, dpi);
+
+        // If we're maximized, we don't want to use the frame as our margins,
+        // instead we want to use the margins from the maximization. If we included
+        // the left&right sides of the frame in this calculation while maximized,
+        // you' have a few pixels of the window border on the sides while maximized,
+        // which most apps do not have.
+        const auto bordersWidth = _isMaximized ?
+                                      (_maximizedMargins.cxLeftWidth + _maximizedMargins.cxRightWidth) :
+                                      (dragX * 2);
+        const auto bordersHeight = _isMaximized ?
+                                       (_maximizedMargins.cyBottomHeight + _maximizedMargins.cyTopHeight) :
+                                       (dragY * 2);
+
+        const auto windowsWidth = width - bordersWidth;
+        const auto windowsHeight = height - bordersHeight;
+        const auto xPos = _isMaximized ? _maximizedMargins.cxLeftWidth : dragX;
+        const auto yPos = _isMaximized ? _maximizedMargins.cyTopHeight : dragY;
+
         const auto dragBarRect = GetDragAreaRect();
         const auto nonClientHeight = dragBarRect.bottom - dragBarRect.top;
 
@@ -127,9 +158,8 @@ void NonClientIslandWindow::OnSize(const UINT width, const UINT height)
         auto clientRegion = wil::unique_hrgn(CreateRectRgn(0, nonClientHeight, windowsWidth, windowsHeight));
         winrt::check_bool(CombineRgn(_dragBarRegion.get(), nonClientRegion.get(), clientRegion.get(), RGN_OR));
         winrt::check_bool(SetWindowRgn(_interopWindowHandle, _dragBarRegion.get(), true));
+        // winrt::check_bool(InvalidateRgn(_interopWindowHandle, _dragBarRegion.get(), true));
     }
-
-    winrt::check_hresult(_UpdateFrameMargins());
 }
 
 // Method Description:
@@ -403,6 +433,12 @@ RECT NonClientIslandWindow::GetMaxWindowRectInPixels(const RECT* const prcSugges
         {
             return 0;
         }
+        RECT updateRect{ 0 };
+        const bool updateRectResult = ::GetUpdateRect(_window.get(), &updateRect, false);
+        if (updateRectResult == 0)
+        {
+            break;
+        }
 
         PAINTSTRUCT ps{ 0 };
         const auto hdc = wil::BeginPaint(_window.get(), &ps);

diff --git a/src/cascadia/WindowsTerminal/NonClientIslandWindow.h b/src/cascadia/WindowsTerminal/NonClientIslandWindow.h
@@ -54,6 +54,7 @@ class NonClientIslandWindow : public IslandWindow
 
     void _HandleActivateWindow();
     bool _HandleWindowPosChanging(WINDOWPOS* const windowPos);
+    void _UpdateDragRegion();
 
     void OnDragBarSizeChanged(winrt::Windows::Foundation::IInspectable sender, winrt::Windows::UI::Xaml::SizeChangedEventArgs eventArgs);