From 9714bf543b3db2956a150e4d431072dcc8e56d50 Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Wed, 11 Aug 2021 16:00:23 -0500
Subject: [PATCH] Revert "messing with making the drag recy not a child. That
 did nothing"

This reverts commit dfcdefddee7fe4a676612926f4274adf02395c71.
---
 src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp b/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp
index 34c7223b4..b20c009d7 100644
--- a/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp
+++ b/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp
@@ -72,20 +72,19 @@ void NonClientIslandWindow::MakeWindow() noexcept
     // right on top of the drag bar. The XAML island window "steals" our mouse
     // messages which makes it hard to implement a custom drag area. By putting
     // a window on top of it, we prevent it from "stealing" the mouse messages.
-    _dragBarWindow.reset(CreateWindowExW(0, //WS_EX_LAYERED | WS_EX_NOREDIRECTIONBITMAP,
+    _dragBarWindow.reset(CreateWindowExW(WS_EX_LAYERED | WS_EX_NOREDIRECTIONBITMAP,
                                          dragBarClassName,
                                          L"",
-                                         WS_OVERLAPPED,// 0, //WS_CHILD,
+                                         WS_CHILD,
                                          0,
                                          0,
                                          0,
                                          0,
-                                         HWND_DESKTOP, // HWND_MESSAGE, //GetHandle(),
+                                         GetHandle(),
                                          nullptr,
                                          wil::GetModuleInstanceHandle(),
                                          this));
-    THROW_LAST_ERROR_IF_NULL(_dragBarWindow);
-    // THROW_HR_IF_NULL(E_UNEXPECTED, _dragBarWindow);
+    THROW_HR_IF_NULL(E_UNEXPECTED, _dragBarWindow);
 }
 
 // Function Description: