RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 13:57:35 +00:00
Code Issues Activity Actions

WindowServer: Sort the system menu app categories alphabetically

Browse source
This commit is contained in:
Andreas Kling 2019-11-11 13:01:04 +01:00
parent 2fcf156540
commit 9f537d0b95
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Servers/WindowServer/WSWindowManager.cpp
View file

@ -7,6 +7,7 @@
#include "WSScreen.h" #include "WSScreen.h"
#include "WSWindow.h" #include "WSWindow.h"
#include <AK/LogStream.h> #include <AK/LogStream.h>
#include <AK/QuickSort.h>
#include <AK/StdLibExtras.h> #include <AK/StdLibExtras.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibCore/CDirIterator.h> #include <LibCore/CDirIterator.h>
@ -45,6 +46,7 @@ WSWindowManager::WSWindowManager()
reload_config(false); reload_config(false);
HashTable<String> seen_app_categories;
CDirIterator dt("/res/apps", CDirIterator::SkipDots); CDirIterator dt("/res/apps", CDirIterator::SkipDots);
while (dt.has_next()) { while (dt.has_next()) {
auto af_name = dt.next_path(); auto af_name = dt.next_path();
@ -57,18 +59,23 @@ WSWindowManager::WSWindowManager()
auto app_category = af->read_entry("App", "Category"); auto app_category = af->read_entry("App", "Category");
auto app_icon_path = af->read_entry("Icons", "16x16"); auto app_icon_path = af->read_entry("Icons", "16x16");
m_apps.append({ app_executable, app_name, app_icon_path, app_category }); m_apps.append({ app_executable, app_name, app_icon_path, app_category });
seen_app_categories.set(app_category);
} }
Vector<String> sorted_app_categories;
for (auto& category : seen_app_categories)
sorted_app_categories.append(category);
quick_sort(sorted_app_categories.begin(), sorted_app_categories.end(), [](auto& a, auto& b) { return a < b; });
u8 system_menu_name[] = { 0xc3, 0xb8, 0 }; u8 system_menu_name[] = { 0xc3, 0xb8, 0 };
m_system_menu = WSMenu::construct(nullptr, -1, String((const char*)system_menu_name)); m_system_menu = WSMenu::construct(nullptr, -1, String((const char*)system_menu_name));
// First we construct all the necessary app category submenus. // First we construct all the necessary app category submenus.
for (const auto& app : m_apps) { for (const auto& category : sorted_app_categories) {
if (app.category.is_null())
if (m_app_category_menus.contains(category))
continue; continue;
if (m_app_category_menus.contains(app.category)) auto category_menu = WSMenu::construct(nullptr, 5000 + m_app_category_menus.size(), category);
continue;
auto category_menu = WSMenu::construct(nullptr, 5000 + m_app_category_menus.size(), app.category);
category_menu->on_item_activation = [this](auto& item) { category_menu->on_item_activation = [this](auto& item) {
if (item.identifier() >= 1 && item.identifier() <= 1u + m_apps.size() - 1) { if (item.identifier() >= 1 && item.identifier() <= 1u + m_apps.size() - 1) {
if (fork() == 0) { if (fork() == 0) {
@ -78,10 +85,10 @@ WSWindowManager::WSWindowManager()
} }
} }
}; };
auto item = make<WSMenuItem>(*m_system_menu, -1, app.category); auto item = make<WSMenuItem>(*m_system_menu, -1, category);
item->set_submenu_id(category_menu->menu_id()); item->set_submenu_id(category_menu->menu_id());
m_system_menu->add_item(move(item)); m_system_menu->add_item(move(item));
m_app_category_menus.set(app.category, move(category_menu)); m_app_category_menus.set(category, move(category_menu));
} }
// Then we create and insert all the app menu items into the right place. // Then we create and insert all the app menu items into the right place.