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

notes

Browse source
This commit is contained in:
Mike Griese 2021-11-03 15:49:46 -05:00
parent 21ba58ca29
commit 01aa26c522
2 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/cascadia/TerminalApp/MinMaxCloseControl.cpp
View file

@ -39,16 +39,22 @@ namespace winrt::TerminalApp::implementation
auto dispatcher = winrt::Windows::System::DispatcherQueue::GetForCurrentThread();
InitializeComponent();
auto createOpenToolTipFn = [weakThis = get_weak()](const Controls::Button& button) {
return [weakThis, button]() {
if (auto self{ weakThis.get() })
{
_openToolTipForButton(button, true);
}
};
};
_displayMinimizeTooltip = std::make_shared<ThrottledFunc<false>>(
dispatcher,
ToolTipInterval,
[weakThis = get_weak()]() {
if (auto self{ weakThis.get() })
{
_openToolTipForButton(self->MinimizeButton(), true);
}
});
createOpenToolTipFn(MinimizeButton()));
// TODO! I need to add a sentinel arg to this ThrottledFunc. With two
// values: Open, and Ignore. Open will open the tt, and Ignore will do
// nothing. WHere I'm dismissing below, instead, modifyPending(Ignore),
// so it does nothing on the next run.
}
// These event handlers simply forward each buttons click events up to the
@ -142,8 +148,8 @@ namespace winrt::TerminalApp::implementation
VisualStateManager::GoToState(MinimizeButton(), L"Normal", false);
VisualStateManager::GoToState(MaximizeButton(), L"PointerOver", false);
VisualStateManager::GoToState(CloseButton(), L"Normal", false);
_openToolTipForButton(MinimizeButton(), false);
_displayMinimizeTooltip->Dismiss();
_openToolTipForButton(MinimizeButton(), false);
_openToolTipForButton(MaximizeButton(), true);
_openToolTipForButton(CloseButton(), false);
break;
@ -151,8 +157,8 @@ namespace winrt::TerminalApp::implementation
VisualStateManager::GoToState(MinimizeButton(), L"Normal", false);
VisualStateManager::GoToState(MaximizeButton(), L"Normal", false);
VisualStateManager::GoToState(CloseButton(), L"PointerOver", false);
_openToolTipForButton(MinimizeButton(), false);
_displayMinimizeTooltip->Dismiss();
_openToolTipForButton(MinimizeButton(), false);
_openToolTipForButton(MaximizeButton(), false);
_openToolTipForButton(CloseButton(), true);
break;
@ -183,11 +189,11 @@ namespace winrt::TerminalApp::implementation
void MinMaxCloseControl::ReleaseButtons()
{
_displayMinimizeTooltip->Dismiss();
VisualStateManager::GoToState(MinimizeButton(), L"Normal", false);
VisualStateManager::GoToState(MaximizeButton(), L"Normal", false);
VisualStateManager::GoToState(CloseButton(), L"Normal", false);
_openToolTipForButton(MinimizeButton(), false);
_displayMinimizeTooltip->Dismiss();
_openToolTipForButton(MaximizeButton(), false);
_openToolTipForButton(CloseButton(), false);
}

9
src/cascadia/WinRTUtils/inc/ThrottledFunc.h
View file

@ -71,15 +71,6 @@ public:
_storage.modify_pending(func);
}
// This only really works for Trailing throttled funcs.
//
// Dismiss the currently pending callback, so it won't be called at the end
// of the timeout.
void Dismiss()
{
_storage.reset();
}
private:
static void __stdcall _timer_callback(PTP_CALLBACK_INSTANCE /*instance*/, PVOID context, PTP_TIMER /*timer*/) noexcept
{