Mirrors_UI_SDK/GacUI
1
0
Fork 0
mirror of https://github.com/vczh-libraries/Release.git synced 2026-03-23 15:52:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix GlobalHotKey tutorial

Browse Source
This commit is contained in:
vczh
2026-01-31 12:26:25 -08:00
parent a888218a34
commit 3db39d9598
5 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Import/GacUI.Windows.cpp
View File

@@ -13932,7 +13932,16 @@ WindowsInputService
return L"?";
}
GetKeyNameText((int)scanCode, name, sizeof(name)/sizeof(*name));
return name[0]?name:L"?";
if (name[0])
{
WString result = name;
vint index = predefinedKeys.Keys().IndexOf(result);
if (index != -1 && predefinedKeys.Values()[index] == code)
{
return result;
}
}
return WString::Unmanaged(L"?");
}
void WindowsInputService::InitializeKeyNames()
@@ -13952,6 +13961,13 @@ WindowsInputService
,isTimerEnabled(false)
,keyNames((vint)VKEY::KEY_MAXIMUM)
{
#define INITIALIZE_KEY_NAME(NAME, TEXT)\
keyNames[(vint)VKEY::KEY_ ## NAME] = WString::Unmanaged(TEXT);\
if (!predefinedKeys.Keys().Contains(WString::Unmanaged(TEXT))) predefinedKeys.Add(WString::Unmanaged(TEXT), VKEY::KEY_ ## NAME);\
GUI_DEFINE_KEYBOARD_WINDOWS_NAME(INITIALIZE_KEY_NAME)
#undef INITIALIZE_KEY_NAME
InitializeKeyNames();
}

1
Import/GacUI.Windows.h
View File

@@ -2068,6 +2068,7 @@ namespace vl
collections::Array<WString> keyNames;
collections::Dictionary<WString, VKEY> keys;
collections::Dictionary<WString, VKEY> predefinedKeys;
WString GetKeyNameInternal(VKEY code);
void InitializeKeyNames();

18
Import/GacUI.h
View File

@@ -985,15 +985,15 @@ ITEM(F11, L"F11")\
ITEM(F12, L"F12")\
ITEM(NUMLOCK, L"Pause")\
ITEM(SCROLL, L"Scroll Lock")\
ITEM(BROWSER_HOME, L"M")\
ITEM(VOLUME_MUTE, L"D")\
ITEM(VOLUME_DOWN, L"C")\
ITEM(VOLUME_UP, L"B")\
ITEM(MEDIA_NEXT_TRACK, L"P")\
ITEM(MEDIA_PREV_TRACK, L"Q")\
ITEM(MEDIA_STOP, L"J")\
ITEM(MEDIA_PLAY_PAUSE, L"G")\
ITEM(LAUNCH_APP2, L"F")\
ITEM(BROWSER_HOME, L"BROWSER_HOME")\
ITEM(VOLUME_MUTE, L"VOLUME_MUTE")\
ITEM(VOLUME_DOWN, L"VOLUME_DOWN")\
ITEM(VOLUME_UP, L"VOLUME_UP")\
ITEM(MEDIA_NEXT_TRACK, L"MEDIA_NEXT_TRACK")\
ITEM(MEDIA_PREV_TRACK, L"MEDIA_PREV_TRACK")\
ITEM(MEDIA_STOP, L"MEDIA_STOP")\
ITEM(MEDIA_PLAY_PAUSE, L"MEDIA_PLAY_PAUSE")\
ITEM(LAUNCH_APP2, L"LAUNCH_APP2")\
ITEM(OEM_PLUS, L"=")\
ITEM(OEM_COMMA, L",")\
ITEM(OEM_MINUS, L"-")\

3
Tutorial/GacUI_Controls/GlobalHotKey/GlobalHotKey.vcxproj
View File

@@ -155,6 +155,9 @@
<Project>{96c559ca-9718-4bec-a053-28a0ab6a8ca2}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Xml Include="UI\Resource.xml" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

5
Tutorial/GacUI_Controls/GlobalHotKey/GlobalHotKey.vcxproj.filters
View File

@@ -33,4 +33,9 @@
<Filter>UI</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Xml Include="UI\Resource.xml">
<Filter>Resource Files</Filter>
</Xml>
</ItemGroup>
</Project>