summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Userland/Libraries/LibGUI/FontPicker.cpp47
-rw-r--r--Userland/Libraries/LibGfx/FontDatabase.cpp1
-rw-r--r--Userland/Libraries/LibGfx/Typeface.cpp10
-rw-r--r--Userland/Libraries/LibGfx/Typeface.h1
-rw-r--r--Userland/Libraries/LibTTF/Font.cpp2
-rw-r--r--Userland/Libraries/LibTTF/Font.h6
6 files changed, 46 insertions, 21 deletions
diff --git a/Userland/Libraries/LibGUI/FontPicker.cpp b/Userland/Libraries/LibGUI/FontPicker.cpp
index 7b46b1e322..e3e22b3562 100644
--- a/Userland/Libraries/LibGUI/FontPicker.cpp
+++ b/Userland/Libraries/LibGUI/FontPicker.cpp
@@ -113,22 +113,22 @@ FontPicker::FontPicker(Window* parent_window, const Gfx::Font* current_font, boo
m_sample_text_label = *widget.find_descendant_of_type_named<Label>("sample_text_label");
m_families.clear();
- Gfx::FontDatabase::the().for_each_font([&](auto& font) {
- if (m_fixed_width_only && !font.is_fixed_width())
+ Gfx::FontDatabase::the().for_each_typeface([&](auto& typeface) {
+ if (m_fixed_width_only && !typeface.is_fixed_width())
return;
- if (!m_families.contains_slow(font.family()))
- m_families.append(font.family());
+ if (!m_families.contains_slow(typeface.family()))
+ m_families.append(typeface.family());
});
quick_sort(m_families);
m_family_list_view->on_selection = [this](auto& index) {
m_family = index.data().to_string();
m_weights.clear();
- Gfx::FontDatabase::the().for_each_font([&](auto& font) {
- if (m_fixed_width_only && !font.is_fixed_width())
+ Gfx::FontDatabase::the().for_each_typeface([&](auto& typeface) {
+ if (m_fixed_width_only && !typeface.is_fixed_width())
return;
- if (font.family() == m_family.value() && !m_weights.contains_slow(font.weight())) {
- m_weights.append(font.weight());
+ if (typeface.family() == m_family.value() && !m_weights.contains_slow(typeface.weight())) {
+ m_weights.append(typeface.weight());
}
});
quick_sort(m_weights);
@@ -144,11 +144,18 @@ FontPicker::FontPicker(Window* parent_window, const Gfx::Font* current_font, boo
m_weight_list_view->on_selection = [this](auto& index) {
m_weight = index.data(ModelRole::Custom).to_i32();
m_sizes.clear();
- Gfx::FontDatabase::the().for_each_font([&](auto& font) {
- if (m_fixed_width_only && !font.is_fixed_width())
+ dbgln("Selected weight: {}", m_weight.value());
+ Gfx::FontDatabase::the().for_each_typeface([&](auto& typeface) {
+ if (m_fixed_width_only && !typeface.is_fixed_width())
return;
- if (font.family() == m_family.value() && font.weight() == m_weight.value()) {
- m_sizes.append(font.presentation_size());
+ if (typeface.family() == m_family.value() && (int)typeface.weight() == m_weight.value()) {
+ if (typeface.is_fixed_size()) {
+ typeface.for_each_fixed_size_font([&](auto& font) {
+ m_sizes.append(font.presentation_size());
+ });
+ } else {
+ m_sizes.append(12);
+ }
}
});
quick_sort(m_sizes);
@@ -206,14 +213,18 @@ void FontPicker::set_font(const Gfx::Font* font)
m_weight = font->weight();
m_size = font->presentation_size();
- size_t family_index = m_families.find_first_index(m_font->family()).value();
- m_family_list_view->set_cursor(m_family_list_view->model()->index(family_index), GUI::AbstractView::SelectionUpdate::Set);
+ auto family_index = m_families.find_first_index(m_font->family());
+ if (family_index.has_value())
+ m_family_list_view->set_cursor(m_family_list_view->model()->index(family_index.value()), GUI::AbstractView::SelectionUpdate::Set);
- size_t weight_index = m_weights.find_first_index(m_font->weight()).value();
- m_weight_list_view->set_cursor(m_weight_list_view->model()->index(weight_index), GUI::AbstractView::SelectionUpdate::Set);
+ auto weight_index = m_weights.find_first_index(m_font->weight());
+ if (weight_index.has_value()) {
+ m_weight_list_view->set_cursor(m_weight_list_view->model()->index(weight_index.value()), GUI::AbstractView::SelectionUpdate::Set);
+ }
- size_t size_index = m_sizes.find_first_index(m_font->presentation_size()).value();
- m_size_list_view->set_cursor(m_size_list_view->model()->index(size_index), GUI::AbstractView::SelectionUpdate::Set);
+ auto size_index = m_sizes.find_first_index(m_font->presentation_size());
+ if (size_index.has_value())
+ m_size_list_view->set_cursor(m_size_list_view->model()->index(size_index.value()), GUI::AbstractView::SelectionUpdate::Set);
}
void FontPicker::update_font()
diff --git a/Userland/Libraries/LibGfx/FontDatabase.cpp b/Userland/Libraries/LibGfx/FontDatabase.cpp
index 0410b0dd9d..bf50ea8892 100644
--- a/Userland/Libraries/LibGfx/FontDatabase.cpp
+++ b/Userland/Libraries/LibGfx/FontDatabase.cpp
@@ -159,6 +159,7 @@ RefPtr<Gfx::Font> FontDatabase::get_by_name(const StringView& name)
RefPtr<Gfx::Font> FontDatabase::get(const String& family, unsigned size, unsigned weight)
{
+ dbgln("FontDatabase: Request font {} {} {}", family, size, weight);
for (auto typeface : m_private->typefaces) {
if (typeface->family() == family && typeface->weight() == weight)
return typeface->get_font(size);
diff --git a/Userland/Libraries/LibGfx/Typeface.cpp b/Userland/Libraries/LibGfx/Typeface.cpp
index f9f6442368..5e049c5a14 100644
--- a/Userland/Libraries/LibGfx/Typeface.cpp
+++ b/Userland/Libraries/LibGfx/Typeface.cpp
@@ -38,6 +38,16 @@ unsigned Typeface::weight() const
return m_ttf_font->weight();
}
+bool Typeface::is_fixed_width() const
+{
+ ASSERT(m_ttf_font || m_bitmap_fonts.size() > 0);
+
+ if (is_fixed_size())
+ return m_bitmap_fonts[0]->is_fixed_width();
+
+ return m_ttf_font->is_fixed_width();
+}
+
void Typeface::add_bitmap_font(RefPtr<BitmapFont> font)
{
m_bitmap_fonts.append(font);
diff --git a/Userland/Libraries/LibGfx/Typeface.h b/Userland/Libraries/LibGfx/Typeface.h
index 591d685106..87fb16a1f3 100644
--- a/Userland/Libraries/LibGfx/Typeface.h
+++ b/Userland/Libraries/LibGfx/Typeface.h
@@ -48,6 +48,7 @@ public:
String variant() const { return m_variant; }
unsigned weight() const;
+ bool is_fixed_width() const;
bool is_fixed_size() const { return !m_bitmap_fonts.is_empty(); }
void for_each_fixed_size_font(Function<void(const Font&)>) const;
diff --git a/Userland/Libraries/LibTTF/Font.cpp b/Userland/Libraries/LibTTF/Font.cpp
index 5601582c4a..cfed406f61 100644
--- a/Userland/Libraries/LibTTF/Font.cpp
+++ b/Userland/Libraries/LibTTF/Font.cpp
@@ -341,7 +341,7 @@ RefPtr<Font> Font::load_from_offset(ByteBuffer&& buffer, u32 offset)
auto head = opt_head.value();
if (!opt_name_slice.has_value() || !(opt_name = Name::from_slice(opt_name_slice.value())).has_value()) {
- dbg() << "Could not load Name";
+ dbgln("Could not load Name");
return nullptr;
}
auto name = opt_name.value();
diff --git a/Userland/Libraries/LibTTF/Font.h b/Userland/Libraries/LibTTF/Font.h
index 44ffa31459..3fe3b5be03 100644
--- a/Userland/Libraries/LibTTF/Font.h
+++ b/Userland/Libraries/LibTTF/Font.h
@@ -77,6 +77,8 @@ public:
u32 glyph_id_for_codepoint(u32 codepoint) const { return m_cmap.glyph_id_for_codepoint(codepoint); }
String family() const;
String variant() const;
+ u16 weight() const;
+ bool is_fixed_width() const { return false; } /* TODO */
private:
enum class Offsets {
@@ -119,7 +121,7 @@ private:
class ScaledFont : public Gfx::Font {
public:
- ScaledFont(RefPtr<Font> font, float point_width, float point_height, unsigned dpi_x = DEFAULT_DPI, unsigned dpi_y = DEFAULT_DPI)
+ ScaledFont(RefPtr<TTF::Font> font, float point_width, float point_height, unsigned dpi_x = DEFAULT_DPI, unsigned dpi_y = DEFAULT_DPI)
: m_font(font)
{
float units_per_em = m_font->units_per_em();
@@ -149,7 +151,7 @@ public:
virtual int width(const Utf8View&) const override;
virtual int width(const Utf32View&) const override;
virtual String name() const override { return String::formatted("{} {}", family(), variant()); }
- virtual bool is_fixed_width() const override { return false; } /* TODO */
+ virtual bool is_fixed_width() const override { return m_font->is_fixed_width(); }
virtual u8 glyph_spacing() const override { return m_x_scale; } /* TODO */
virtual int glyph_count() const override { return m_font->glyph_count(); }
virtual String family() const override { return m_font->family(); }
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 00:57:15 +0000