maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

weird, TME_LEAVE | TME_NONCLIENT was actually vital to doing this right. Just TME_LEAVE did not work, it would send the leave when really it should have been sending hovers

Browse source
This commit is contained in:
Mike Griese 2021-11-03 11:28:21 -05:00
parent d32fac4d3f
commit deb494f6ef
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp
View file

@ -160,6 +160,19 @@ LRESULT NonClientIslandWindow::_InputSinkMessageHandler(UINT const message, WPAR
_titlebar.ReleaseButton(winrt::TerminalApp::CaptionButton::Close);
}
if (!_trackingMouse && (wparam == HTMINBUTTON ||
wparam == HTMAXBUTTON ||
wparam == HTCLOSE))
{
_trackingMouse = true;
TRACKMOUSEEVENT ev{};
ev.cbSize = sizeof(TRACKMOUSEEVENT);
ev.dwFlags = TME_LEAVE | TME_NONCLIENT;
ev.hwndTrack = _dragBarWindow.get();
ev.dwHoverTime = HOVER_DEFAULT; // we don't _really_ care about this.
LOG_IF_WIN32_BOOL_FALSE(TrackMouseEvent(&ev));
}
// if (wparam == HTMAXBUTTON)
// {
// _titlebar.HoverButton(winrt::TerminalApp::CaptionButton::Maximize);
@ -178,6 +191,7 @@ LRESULT NonClientIslandWindow::_InputSinkMessageHandler(UINT const message, WPAR
// _titlebar.ReleaseButton(winrt::TerminalApp::CaptionButton::Minimize);
// _titlebar.ReleaseButton(winrt::TerminalApp::CaptionButton::Maximize);
_titlebar.ReleaseButton(winrt::TerminalApp::CaptionButton::Close);
_trackingMouse = false;
break;
// NB: *Shouldn't be forwarding these* when they're not over the caption because they can inadvertently take action using the system's default metrics instead of our own.
@ -867,10 +881,10 @@ void NonClientIslandWindow::_UpdateFrameMargins() const noexcept
return _OnNcHitTest({ GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) });
case WM_PAINT:
return _OnPaint();
case WM_NCMOUSELEAVE:
case WM_MOUSELEAVE:
_titlebar.ReleaseButton(winrt::TerminalApp::CaptionButton::Close);
break;
// case WM_NCMOUSELEAVE:
// case WM_MOUSELEAVE:
// _titlebar.ReleaseButton(winrt::TerminalApp::CaptionButton::Close);
// break;
case WM_NCRBUTTONUP:
// The `DefWindowProc` function doesn't open the system menu for some
// reason so we have to do it ourselves.

1
src/cascadia/WindowsTerminal/NonClientIslandWindow.h
View file

@ -62,6 +62,7 @@ private:
winrt::Windows::UI::Xaml::ElementTheme _theme;
bool _isMaximized;
bool _trackingMouse{ false };
[[nodiscard]] static LRESULT __stdcall _StaticInputSinkWndProc(HWND const window, UINT const message, WPARAM const wparam, LPARAM const lparam) noexcept;
[[nodiscard]] LRESULT _InputSinkMessageHandler(UINT const message, WPARAM const wparam, LPARAM const lparam) noexcept;