RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:47:34 +00:00
Code Issues Activity Actions

LibGUI: Make FontPicker correctly select the current font when opened

Browse source
This commit is contained in:
Andreas Kling 2020-12-30 18:04:36 +01:00
parent 34ae570928
commit 8fe1643c4b
2 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Libraries/LibGUI/FontPicker.cpp
View file

@ -85,7 +85,7 @@ FontPicker::FontPicker(Window* parent_window, const Gfx::Font* current_font, boo
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);
update_sample_label(); update_font();
}; };
m_weight_list_view->on_selection = [this](auto& index) { m_weight_list_view->on_selection = [this](auto& index) {
@ -104,12 +104,12 @@ FontPicker::FontPicker(Window* parent_window, const Gfx::Font* current_font, boo
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);
update_sample_label(); update_font();
}; };
m_size_list_view->on_selection = [this](auto& index) { m_size_list_view->on_selection = [this](auto& index) {
m_size = index.data().to_i32(); m_size = index.data().to_i32();
update_sample_label(); update_font();
}; };
auto& ok_button = static_cast<Button&>(*widget.find_descendant_by_name("ok_button")); auto& ok_button = static_cast<Button&>(*widget.find_descendant_by_name("ok_button"));
@ -137,6 +137,9 @@ void FontPicker::set_font(const Gfx::Font* font)
m_sample_text_label->set_font(m_font); m_sample_text_label->set_font(m_font);
if (!m_font) { if (!m_font) {
m_family = {};
m_weight = {};
m_size = {};
m_weights.clear(); m_weights.clear();
m_sizes.clear(); m_sizes.clear();
m_weight_list_view->set_model(nullptr); m_weight_list_view->set_model(nullptr);
@ -144,6 +147,10 @@ void FontPicker::set_font(const Gfx::Font* font)
return; return;
} }
m_family = font->family();
m_weight = font->weight();
m_size = font->presentation_size();
size_t family_index = 0; size_t family_index = 0;
for (size_t i = 0; i < m_families.size(); ++i) { for (size_t i = 0; i < m_families.size(); ++i) {
if (m_families[i] == m_font->family()) { if (m_families[i] == m_font->family()) {
@ -175,10 +182,12 @@ void FontPicker::set_font(const Gfx::Font* font)
m_size_list_view->set_cursor(m_size_list_view->model()->index(size_index), GUI::AbstractView::SelectionUpdate::Set); m_size_list_view->set_cursor(m_size_list_view->model()->index(size_index), GUI::AbstractView::SelectionUpdate::Set);
} }
void FontPicker::update_sample_label() void FontPicker::update_font()
{ {
if (m_family.has_value() && m_size.has_value() && m_weight.has_value()) if (m_family.has_value() && m_size.has_value() && m_weight.has_value()) {
set_font(Gfx::FontDatabase::the().get(m_family.value(), m_size.value(), m_weight.value())); m_font = Gfx::FontDatabase::the().get(m_family.value(), m_size.value(), m_weight.value());
m_sample_text_label->set_font(m_font);
}
} }
} }

2
Libraries/LibGUI/FontPicker.h
View file

@ -43,7 +43,7 @@ public:
private: private:
FontPicker(Window* parent_window = nullptr, const Gfx::Font* current_font = nullptr, bool fixed_width_only = false); FontPicker(Window* parent_window = nullptr, const Gfx::Font* current_font = nullptr, bool fixed_width_only = false);
void update_sample_label(); void update_font();
const bool m_fixed_width_only; const bool m_fixed_width_only;