RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 11:07:45 +00:00
Code Issues Activity Actions

Taskbar: Add support for hotkeys in menu apps

Browse source
This commit is contained in:
Hugh Davenport 2024-01-04 08:48:44 +13:00 • committed by Andrew Kaster
parent 6ab315ae69
commit 420da686b8
1 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Userland/Services/Taskbar/main.cpp
View file

@ -93,6 +93,30 @@ Vector<Gfx::SystemThemeMetaData> g_themes;
RefPtr<GUI::Menu> g_themes_menu; RefPtr<GUI::Menu> g_themes_menu;
GUI::ActionGroup g_themes_group; GUI::ActionGroup g_themes_group;
static bool less_than_ignore_hotkey(ByteString const& a, ByteString const& b)
{
auto a_it = a.begin(), b_it = b.begin();
while (a_it != a.end() && b_it != b.end()) {
if (*a_it == '&') {
++a_it;
continue;
}
if (*b_it == '&') {
++b_it;
continue;
}
if (*a_it < *b_it) {
return true;
}
if (*a_it > *b_it) {
return false;
}
++a_it;
++b_it;
}
return a_it != a.end();
}
ErrorOr<Vector<ByteString>> discover_apps_and_categories() ErrorOr<Vector<ByteString>> discover_apps_and_categories()
{ {
HashTable<ByteString> seen_app_categories; HashTable<ByteString> seen_app_categories;
@ -110,7 +134,7 @@ ErrorOr<Vector<ByteString>> discover_apps_and_categories()
TRY(sorted_app_categories.try_ensure_capacity(seen_app_categories.size())); TRY(sorted_app_categories.try_ensure_capacity(seen_app_categories.size()));
for (auto const& category : seen_app_categories) for (auto const& category : seen_app_categories)
sorted_app_categories.unchecked_append(category); sorted_app_categories.unchecked_append(category);
quick_sort(sorted_app_categories); quick_sort(sorted_app_categories, less_than_ignore_hotkey);
return sorted_app_categories; return sorted_app_categories;
} }