mirrors/Magpie
2
0
Fork 0
mirror of https://github.com/Blinue/Magpie.git synced 2026-06-24 02:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: 简化快捷键控件逻辑

Browse source
This commit is contained in:
刘旭 2023-02-13 22:08:34 +08:00
commit 2be5b337fc
20 changed files with 162 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/Magpie.App/KeyVisual.cpp
View file

@ -4,19 +4,19 @@
#include "KeyVisual.g.cpp"
#endif
#include "StrUtils.h"
#include "Win32Utils.h"
using namespace winrt;
using namespace Windows::UI::Xaml::Controls;
using namespace Windows::UI::Xaml::Markup;
namespace winrt::Magpie::App::implementation {
const DependencyProperty KeyVisual::ContentProperty = DependencyProperty::Register(
L"Content",
xaml_typename<IInspectable>(),
xaml_typename<Magpie::App::KeyVisual>(),
PropertyMetadata(box_value(L""), &KeyVisual::_OnPropertyChanged)
PropertyMetadata(nullptr, &KeyVisual::_OnPropertyChanged)
);
const DependencyProperty KeyVisual::VisualTypeProperty = DependencyProperty::Register(
@ -98,32 +98,31 @@ void KeyVisual::_Update() {
if (!content) {
return;
}
if (content.as<IPropertyValue>().Type() == PropertyType::String) {
Style(_GetStyleSize(L"TextKeyVisualStyle"));
_keyPresenter.Content(content);
return;
}
Style(_GetStyleSize(L"IconKeyVisualStyle"));
assert(content.as<IPropertyValue>().Type() == PropertyType::Int32);
int key = content.as<int>();
switch (key) {
case VK_UP:
Style(_GetStyleSize(L"IconKeyVisualStyle"));
_keyPresenter.Content(box_value(L"\uE96D"));
break;
case VK_DOWN:
Style(_GetStyleSize(L"IconKeyVisualStyle"));
_keyPresenter.Content(box_value(L"\uE96E"));
break;
case VK_LEFT:
Style(_GetStyleSize(L"IconKeyVisualStyle"));
_keyPresenter.Content(box_value(L"\uE96F"));
break;
case VK_RIGHT:
Style(_GetStyleSize(L"IconKeyVisualStyle"));
_keyPresenter.Content(box_value(L"\uE970"));
break;
case VK_LWIN:
case VK_RWIN:
{
Style(_GetStyleSize(L"IconKeyVisualStyle"));
PathIcon winIcon = XamlReader::Load(LR"(<PathIcon xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Data="M9,17V9h8v8ZM0,17V9H8v8ZM9,8V0h8V8ZM0,8V0H8V8Z" />)").as<PathIcon>();
Viewbox winIconContainer;
winIconContainer.Child(winIcon);
@ -136,8 +135,22 @@ void KeyVisual::_Update() {
_keyPresenter.Content(winIconContainer);
break;
}
default: _keyPresenter.Content(box_value(L"")); break;
case VK_LCONTROL:
Style(_GetStyleSize(L"TextKeyVisualStyle"));
_keyPresenter.Content(box_value(L"Ctrl"));
break;
case VK_LMENU:
Style(_GetStyleSize(L"TextKeyVisualStyle"));
_keyPresenter.Content(box_value(L"Alt"));
break;
case VK_LSHIFT:
Style(_GetStyleSize(L"TextKeyVisualStyle"));
_keyPresenter.Content(box_value(L"Shift"));
break;
default:
Style(_GetStyleSize(L"TextKeyVisualStyle"));
_keyPresenter.Content(box_value(Win32Utils::GetKeyName(key)));
break;
}
}