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

Sorta adds a delay. A little janky

Browse source
This commit is contained in:
Mike Griese 2021-11-03 15:34:31 -05:00
parent 0fa10cd3ef
commit 21ba58ca29
3 changed files with 46 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,11 +15,40 @@
using namespace winrt::Windows::UI::Xaml;
// TODO! this should be a system constant
constexpr const auto ToolTipInterval = std::chrono::milliseconds(400);
namespace winrt::TerminalApp::implementation
{
void _openToolTipForButton(const Controls::Button& button, const bool isOpen)
{
if (auto tt{ Controls::ToolTipService::GetToolTip(button) })
{
if (auto tooltip{ tt.try_as<Controls::ToolTip>() })
{
tooltip.IsOpen(isOpen);
}
}
}
MinMaxCloseControl::MinMaxCloseControl()
{
// Get our dispatcher. This will get us the same dispatcher as
// Dispatcher(), but it's a DispatcherQueue, so we can use it with
// ThrottledFunc
auto dispatcher = winrt::Windows::System::DispatcherQueue::GetForCurrentThread();
InitializeComponent();
_displayMinimizeTooltip = std::make_shared<ThrottledFunc<false>>(
dispatcher,
ToolTipInterval,
[weakThis = get_weak()]() {
if (auto self{ weakThis.get() })
{
_openToolTipForButton(self->MinimizeButton(), true);
}
});
}
// These event handlers simply forward each buttons click events up to the
@ -96,17 +125,6 @@ namespace winrt::TerminalApp::implementation
}
}
void _openToolTipForButton(const Controls::Button& button, const bool isOpen)
{
if (auto tt{ Controls::ToolTipService::GetToolTip(button) })
{
if (auto tooltip{ tt.try_as<Controls::ToolTip>() })
{
tooltip.IsOpen(isOpen);
}
}
}
void MinMaxCloseControl::HoverButton(CaptionButton button)
{
switch (button)
@ -115,7 +133,8 @@ namespace winrt::TerminalApp::implementation
VisualStateManager::GoToState(MinimizeButton(), L"PointerOver", false);
VisualStateManager::GoToState(MaximizeButton(), L"Normal", false);
VisualStateManager::GoToState(CloseButton(), L"Normal", false);
_openToolTipForButton(MinimizeButton(), true);
// _openToolTipForButton(MinimizeButton(), true);
_displayMinimizeTooltip->Run();
_openToolTipForButton(MaximizeButton(), false);
_openToolTipForButton(CloseButton(), false);
break;
@ -124,6 +143,7 @@ namespace winrt::TerminalApp::implementation
VisualStateManager::GoToState(MaximizeButton(), L"PointerOver", false);
VisualStateManager::GoToState(CloseButton(), L"Normal", false);
_openToolTipForButton(MinimizeButton(), false);
_displayMinimizeTooltip->Dismiss();
_openToolTipForButton(MaximizeButton(), true);
_openToolTipForButton(CloseButton(), false);
break;
@ -132,6 +152,7 @@ namespace winrt::TerminalApp::implementation
VisualStateManager::GoToState(MaximizeButton(), L"Normal", false);
VisualStateManager::GoToState(CloseButton(), L"PointerOver", false);
_openToolTipForButton(MinimizeButton(), false);
_displayMinimizeTooltip->Dismiss();
_openToolTipForButton(MaximizeButton(), false);
_openToolTipForButton(CloseButton(), true);
break;
@ -166,6 +187,7 @@ namespace winrt::TerminalApp::implementation
VisualStateManager::GoToState(MaximizeButton(), L"Normal", false);
VisualStateManager::GoToState(CloseButton(), L"Normal", false);
_openToolTipForButton(MinimizeButton(), false);
_displayMinimizeTooltip->Dismiss();
_openToolTipForButton(MaximizeButton(), false);
_openToolTipForButton(CloseButton(), false);
}

6
src/cascadia/TerminalApp/MinMaxCloseControl.h
View file

@ -6,11 +6,9 @@
#pragma once
#include "winrt/Windows.UI.Xaml.h"
#include "winrt/Windows.UI.Xaml.Markup.h"
#include "winrt/Windows.UI.Xaml.Interop.h"
#include "MinMaxCloseControl.g.h"
#include "../../cascadia/inc/cppwinrt_utils.h"
#include <ThrottledFunc.h>
namespace winrt::TerminalApp::implementation
{
@ -34,6 +32,8 @@ namespace winrt::TerminalApp::implementation
TYPED_EVENT(MinimizeClick, TerminalApp::MinMaxCloseControl, winrt::Windows::UI::Xaml::RoutedEventArgs);
TYPED_EVENT(MaximizeClick, TerminalApp::MinMaxCloseControl, winrt::Windows::UI::Xaml::RoutedEventArgs);
TYPED_EVENT(CloseClick, TerminalApp::MinMaxCloseControl, winrt::Windows::UI::Xaml::RoutedEventArgs);
std::shared_ptr<ThrottledFunc<false>> _displayMinimizeTooltip{ nullptr };
};
}

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

@ -71,6 +71,15 @@ 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
{