beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 08:41:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Settings: Make sure settings are listed in alphabetical order

Browse source 
DirectoryIterator, and so `Desktop::AppFile::for_each()`, doesn't
guarantee anything about the order, so we manually sort afterwards.
Which means using a manual version of NonnullRefPtrVector, since that
doesn't support `quick_sort()`.
This commit is contained in:
Sam Atkins 2021-11-25 17:00:16 +00:00 committed by Andreas Kling
parent 705b7fc407
commit 377a984905
Notes: sideshowbarker 2024-07-18 00:39:00 +09:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/SerenityOS/serenity/commit/377a984905e
Pull-request: https://github.com/SerenityOS/serenity/pull/11072
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Userland/Applications/Settings/main.cpp
View file

@ -4,6 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <AK/QuickSort.h>
#include <LibCore/Process.h>
#include <LibDesktop/AppFile.h>
#include <LibGUI/Application.h>
@ -27,6 +28,7 @@ public:
return;
m_apps.append(app_file);
});
quick_sort(m_apps, [](auto& a, auto& b) { return a->name() < b->name(); });
}
virtual int row_count(GUI::ModelIndex const&) const override { return m_apps.size(); }
virtual int column_count(GUI::ModelIndex const&) const override { return 1; }
@ -42,25 +44,26 @@ public:
{
auto& app = m_apps[index.row()];
if (role == GUI::ModelRole::Icon) {
return app.icon();
return app->icon();
}
if (role == GUI::ModelRole::Display) {
String name;
if (app.name().ends_with(" Settings"sv)) {
name = app.name().substring(0, app.name().length() - " Settings"sv.length());
if (app->name().ends_with(" Settings"sv)) {
name = app->name().substring(0, app->name().length() - " Settings"sv.length());
} else {
name = app.name();
name = app->name();
}
return name;
}
if (role == GUI::ModelRole::Custom) {
return app.executable();
return app->executable();
}
return {};
}
private:
NonnullRefPtrVector<Desktop::AppFile> m_apps;
// NonnullRefPtrVector doesn't allow us to quick_sort() it, because its operator[] returns T&.
Vector<NonnullRefPtr<Desktop::AppFile>> m_apps;
};
int main(int argc, char** argv)
@ -118,8 +121,8 @@ int main(int argc, char** argv)
return;
}
auto& app = *(Desktop::AppFile*)index.internal_data();
statusbar.set_text(app.description());
auto& app = *(NonnullRefPtr<Desktop::AppFile>*)index.internal_data();
statusbar.set_text(app->description());
};
window->set_icon(app_icon.bitmap_for_size(16));