fix merge

microsoft · Mar 28, 2020 · 1e69a7c · 1e69a7c
1 parent adc97bd
commit 1e69a7c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dep/gsl b/dep/gsl
diff --git a/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp b/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp
@@ -811,7 +811,7 @@ void NonClientIslandWindow::_SetIsFullscreen(const bool fullscreenEnabled)
     // always get another window message to trigger us to remove the drag bar.
     // So, make sure to update the size of the drag region here, so that it
     // _definitely_ goes away.
-    _UpdateIslandRegion();
+    _RecreateDragBarWindow();
 }
 
 // Method Description:
+2 −2		CONTRIBUTING.md
+0 −2		README.md
+1 −1		ThirdPartyNotices.txt
+4 −6		include/gsl/gsl_byte
+6 −3		include/gsl/gsl_util
+139 −119		include/gsl/multi_span
+5 −13		include/gsl/pointers
+1 −1		include/gsl/span
+1 −0		include/gsl/string_span
+0 −10		tests/bounds_tests.cpp
+1 −15		tests/multi_span_tests.cpp
+1 −1		tests/no_exception_ensure_tests.cpp
+1 −1		tests/no_exception_throw_tests.cpp
+2 −2		tests/notnull_tests.cpp
+1 −11		tests/strided_span_tests.cpp