Enable dragging with the entire titlebar

src/cascadia/TerminalApp/App.cpp

@@ -61,26 +61,13 @@ namespace winrt::TerminalApp::implementation
  // - <none>
  // Return Value:
  // - <none>
- void App::Create(uint64_t hWnd)
+ void App::Create()
  {
  // Assert that we've already loaded our settings. We have to do
  // this as a MTA, before the app is Create()'d
  WINRT_ASSERT(_loadedInitialSettings);
  TraceLoggingRegister(g_hTerminalAppProvider);
- _Create(hWnd);
- }
-
- App::~App()
- {
- TraceLoggingUnregister(g_hTerminalAppProvider);
- }
 
- // Method Description:
- // - Create all of the initial UI elements of the Terminal app.
- // * Initializes the first terminal control, using the default profile,
- // and adds it to our list of tabs.
- void App::_Create(uint64_t parentHwnd)
- {
  /* !!! TODO
  This is not the correct way to host a XAML page. This exists today because we valued
  getting a .xaml over tearing out all of the terminal logic and splitting it across App
@@ -92,15 +79,21 @@ namespace winrt::TerminalApp::implementation
  _root = terminalPage.as<winrt::Windows::UI::Xaml::Controls::Control>();
  _tabContent = terminalPage->TabContent();
  _tabRow = terminalPage->TabRow();
- _tabView = terminalPage->TabView();
- _newTabButton = terminalPage->NewTabButton();
-
- _minMaxCloseControl = terminalPage->MinMaxCloseControl();
- _minMaxCloseControl.ParentWindowHandle(parentHwnd);
+ _tabView = _tabRow.TabView();
+ _newTabButton = _tabRow.NewTabButton();
 
- if (!_settings->GlobalSettings().GetShowTabsInTitlebar())
+ if (_settings->GlobalSettings().GetShowTabsInTitlebar())
  {
- _minMaxCloseControl.Visibility(Visibility::Collapsed);
+ // Remove the TabView from the page. We'll hang on to it, we need to
+ // put it in the titlebar.
+ uint32_t index = 0;
+ if (terminalPage->Root().Children().IndexOf(_tabRow, index))
+ {
+ terminalPage->Root().Children().RemoveAt(index);
+ }
+
+ // Inform the host that our titlebar content has changed.
+ _setTitleBarContentHandlers(*this, _tabRow);
  }
 
  // Event Bindings (Early)
@@ -118,6 +111,14 @@ namespace winrt::TerminalApp::implementation
  _tabContent.SizeChanged({ this, &App::_OnContentSizeChanged });
  }
 
+ App::~App()
+ {
+ if (g_hTerminalAppProvider)
+ {
+ TraceLoggingUnregister(g_hTerminalAppProvider);
+ }
+ }
+
  // Method Description:
  // - Show a ContentDialog with a single button to dismiss. Uses the
  // FrameworkElements provided as the title and content of this dialog, and
@@ -456,16 +457,6 @@ namespace winrt::TerminalApp::implementation
  winrt::Windows::System::Launcher::LaunchUriAsync({ feedbackUriValue });
  }
 
- Windows::UI::Xaml::Controls::Border App::GetDragBar() noexcept
- {
- if (_minMaxCloseControl)
- {
- return _minMaxCloseControl.DragBar();
- }
-
- return nullptr;
- }
-
  // Method Description:
  // - Called when the about button is clicked. See _ShowAboutDialog for more info.
  // Arguments:
@@ -741,13 +732,16 @@ namespace winrt::TerminalApp::implementation
  }
 
  // Method Description:
- // - Update the current theme of the application. This will manually update
- // all of the elements in our UI to match the given theme.
+ // - Update the current theme of the application. This will trigger our
+ // RequestedThemeChanged event, to have our host change the theme of the
+ // root of the application.
  // Arguments:
  // - newTheme: The ElementTheme to apply to our elements.
  void App::_ApplyTheme(const Windows::UI::Xaml::ElementTheme& newTheme)
  {
  _root.RequestedTheme(newTheme);
+ // Propagate the event to the host layer, so it can update its own UI
+ _requestedThemeChangedHandlers(*this, newTheme);
  }
 
  UIElement App::GetRoot() noexcept
@@ -916,7 +910,11 @@ namespace winrt::TerminalApp::implementation
  // Initialize the new tab
 
  // Create a Conhost connection based on the values in our settings object.
- TerminalConnection::ITerminalConnection connection = TerminalConnection::ConhostConnection(settings.Commandline(), settings.StartingDirectory(), 30, 80, winrt::guid());
+ auto connection = TerminalConnection::ConhostConnection(settings.Commandline(),
+ settings.StartingDirectory(),
+ 30,
+ 80,
+ winrt::guid());
 
  TermControl term{ settings, connection };
 
@@ -1303,7 +1301,11 @@ namespace winrt::TerminalApp::implementation
  const auto controlSettings = _settings->MakeSettings(realGuid);
 
  // Create a Conhost connection based on the values in our settings object.
- TerminalConnection::ITerminalConnection controlConnection = TerminalConnection::ConhostConnection(controlSettings.Commandline(), controlSettings.StartingDirectory(), 30, 80, winrt::guid());
+ auto controlConnection = TerminalConnection::ConhostConnection(controlSettings.Commandline(),
+ controlSettings.StartingDirectory(),
+ 30,
+ 80,
+ winrt::guid());
 
  TermControl newControl{ controlSettings, controlConnection };
 
@@ -1404,4 +1406,6 @@ namespace winrt::TerminalApp::implementation
  // These macros will define them both for you.
  DEFINE_EVENT(App, TitleChanged, _titleChangeHandlers, TerminalControl::TitleChangedEventArgs);
  DEFINE_EVENT(App, LastTabClosed, _lastTabClosedHandlers, winrt::TerminalApp::LastTabClosedEventArgs);
+ DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(App, SetTitleBarContent, _setTitleBarContentHandlers, TerminalApp::App, winrt::Windows::UI::Xaml::UIElement);
+ DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(App, RequestedThemeChanged, _requestedThemeChangedHandlers, TerminalApp::App, winrt::Windows::UI::Xaml::ElementTheme);
 }

src/cascadia/TerminalApp/App.h

@@ -27,10 +27,7 @@ namespace winrt::TerminalApp::implementation
 
  Windows::UI::Xaml::UIElement GetRoot() noexcept;
 
- // Gets the current dragglable area in the non client region of the top level window
- Windows::UI::Xaml::Controls::Border GetDragBar() noexcept;
-
- void Create(uint64_t hParentWnd);
+ void Create();
  void LoadSettings();
 
  Windows::Foundation::Point GetLaunchDimensions(uint32_t dpi);
@@ -43,6 +40,8 @@ namespace winrt::TerminalApp::implementation
  // -------------------------------- WinRT Events ---------------------------------
  DECLARE_EVENT(TitleChanged, _titleChangeHandlers, winrt::Microsoft::Terminal::TerminalControl::TitleChangedEventArgs);
  DECLARE_EVENT(LastTabClosed, _lastTabClosedHandlers, winrt::TerminalApp::LastTabClosedEventArgs);
+ DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(SetTitleBarContent, _setTitleBarContentHandlers, TerminalApp::App, winrt::Windows::UI::Xaml::UIElement);
+ DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(RequestedThemeChanged, _requestedThemeChangedHandlers, TerminalApp::App, winrt::Windows::UI::Xaml::ElementTheme);
 
  private:
  // If you add controls here, but forget to null them either here or in
@@ -53,10 +52,9 @@ namespace winrt::TerminalApp::implementation
  // (which is a root when the tabs are in the titlebar.)
  Windows::UI::Xaml::Controls::Control _root{ nullptr };
  Microsoft::UI::Xaml::Controls::TabView _tabView{ nullptr };
- Windows::UI::Xaml::Controls::Grid _tabRow{ nullptr };
+ TerminalApp::TabRowControl _tabRow{ nullptr };
  Windows::UI::Xaml::Controls::Grid _tabContent{ nullptr };
  Windows::UI::Xaml::Controls::SplitButton _newTabButton{ nullptr };
- winrt::TerminalApp::MinMaxCloseControl _minMaxCloseControl{ nullptr };
 
  std::vector<std::shared_ptr<Tab>> _tabs;
 
@@ -71,7 +69,6 @@ namespace winrt::TerminalApp::implementation
 
  std::atomic<bool> _settingsReloadQueued{ false };
 
- void _Create(uint64_t parentHWnd);
  void _CreateNewTabFlyout();
 
  fire_and_forget _ShowDialog(const winrt::Windows::Foundation::IInspectable& titleElement,

src/cascadia/TerminalApp/App.idl

@@ -4,8 +4,7 @@
 namespace TerminalApp
 {
  delegate void LastTabClosedEventArgs();
- [default_interface]
- runtimeclass App : Microsoft.Toolkit.Win32.UI.XamlHost.XamlApplication
+ [default_interface] runtimeclass App : Microsoft.Toolkit.Win32.UI.XamlHost.XamlApplication
  {
  App();
 
@@ -16,18 +15,19 @@ namespace TerminalApp
  // then it might look like TermApp just failed to activate, which will
  // cause you to chase down the rabbit hole of "why is TermApp not
  // registered?" when it definitely is.
- void Create(UInt64 hParentWnd);
+ void Create();
 
  void LoadSettings();
 
  Windows.UI.Xaml.UIElement GetRoot();
- Windows.UI.Xaml.Controls.Border GetDragBar{ get; };
 
  Windows.Foundation.Point GetLaunchDimensions(UInt32 dpi);
  Boolean GetShowTabsInTitlebar();
 
  event Microsoft.Terminal.TerminalControl.TitleChangedEventArgs TitleChanged;
  event LastTabClosedEventArgs LastTabClosed;
+ event Windows.Foundation.TypedEventHandler<App, Windows.UI.Xaml.UIElement> SetTitleBarContent;
+ event Windows.Foundation.TypedEventHandler<App, Windows.UI.Xaml.ElementTheme> RequestedThemeChanged;
 
  String GetTitle();
  }

src/cascadia/TerminalApp/MinMaxCloseControl.cpp

@@ -1,4 +1,6 @@
-//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+//
 // MinMaxCloseControl.xaml.cpp
 // Implementation of the MinMaxCloseControl class
 //
@@ -8,6 +10,7 @@
 #include "MinMaxCloseControl.h"
 
 #include "MinMaxCloseControl.g.cpp"
+using namespace winrt::Windows::UI::Xaml;
 
 namespace winrt::TerminalApp::implementation
 {
@@ -16,59 +19,37 @@ namespace winrt::TerminalApp::implementation
  InitializeComponent();
  }
 
- uint64_t MinMaxCloseControl::ParentWindowHandle() const
+ void MinMaxCloseControl::Maximize()
  {
- return reinterpret_cast<uint64_t>(_window);
+ VisualStateManager::GoToState(MaximizeButton(), L"WindowStateMaximized", false);
  }
 
- void MinMaxCloseControl::ParentWindowHandle(uint64_t handle)
+ void MinMaxCloseControl::RestoreDown()
  {
- _window = reinterpret_cast<HWND>(handle);
+ VisualStateManager::GoToState(MaximizeButton(), L"WindowStateNormal", false);
  }
 
- void MinMaxCloseControl::_OnMaximize(byte flag)
+ // These event handlers simply forward each buttons click events up to the
+ // events we've exposed.
+ void MinMaxCloseControl::_MinimizeClick(winrt::Windows::Foundation::IInspectable const& sender,
+ RoutedEventArgs const& e)
  {
- if (_window)
- {
- POINT point1 = {};
- ::GetCursorPos(&point1);
- const LPARAM lParam = MAKELPARAM(point1.x, point1.y);
- WINDOWPLACEMENT placement = { sizeof(placement) };
- ::GetWindowPlacement(_window, &placement);
- if (placement.showCmd == SW_SHOWNORMAL)
- {
- winrt::Windows::UI::Xaml::VisualStateManager::GoToState(this->Maximize(), L"WindowStateMaximized", false);
- ::PostMessage(_window, WM_SYSCOMMAND, SC_MAXIMIZE | flag, lParam);
- }
- else if (placement.showCmd == SW_SHOWMAXIMIZED)
- {
- winrt::Windows::UI::Xaml::VisualStateManager::GoToState(this->Maximize(), L"WindowStateNormal", false);
- ::PostMessage(_window, WM_SYSCOMMAND, SC_RESTORE | flag, lParam);
- }
- }
+ _minimizeClickHandlers(*this, e);
  }
 
- void MinMaxCloseControl::Maximize_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e)
+ void MinMaxCloseControl::_MaximizeClick(winrt::Windows::Foundation::IInspectable const& sender,
+ RoutedEventArgs const& e)
  {
- _OnMaximize(HTMAXBUTTON);
+ _maximizeClickHandlers(*this, e);
  }
-
- void MinMaxCloseControl::DragBar_DoubleTapped(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::Input::DoubleTappedRoutedEventArgs const& e)
+ void MinMaxCloseControl::_CloseClick(winrt::Windows::Foundation::IInspectable const& sender,
+  RoutedEventArgs const& e)
  {
- _OnMaximize(HTCAPTION);
+ _closeClickHandlers(*this, e);
  }
 
- void MinMaxCloseControl::Minimize_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e)
- {
- if (_window)
- {
- ::PostMessage(_window, WM_SYSCOMMAND, SC_MINIMIZE | HTMINBUTTON, 0);
- }
- }
-
- void MinMaxCloseControl::Close_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e)
- {
- ::PostQuitMessage(0);
- }
+ DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(MinMaxCloseControl, MinimizeClick, _minimizeClickHandlers, TerminalApp::MinMaxCloseControl, RoutedEventArgs);
+ DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(MinMaxCloseControl, MaximizeClick, _maximizeClickHandlers, TerminalApp::MinMaxCloseControl, RoutedEventArgs);
+ DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(MinMaxCloseControl, CloseClick, _closeClickHandlers, TerminalApp::MinMaxCloseControl, RoutedEventArgs);
 
 }

src/cascadia/TerminalApp/MinMaxCloseControl.h

@@ -1,4 +1,6 @@
-//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+//
 // Declaration of the MainUserControl class.
 //
 
@@ -8,24 +10,27 @@
 #include "winrt/Windows.UI.Xaml.Markup.h"
 #include "winrt/Windows.UI.Xaml.Interop.h"
 #include "MinMaxCloseControl.g.h"
+#include "../../cascadia/inc/cppwinrt_utils.h"
 
 namespace winrt::TerminalApp::implementation
 {
  struct MinMaxCloseControl : MinMaxCloseControlT<MinMaxCloseControl>
  {
  MinMaxCloseControl();
 
- void Minimize_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
- void Maximize_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
- void Close_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
- void DragBar_DoubleTapped(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::Input::DoubleTappedRoutedEventArgs const& e);
+ void Maximize();
+ void RestoreDown();
 
- uint64_t ParentWindowHandle() const;
- void ParentWindowHandle(uint64_t handle);
+ void _MinimizeClick(winrt::Windows::Foundation::IInspectable const& sender,
+ winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
+ void _MaximizeClick(winrt::Windows::Foundation::IInspectable const& sender,
+ winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
+ void _CloseClick(winrt::Windows::Foundation::IInspectable const& sender,
+ winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
 
- private:
- void _OnMaximize(byte flag);
- HWND _window{ nullptr }; // non-owning handle; should not be freed in the dtor.
+  DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(MinimizeClick, _minimizeClickHandlers, TerminalApp::MinMaxCloseControl, winrt::Windows::UI::Xaml::RoutedEventArgs);
+ DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(MaximizeClick, _maximizeClickHandlers, TerminalApp::MinMaxCloseControl, winrt::Windows::UI::Xaml::RoutedEventArgs);
+ DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(CloseClick, _closeClickHandlers, TerminalApp::MinMaxCloseControl, winrt::Windows::UI::Xaml::RoutedEventArgs);
  };
 }
 

src/cascadia/TerminalApp/MinMaxCloseControl.idl

@@ -1,13 +1,17 @@
-namespace TerminalApp
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace TerminalApp
 {
- [default_interface]
- runtimeclass MinMaxCloseControl : Windows.UI.Xaml.Controls.StackPanel
+ [default_interface] runtimeclass MinMaxCloseControl : Windows.UI.Xaml.Controls.StackPanel
  {
  MinMaxCloseControl();
 
- Windows.UI.Xaml.Controls.Grid Content{ get; };
- Windows.UI.Xaml.Controls.Border DragBar{ get; };
+ void Maximize();
+ void RestoreDown();
 
- UInt64 ParentWindowHandle;
+ event Windows.Foundation.TypedEventHandler<MinMaxCloseControl, Windows.UI.Xaml.RoutedEventArgs> MinimizeClick;
+ event Windows.Foundation.TypedEventHandler<MinMaxCloseControl, Windows.UI.Xaml.RoutedEventArgs> MaximizeClick;
+ event Windows.Foundation.TypedEventHandler<MinMaxCloseControl, Windows.UI.Xaml.RoutedEventArgs> CloseClick;
  }
 }