RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 15:05:08 +00:00
Code Issues Activity Actions

LibGUI: Sort all the lists in the FontPicker

Browse source 
Fixes #4671.
This commit is contained in:
Andreas Kling 2020-12-31 00:33:50 +01:00
parent a68275914e
commit 3e00e3da72
1 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Libraries/LibGUI/FontPicker.cpp
View file

@ -24,6 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <AK/QuickSort.h>
#include <LibGUI/Button.h> #include <LibGUI/Button.h>
#include <LibGUI/FontPicker.h> #include <LibGUI/FontPicker.h>
#include <LibGUI/FontPickerDialogGML.h> #include <LibGUI/FontPickerDialogGML.h>
@ -58,36 +59,30 @@ FontPicker::FontPicker(Window* parent_window, const Gfx::Font* current_font, boo
m_sample_text_label = static_cast<Label&>(*widget.find_descendant_by_name("sample_text_label")); m_sample_text_label = static_cast<Label&>(*widget.find_descendant_by_name("sample_text_label"));
HashTable<String> families; m_families.clear();
Gfx::FontDatabase::the().for_each_font([&](auto& font) { Gfx::FontDatabase::the().for_each_font([&](auto& font) {
if (m_fixed_width_only && !font.is_fixed_width()) if (m_fixed_width_only && !font.is_fixed_width())
return; return;
families.set(font.family()); if (!m_families.contains_slow(font.family()))
m_families.append(font.family());
}); });
quick_sort(m_families);
for (auto& family : families)
m_families.append(family);
m_family_list_view->set_model(ItemListModel<String>::create(m_families)); m_family_list_view->set_model(ItemListModel<String>::create(m_families));
m_family_list_view->on_selection = [this](auto& index) { m_family_list_view->on_selection = [this](auto& index) {
m_family = index.data().to_string(); m_family = index.data().to_string();
HashTable<int> weights; m_weights.clear();
Gfx::FontDatabase::the().for_each_font([&](auto& font) { Gfx::FontDatabase::the().for_each_font([&](auto& font) {
if (m_fixed_width_only && !font.is_fixed_width()) if (m_fixed_width_only && !font.is_fixed_width())
return; return;
if (font.family() == m_family.value()) if (font.family() == m_family.value() && !m_weights.contains_slow(font.weight())) {
weights.set(font.weight()); m_weights.append(font.weight());
}
}); });
m_weights.clear(); quick_sort(m_weights);
Optional<size_t> index_of_old_weight_in_new_list; Optional<size_t> index_of_old_weight_in_new_list;
size_t i = 0; if (m_weight.has_value())
for (auto& weight : weights) { index_of_old_weight_in_new_list = m_weights.find_first_index(m_weight.value());
m_weights.append(weight);
if (m_weight.has_value() && weight == m_weight.value())
index_of_old_weight_in_new_list = i;
++i;
}
m_weight_list_view->set_model(ItemListModel<int>::create(m_weights)); m_weight_list_view->set_model(ItemListModel<int>::create(m_weights));
m_weight_list_view->set_cursor(m_weight_list_view->model()->index(index_of_old_weight_in_new_list.value_or(0)), GUI::AbstractView::SelectionUpdate::Set); m_weight_list_view->set_cursor(m_weight_list_view->model()->index(index_of_old_weight_in_new_list.value_or(0)), GUI::AbstractView::SelectionUpdate::Set);
@ -97,16 +92,18 @@ FontPicker::FontPicker(Window* parent_window, const Gfx::Font* current_font, boo
m_weight_list_view->on_selection = [this](auto& index) { m_weight_list_view->on_selection = [this](auto& index) {
m_weight = index.data().to_i32(); m_weight = index.data().to_i32();
m_sizes.clear(); m_sizes.clear();
Optional<size_t> index_of_old_size_in_new_list;
Gfx::FontDatabase::the().for_each_font([&](auto& font) { Gfx::FontDatabase::the().for_each_font([&](auto& font) {
if (m_fixed_width_only && !font.is_fixed_width()) if (m_fixed_width_only && !font.is_fixed_width())
return; return;
if (font.family() == m_family.value() && font.weight() == m_weight.value()) { if (font.family() == m_family.value() && font.weight() == m_weight.value()) {
if (m_size.has_value() && m_size.value() == font.presentation_size())
index_of_old_size_in_new_list = m_sizes.size();
m_sizes.append(font.presentation_size()); m_sizes.append(font.presentation_size());
} }
}); });
quick_sort(m_sizes);
Optional<size_t> index_of_old_size_in_new_list;
if (m_size.has_value()) {
index_of_old_size_in_new_list = m_sizes.find_first_index(m_size.value());
}
m_size_list_view->set_model(ItemListModel<int>::create(m_sizes)); m_size_list_view->set_model(ItemListModel<int>::create(m_sizes));
m_size_list_view->set_cursor(m_size_list_view->model()->index(index_of_old_size_in_new_list.value_or(0)), GUI::AbstractView::SelectionUpdate::Set); m_size_list_view->set_cursor(m_size_list_view->model()->index(index_of_old_size_in_new_list.value_or(0)), GUI::AbstractView::SelectionUpdate::Set);
@ -195,5 +192,4 @@ void FontPicker::update_font()
m_sample_text_label->set_font(m_font); m_sample_text_label->set_font(m_font);
} }
} }
} }