From 46e51966467b8fa345f6d59f4270f269294482d9 Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Tue, 19 May 2020 09:20:01 -0500 Subject: [PATCH 1/6] Make sure to update the maximize button's visual state on launch --- src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp b/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp index 86f20c9e05c..2dfa8bdf75a 100644 --- a/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp +++ b/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp @@ -205,6 +205,11 @@ void NonClientIslandWindow::Initialize() _rootGrid.Children().Append(_titlebar); Controls::Grid::SetRow(_titlebar, 0); + + // GH#3440 - When the titlebar is loaded (officially added to our UI tree), + // then make sure to update it's visual state to reflect if we're in the + // maximized state on launch. + _titlebar.Loaded([this](auto&&, auto&&) { _OnMaximizeChange(); }); } // Method Description: From 16e047f41e7aa5999c63af2d591a62d066b27473 Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Tue, 19 May 2020 12:39:47 -0500 Subject: [PATCH 2/6] This works but the code is dirty, so I'll clean it up next --- src/cascadia/TerminalApp/AppLogic.idl | 1 + .../TerminalApp/GlobalAppSettings.cpp | 7 ++ src/cascadia/TerminalApp/TerminalPage.cpp | 22 ++++ src/cascadia/WindowsTerminal/AppHost.cpp | 102 +++++++++--------- src/cascadia/WindowsTerminal/IslandWindow.cpp | 6 ++ .../WindowsTerminal/NonClientIslandWindow.cpp | 7 +- 6 files changed, 93 insertions(+), 52 deletions(-) diff --git a/src/cascadia/TerminalApp/AppLogic.idl b/src/cascadia/TerminalApp/AppLogic.idl index 513f6c543e7..12368a8ab10 100644 --- a/src/cascadia/TerminalApp/AppLogic.idl +++ b/src/cascadia/TerminalApp/AppLogic.idl @@ -11,6 +11,7 @@ namespace TerminalApp { DefaultMode, MaximizedMode, + FullscreenMode, }; [default_interface] runtimeclass AppLogic : IF7Listener diff --git a/src/cascadia/TerminalApp/GlobalAppSettings.cpp b/src/cascadia/TerminalApp/GlobalAppSettings.cpp index 52d7368330f..cdb67c1b81d 100644 --- a/src/cascadia/TerminalApp/GlobalAppSettings.cpp +++ b/src/cascadia/TerminalApp/GlobalAppSettings.cpp @@ -38,6 +38,7 @@ static constexpr std::string_view ConfirmCloseAllKey{ "confirmCloseAllTabs" }; static constexpr std::string_view SnapToGridOnResizeKey{ "snapToGridOnResize" }; static constexpr std::wstring_view DefaultLaunchModeValue{ L"default" }; static constexpr std::wstring_view MaximizedLaunchModeValue{ L"maximized" }; +static constexpr std::wstring_view FullscreenLaunchModeValue{ L"fullscreen" }; static constexpr std::wstring_view LightThemeValue{ L"light" }; static constexpr std::wstring_view DarkThemeValue{ L"dark" }; static constexpr std::wstring_view SystemThemeValue{ L"system" }; @@ -473,6 +474,10 @@ LaunchMode GlobalAppSettings::_ParseLaunchMode(const std::wstring& launchModeStr { return LaunchMode::MaximizedMode; } + else if (launchModeString == FullscreenLaunchModeValue) + { + return LaunchMode::FullscreenMode; + } return LaunchMode::DefaultMode; } @@ -490,6 +495,8 @@ std::wstring_view GlobalAppSettings::_SerializeLaunchMode(const LaunchMode launc { case LaunchMode::MaximizedMode: return MaximizedLaunchModeValue; + case LaunchMode::FullscreenMode: + return FullscreenLaunchModeValue; default: return DefaultLaunchModeValue; } diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp index b80b7729973..3009d4ad087 100644 --- a/src/cascadia/TerminalApp/TerminalPage.cpp +++ b/src/cascadia/TerminalApp/TerminalPage.cpp @@ -130,6 +130,11 @@ namespace winrt::TerminalApp::implementation _setTitleBarContentHandlers(*this, _tabRow); } + // if (_settings->GlobalSettings().GetLaunchMode() == winrt::TerminalApp::LaunchMode::FullscreenMode) + // { + // _isFullscreen = true; + // } + // Hookup our event handlers to the ShortcutActionDispatch _RegisterActionCallbacks(); @@ -187,6 +192,14 @@ namespace winrt::TerminalApp::implementation if (_appArgs.GetStartupActions().empty()) { _OpenNewTab(nullptr); + if (_settings->GlobalSettings().GetLaunchMode() == winrt::TerminalApp::LaunchMode::FullscreenMode) + { + // if (_tabs.Size() == 1) + // { + // _UpdatedSelectedTab(0); + // } + _ToggleFullscreen(); + } _startupState = StartupState::Initialized; _InitializedHandlers(*this, nullptr); } @@ -221,6 +234,15 @@ namespace winrt::TerminalApp::implementation { _actionDispatch->DoAction(action); } + + if (_settings->GlobalSettings().GetLaunchMode() == winrt::TerminalApp::LaunchMode::FullscreenMode) + { + // if (_tabs.Size() == 1) + // { + // _UpdatedSelectedTab(0); + // } + _ToggleFullscreen(); + } _startupState = StartupState::Initialized; _InitializedHandlers(*this, nullptr); } diff --git a/src/cascadia/WindowsTerminal/AppHost.cpp b/src/cascadia/WindowsTerminal/AppHost.cpp index c27bfae1ad1..3d9b9c0bc01 100644 --- a/src/cascadia/WindowsTerminal/AppHost.cpp +++ b/src/cascadia/WindowsTerminal/AppHost.cpp @@ -239,61 +239,61 @@ void AppHost::_HandleCreateWindow(const HWND hwnd, RECT proposedRect, winrt::Ter long adjustedHeight = 0; long adjustedWidth = 0; - if (launchMode == winrt::TerminalApp::LaunchMode::DefaultMode) + // if (launchMode == winrt::TerminalApp::LaunchMode::DefaultMode) + // { + // Find nearest monitor. + 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(lParam); + *intersectWithMonitor = true; + // Continue the enumeration + return FALSE; + }, + reinterpret_cast(&isTitlebarIntersectWithMonitors)); + + if (!isTitlebarIntersectWithMonitors) { - // Find nearest monitor. - 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(lParam); - *intersectWithMonitor = true; - // Continue the enumeration - return FALSE; - }, - reinterpret_cast(&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; - } + // 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 = _logic.GetLaunchDimensions(dpix); + auto initialSize = _logic.GetLaunchDimensions(dpix); - const short islandWidth = Utils::ClampToShortMax( - static_cast(ceil(initialSize.X)), 1); - const short islandHeight = Utils::ClampToShortMax( - static_cast(ceil(initialSize.Y)), 1); + const short islandWidth = Utils::ClampToShortMax( + static_cast(ceil(initialSize.X)), 1); + const short islandHeight = Utils::ClampToShortMax( + static_cast(ceil(initialSize.Y)), 1); - // Get the size of a window we'd need to host that client rect. This will - // add the titlebar space. - const auto nonClientSize = _window->GetTotalNonClientExclusiveSize(dpix); - adjustedWidth = islandWidth + nonClientSize.cx; - adjustedHeight = islandHeight + nonClientSize.cy; - } + // Get the size of a window we'd need to host that client rect. This will + // add the titlebar space. + const auto nonClientSize = _window->GetTotalNonClientExclusiveSize(dpix); + adjustedWidth = islandWidth + nonClientSize.cx; + adjustedHeight = islandHeight + nonClientSize.cy; + // } const COORD origin{ gsl::narrow(proposedRect.left), gsl::narrow(proposedRect.top) }; diff --git a/src/cascadia/WindowsTerminal/IslandWindow.cpp b/src/cascadia/WindowsTerminal/IslandWindow.cpp index 73cb2d7a3c5..03d5ba48080 100644 --- a/src/cascadia/WindowsTerminal/IslandWindow.cpp +++ b/src/cascadia/WindowsTerminal/IslandWindow.cpp @@ -143,7 +143,13 @@ void IslandWindow::_HandleCreateWindow(const WPARAM, const LPARAM lParam) noexce } ShowWindow(_window.get(), nCmdShow); + UpdateWindow(_window.get()); + + // if (launchMode == winrt::TerminalApp::LaunchMode::FullscreenMode) + // { + // _SetIsFullscreen(true); + // } } // Method Description: diff --git a/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp b/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp index 2dfa8bdf75a..1505c487e1e 100644 --- a/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp +++ b/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp @@ -210,6 +210,8 @@ void NonClientIslandWindow::Initialize() // then make sure to update it's visual state to reflect if we're in the // maximized state on launch. _titlebar.Loaded([this](auto&&, auto&&) { _OnMaximizeChange(); }); + + // _titlebar.Visibility(!_fullscreen ? Visibility::Visible : Visibility::Collapsed); } // Method Description: @@ -838,7 +840,10 @@ void NonClientIslandWindow::OnApplicationThemeChanged(const ElementTheme& reques void NonClientIslandWindow::_SetIsFullscreen(const bool fullscreenEnabled) { IslandWindow::_SetIsFullscreen(fullscreenEnabled); - _titlebar.Visibility(!fullscreenEnabled ? Visibility::Visible : Visibility::Collapsed); + if (_titlebar) + { + _titlebar.Visibility(!fullscreenEnabled ? Visibility::Visible : Visibility::Collapsed); + } // GH#4224 - When the auto-hide taskbar setting is enabled, then we don't // 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 From f1f4e44e7acd3ef6cb4be1346854bb2911592683 Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Tue, 19 May 2020 14:38:48 -0500 Subject: [PATCH 3/6] Code cleanup for review --- src/cascadia/TerminalApp/TerminalPage.cpp | 45 +++++++++++++---------- src/cascadia/TerminalApp/TerminalPage.h | 2 + src/cascadia/WindowsTerminal/AppHost.cpp | 4 +- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp index 3009d4ad087..92760d241ec 100644 --- a/src/cascadia/TerminalApp/TerminalPage.cpp +++ b/src/cascadia/TerminalApp/TerminalPage.cpp @@ -192,16 +192,8 @@ namespace winrt::TerminalApp::implementation if (_appArgs.GetStartupActions().empty()) { _OpenNewTab(nullptr); - if (_settings->GlobalSettings().GetLaunchMode() == winrt::TerminalApp::LaunchMode::FullscreenMode) - { - // if (_tabs.Size() == 1) - // { - // _UpdatedSelectedTab(0); - // } - _ToggleFullscreen(); - } - _startupState = StartupState::Initialized; - _InitializedHandlers(*this, nullptr); + + _CompleteInitialization(); } else { @@ -235,17 +227,30 @@ namespace winrt::TerminalApp::implementation _actionDispatch->DoAction(action); } - if (_settings->GlobalSettings().GetLaunchMode() == winrt::TerminalApp::LaunchMode::FullscreenMode) - { - // if (_tabs.Size() == 1) - // { - // _UpdatedSelectedTab(0); - // } - _ToggleFullscreen(); - } - _startupState = StartupState::Initialized; - _InitializedHandlers(*this, nullptr); + _CompleteInitialization(); + } + } + + // Method Description: + // - Perform and steps that need to be done once our initial state is all + // set up. This includes entering fullscreen mode and firing our + // Initialized event. + // Arguments: + // - + // Return Value: + // - + void TerminalPage::_CompleteInitialization() + { + // GH#288 - When we finish initialization, if the user wanted us + // launched _fullscreen_, toggle fullscreen mode. This will make sure + // that the window size is _first_ set up as something sensible, so + // leaving fullscreen returns to a reasonable size. + if (_settings->GlobalSettings().GetLaunchMode() == winrt::TerminalApp::LaunchMode::FullscreenMode) + { + _ToggleFullscreen(); } + _startupState = StartupState::Initialized; + _InitializedHandlers(*this, nullptr); } // Method Description: diff --git a/src/cascadia/TerminalApp/TerminalPage.h b/src/cascadia/TerminalApp/TerminalPage.h index 2f6523a6672..f03a5d639c2 100644 --- a/src/cascadia/TerminalApp/TerminalPage.h +++ b/src/cascadia/TerminalApp/TerminalPage.h @@ -173,6 +173,8 @@ namespace winrt::TerminalApp::implementation void _SetNewTabButtonColor(const Windows::UI::Color& color, const Windows::UI::Color& accentColor); void _ClearNewTabButtonColor(); + void _CompleteInitialization(); + #pragma region ActionHandlers // These are all defined in AppActionHandlers.cpp void _HandleOpenNewTabDropdown(const IInspectable& sender, const TerminalApp::ActionEventArgs& args); diff --git a/src/cascadia/WindowsTerminal/AppHost.cpp b/src/cascadia/WindowsTerminal/AppHost.cpp index 3d9b9c0bc01..4ed62bf66ba 100644 --- a/src/cascadia/WindowsTerminal/AppHost.cpp +++ b/src/cascadia/WindowsTerminal/AppHost.cpp @@ -239,8 +239,7 @@ void AppHost::_HandleCreateWindow(const HWND hwnd, RECT proposedRect, winrt::Ter long adjustedHeight = 0; long adjustedWidth = 0; - // if (launchMode == winrt::TerminalApp::LaunchMode::DefaultMode) - // { + // Find nearest monitor. HMONITOR hmon = MonitorFromRect(&proposedRect, MONITOR_DEFAULTTONEAREST); @@ -293,7 +292,6 @@ void AppHost::_HandleCreateWindow(const HWND hwnd, RECT proposedRect, winrt::Ter const auto nonClientSize = _window->GetTotalNonClientExclusiveSize(dpix); adjustedWidth = islandWidth + nonClientSize.cx; adjustedHeight = islandHeight + nonClientSize.cy; - // } const COORD origin{ gsl::narrow(proposedRect.left), gsl::narrow(proposedRect.top) }; From ac08b7c95486747437d1ba1d43ade737d025013c Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Wed, 20 May 2020 14:55:35 -0500 Subject: [PATCH 4/6] remove dead code --- src/cascadia/TerminalApp/TerminalPage.cpp | 5 - .../TerminalApp/lib/TerminalAppLib.vcxproj | 12 +-- .../TerminalConnection.vcxproj | 6 +- .../TerminalControl/TerminalControl.vcxproj | 13 +-- src/cascadia/WindowsTerminal/IslandWindow.cpp | 5 - .../WindowsTerminal/NonClientIslandWindow.cpp | 2 - .../WindowsTerminalUniversal.vcxproj | 4 +- .../WindowsTerminalUniversal.vcxproj.filters | 102 ++++++++++++++++-- src/dep/fmt/fmt.vcxproj | 18 +++- 9 files changed, 123 insertions(+), 44 deletions(-) diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp index 92760d241ec..33e58aeb73c 100644 --- a/src/cascadia/TerminalApp/TerminalPage.cpp +++ b/src/cascadia/TerminalApp/TerminalPage.cpp @@ -130,11 +130,6 @@ namespace winrt::TerminalApp::implementation _setTitleBarContentHandlers(*this, _tabRow); } - // if (_settings->GlobalSettings().GetLaunchMode() == winrt::TerminalApp::LaunchMode::FullscreenMode) - // { - // _isFullscreen = true; - // } - // Hookup our event handlers to the ShortcutActionDispatch _RegisterActionCallbacks(); diff --git a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj index f8495996f85..bb0bc14476b 100644 --- a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj +++ b/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj @@ -27,7 +27,6 @@ - - @@ -287,6 +284,9 @@ false + + + @@ -301,7 +301,6 @@ - @@ -311,7 +310,6 @@ - @@ -80,6 +79,9 @@ {58a03bb2-df5a-4b66-91a0-7ef3ba01269a} + + + @@ -95,4 +97,4 @@ - + \ No newline at end of file diff --git a/src/cascadia/TerminalControl/TerminalControl.vcxproj b/src/cascadia/TerminalControl/TerminalControl.vcxproj index 1a664a08983..c182709bf77 100644 --- a/src/cascadia/TerminalControl/TerminalControl.vcxproj +++ b/src/cascadia/TerminalControl/TerminalControl.vcxproj @@ -19,7 +19,6 @@ projects compile properly when they depend on this "Microsoft.winmd." --> 3 - @@ -122,9 +116,10 @@ Designer - + + + - dwrite.lib;dxgi.lib;d2d1.lib;d3d11.lib;shcore.lib;winmm.lib;pathcch.lib;propsys.lib;uiautomationcore.lib;Shlwapi.lib;ntdll.lib;user32.lib;kernel32.lib;%(AdditionalDependencies) @@ -133,4 +128,4 @@ $(OpenConsoleDir)src\cascadia\inc;$(OpenConsoleDir)src\types\inc;%(AdditionalIncludeDirectories) - + \ No newline at end of file diff --git a/src/cascadia/WindowsTerminal/IslandWindow.cpp b/src/cascadia/WindowsTerminal/IslandWindow.cpp index 03d5ba48080..add8ac56898 100644 --- a/src/cascadia/WindowsTerminal/IslandWindow.cpp +++ b/src/cascadia/WindowsTerminal/IslandWindow.cpp @@ -145,11 +145,6 @@ void IslandWindow::_HandleCreateWindow(const WPARAM, const LPARAM lParam) noexce ShowWindow(_window.get(), nCmdShow); UpdateWindow(_window.get()); - - // if (launchMode == winrt::TerminalApp::LaunchMode::FullscreenMode) - // { - // _SetIsFullscreen(true); - // } } // Method Description: diff --git a/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp b/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp index 1505c487e1e..cea3d07d387 100644 --- a/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp +++ b/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp @@ -210,8 +210,6 @@ void NonClientIslandWindow::Initialize() // then make sure to update it's visual state to reflect if we're in the // maximized state on launch. _titlebar.Loaded([this](auto&&, auto&&) { _OnMaximizeChange(); }); - - // _titlebar.Visibility(!_fullscreen ? Visibility::Visible : Visibility::Collapsed); } // Method Description: diff --git a/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj b/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj index d13f5b45468..9b49edd91bf 100644 --- a/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj +++ b/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj @@ -123,7 +123,7 @@ - + @@ -173,4 +173,4 @@ - + \ No newline at end of file diff --git a/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj.filters b/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj.filters index eacb86e8288..a531d3853ce 100644 --- a/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj.filters +++ b/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj.filters @@ -13,6 +13,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -20,15 +110,9 @@ - - Resources - - - Resources - - - Resources - + + + diff --git a/src/dep/fmt/fmt.vcxproj b/src/dep/fmt/fmt.vcxproj index 749b755b658..d60af82d693 100644 --- a/src/dep/fmt/fmt.vcxproj +++ b/src/dep/fmt/fmt.vcxproj @@ -16,11 +16,23 @@ - + + - + + + + + + + + + + + + - + \ No newline at end of file From 6329bd6923b5e35db8b1d015d0fa70da9a614b68 Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Wed, 20 May 2020 14:56:17 -0500 Subject: [PATCH 5/6] Revert "Make sure to update the maximize button's visual state on launch" This reverts commit 46e51966467b8fa345f6d59f4270f269294482d9. --- src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp b/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp index cea3d07d387..2877d04477a 100644 --- a/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp +++ b/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp @@ -205,11 +205,6 @@ void NonClientIslandWindow::Initialize() _rootGrid.Children().Append(_titlebar); Controls::Grid::SetRow(_titlebar, 0); - - // GH#3440 - When the titlebar is loaded (officially added to our UI tree), - // then make sure to update it's visual state to reflect if we're in the - // maximized state on launch. - _titlebar.Loaded([this](auto&&, auto&&) { _OnMaximizeChange(); }); } // Method Description: From 9aa4c1aeabc70690553f681baccf4779495c81a0 Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Thu, 21 May 2020 16:19:35 -0500 Subject: [PATCH 6/6] fix up the vcxproj files --- .../TerminalApp/lib/TerminalAppLib.vcxproj | 12 ++- .../TerminalConnection.vcxproj | 6 +- .../TerminalControl/TerminalControl.vcxproj | 13 ++- .../WindowsTerminalUniversal.vcxproj | 4 +- .../WindowsTerminalUniversal.vcxproj.filters | 102 ++---------------- src/dep/fmt/fmt.vcxproj | 18 +--- 6 files changed, 32 insertions(+), 123 deletions(-) diff --git a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj index bb0bc14476b..f8495996f85 100644 --- a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj +++ b/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj @@ -27,6 +27,7 @@ + + @@ -284,9 +287,6 @@ false - - - @@ -301,6 +301,7 @@ + @@ -310,6 +311,7 @@ + @@ -79,9 +80,6 @@ {58a03bb2-df5a-4b66-91a0-7ef3ba01269a} - - - @@ -97,4 +95,4 @@ - \ No newline at end of file + diff --git a/src/cascadia/TerminalControl/TerminalControl.vcxproj b/src/cascadia/TerminalControl/TerminalControl.vcxproj index c182709bf77..1a664a08983 100644 --- a/src/cascadia/TerminalControl/TerminalControl.vcxproj +++ b/src/cascadia/TerminalControl/TerminalControl.vcxproj @@ -19,6 +19,7 @@ projects compile properly when they depend on this "Microsoft.winmd." --> 3 + @@ -116,10 +122,9 @@ Designer - - - + + dwrite.lib;dxgi.lib;d2d1.lib;d3d11.lib;shcore.lib;winmm.lib;pathcch.lib;propsys.lib;uiautomationcore.lib;Shlwapi.lib;ntdll.lib;user32.lib;kernel32.lib;%(AdditionalDependencies) @@ -128,4 +133,4 @@ $(OpenConsoleDir)src\cascadia\inc;$(OpenConsoleDir)src\types\inc;%(AdditionalIncludeDirectories) - \ No newline at end of file + diff --git a/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj b/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj index 9b49edd91bf..d13f5b45468 100644 --- a/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj +++ b/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj @@ -123,7 +123,7 @@ - + @@ -173,4 +173,4 @@ - \ No newline at end of file + diff --git a/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj.filters b/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj.filters index a531d3853ce..eacb86e8288 100644 --- a/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj.filters +++ b/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj.filters @@ -13,96 +13,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -110,9 +20,15 @@ - - - + + Resources + + + Resources + + + Resources + diff --git a/src/dep/fmt/fmt.vcxproj b/src/dep/fmt/fmt.vcxproj index d60af82d693..749b755b658 100644 --- a/src/dep/fmt/fmt.vcxproj +++ b/src/dep/fmt/fmt.vcxproj @@ -16,23 +16,11 @@ - - + - - - - - - - - - - - - + - \ No newline at end of file +