Fix rebase

microsoft · Oct 18, 2019 · b00fef8 · b00fef8
1 parent 583541d
commit b00fef8
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 62 deletions.
diff --git a/src/cascadia/TerminalControl/TermControl.h b/src/cascadia/TerminalControl/TermControl.h
@@ -156,7 +156,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         void _ApplyUISettings();
         void _InitializeBackgroundBrush();
         void _BackgroundColorChanged(const uint32_t color);
-        void _InitializeTerminal();
+        bool _InitializeTerminal();
         void _UpdateFont(const bool initialUpdate = false);
         void _KeyDownHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e);
         void _CharacterHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::CharacterReceivedRoutedEventArgs const& e);

diff --git a/src/cascadia/WindowsTerminal/AppHost.cpp b/src/cascadia/WindowsTerminal/AppHost.cpp
@@ -149,66 +149,66 @@ void AppHost::_HandleCreateWindow(const HWND hwnd, RECT proposedRect, winrt::Ter
 
     long adjustedHeight = 0;
     long adjustedWidth = 0;
-	if (launchMode == winrt::TerminalApp::LaunchMode::DefaultMode)
-	{
-		// Find nearest montitor.
-		HMONITOR hmon = MonitorFromRect(&proposedRect, MONITOR_DEFAULTTONEAREST);
-
-		// Get nearest monitor information
-		MONITORINFO monitorInfo;
-		monitorInfo.cbSize = sizeof(MONITORINFO);
-		GetMonitorInfo(hmon, &monitorInfo);
-
-		// This API guarantees that dpix and dpiy will be equal, but neither is an
-		// optional parameter so give two UINTs.
-		UINT dpix = USER_DEFAULT_SCREEN_DPI;
-		UINT dpiy = USER_DEFAULT_SCREEN_DPI;
-		// If this fails, we'll use the default of 96.
-		GetDpiForMonitor(hmon, MDT_EFFECTIVE_DPI, &dpix, &dpiy);
-
-		// We need to check if the top left point of the titlebar of the window is within any screen
-		RECT offScreenTestRect;
-		offScreenTestRect.left = proposedRect.left;
-		offScreenTestRect.top = proposedRect.top;
-		offScreenTestRect.right = offScreenTestRect.left + 1;
-		offScreenTestRect.bottom = offScreenTestRect.top + 1;
-
-		bool isTitlebarIntersectWithMonitors = false;
-		EnumDisplayMonitors(
-			nullptr, &offScreenTestRect, [](HMONITOR, HDC, LPRECT, LPARAM lParam) -> BOOL {
-				auto intersectWithMonitor = reinterpret_cast<bool*>(lParam);
-				*intersectWithMonitor = true;
-				// Continue the enumeration
-				return FALSE;
-			},
-			reinterpret_cast<LPARAM>(&isTitlebarIntersectWithMonitors));
-
-		if (!isTitlebarIntersectWithMonitors)
-		{
-			// If the title bar is out-of-screen, we set the initial position to
-			// the top left corner of the nearest monitor
-			proposedRect.left = monitorInfo.rcWork.left;
-			proposedRect.top = monitorInfo.rcWork.top;
-		}
-
-		auto initialSize = _app.GetLaunchDimensions(dpix);
-
-		const short _currentWidth = Utils::ClampToShortMax(
-			static_cast<long>(ceil(initialSize.X)), 1);
-		const short _currentHeight = Utils::ClampToShortMax(
-			static_cast<long>(ceil(initialSize.Y)), 1);
-
-		// Create a RECT from our requested client size
-		const auto clientRect = Viewport::FromDimensions({ _currentWidth,
-														   _currentHeight })
-									.ToRect();
-
-		// Get the size of a window we'd need to host that client rect. This will
-		// add the titlebar space.
-		const auto client2win = _window->GetClientToWinSizeDelta(dpix);
-		adjustedHeight = clientRect.bottom - clientRect.top + client2win.cx;
-		adjustedWidth = clientRect.right - clientRect.left + client2win.cy;
-	}
+    if (launchMode == winrt::TerminalApp::LaunchMode::DefaultMode)
+    {
+        // Find nearest montitor.
+        HMONITOR hmon = MonitorFromRect(&proposedRect, MONITOR_DEFAULTTONEAREST);
+
+        // Get nearest monitor information
+        MONITORINFO monitorInfo;
+        monitorInfo.cbSize = sizeof(MONITORINFO);
+        GetMonitorInfo(hmon, &monitorInfo);
+
+        // This API guarantees that dpix and dpiy will be equal, but neither is an
+        // optional parameter so give two UINTs.
+        UINT dpix = USER_DEFAULT_SCREEN_DPI;
+        UINT dpiy = USER_DEFAULT_SCREEN_DPI;
+        // If this fails, we'll use the default of 96.
+        GetDpiForMonitor(hmon, MDT_EFFECTIVE_DPI, &dpix, &dpiy);
+
+        // We need to check if the top left point of the titlebar of the window is within any screen
+        RECT offScreenTestRect;
+        offScreenTestRect.left = proposedRect.left;
+        offScreenTestRect.top = proposedRect.top;
+        offScreenTestRect.right = offScreenTestRect.left + 1;
+        offScreenTestRect.bottom = offScreenTestRect.top + 1;
+
+        bool isTitlebarIntersectWithMonitors = false;
+        EnumDisplayMonitors(
+            nullptr, &offScreenTestRect, [](HMONITOR, HDC, LPRECT, LPARAM lParam) -> BOOL {
+                auto intersectWithMonitor = reinterpret_cast<bool*>(lParam);
+                *intersectWithMonitor = true;
+                // Continue the enumeration
+                return FALSE;
+            },
+            reinterpret_cast<LPARAM>(&isTitlebarIntersectWithMonitors));
+
+        if (!isTitlebarIntersectWithMonitors)
+        {
+            // If the title bar is out-of-screen, we set the initial position to
+            // the top left corner of the nearest monitor
+            proposedRect.left = monitorInfo.rcWork.left;
+            proposedRect.top = monitorInfo.rcWork.top;
+        }
+
+        auto initialSize = _app.GetLaunchDimensions(dpix);
+
+        const short _currentWidth = Utils::ClampToShortMax(
+            static_cast<long>(ceil(initialSize.X)), 1);
+        const short _currentHeight = Utils::ClampToShortMax(
+            static_cast<long>(ceil(initialSize.Y)), 1);
+
+        // Create a RECT from our requested client size
+        const auto clientRect = Viewport::FromDimensions({ _currentWidth,
+                                                           _currentHeight })
+                                    .ToRect();
+
+        // Get the size of a window we'd need to host that client rect. This will
+        // add the titlebar space.
+        const auto nonClientSize = _window->GetNonClientSize(dpix);
+        adjustedHeight = clientRect.bottom - clientRect.top + nonClientSize.cx;
+        adjustedWidth = clientRect.right - clientRect.left + nonClientSize.cy;
+    }
 
     const COORD origin{ gsl::narrow<short>(proposedRect.left),
                         gsl::narrow<short>(proposedRect.top) };

diff --git a/src/cascadia/WindowsTerminal/IslandWindow.h b/src/cascadia/WindowsTerminal/IslandWindow.h
@@ -33,7 +33,7 @@ class IslandWindow :
 
     virtual void Initialize();
 
-    void SetCreateCallback(std::function<void(const HWND, const RECT)> pfn) noexcept;
+    void SetCreateCallback(std::function<void(const HWND, const RECT, winrt::TerminalApp::LaunchMode& launchMode)> pfn) noexcept;
     void SetSnapDimensionCallback(std::function<float(bool widthOrHeight, float dimension)> pfn) noexcept;
 
     void UpdateTheme(const winrt::Windows::UI::Xaml::ElementTheme& requestedTheme);