Use FontData everywhere
This commit is contained in:
parent
4fe52ef7f6
commit
a99b0e920d
14 changed files with 51 additions and 46 deletions
|
|
@ -794,9 +794,9 @@ void TextBox::set_allow_newlines(bool allow) {
|
|||
newlinesAllowed = allow;
|
||||
}
|
||||
|
||||
void TextBox::set_font_collection(const sk_sp<skia::textlayout::FontCollection>& fC) {
|
||||
if(fontCollection != fC) {
|
||||
fontCollection = fC;
|
||||
void TextBox::set_font_data(const std::shared_ptr<FontData>& fD) {
|
||||
if(fontData != fD) {
|
||||
fontData = fD;
|
||||
inputChangedTextBox = true;
|
||||
needsRebuild = true;
|
||||
}
|
||||
|
|
@ -810,6 +810,8 @@ void TextBox::rebuild() {
|
|||
|
||||
skia::textlayout::TextStyle tStyle = initialTStyle;
|
||||
|
||||
FontFamiliesTextStyleModifier::globalFontData = fontData;
|
||||
|
||||
for(size_t pIndex = 0; pIndex < paragraphs.size(); pIndex++) {
|
||||
ParagraphData& pData = paragraphs[pIndex];
|
||||
skia::textlayout::ParagraphStyle pStyle = pData.pStyleData.get_paragraph_style();
|
||||
|
|
@ -825,7 +827,7 @@ void TextBox::rebuild() {
|
|||
}
|
||||
|
||||
size_t tIndex = 0;
|
||||
skia::textlayout::ParagraphBuilderImpl a(pStyle, fontCollection, SkUnicodes::ICU::Make());
|
||||
skia::textlayout::ParagraphBuilderImpl a(pStyle, fontData->collection, SkUnicodes::ICU::Make());
|
||||
|
||||
for(;;) {
|
||||
if(nextTStyleModIt == tStyleMods.end() || nextTStyleModIt->pos.fParagraphIndex != pIndex) {
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ class TextBox {
|
|||
void set_width(float newWidth);
|
||||
TextPosition insert(TextPosition pos, std::string_view textToInsert, const std::optional<TextStyleModifier::ModifierMap>& inputModMap = std::nullopt);
|
||||
TextPosition remove(TextPosition p1, TextPosition p2);
|
||||
void set_font_collection(const sk_sp<skia::textlayout::FontCollection>& fC);
|
||||
void set_font_data(const std::shared_ptr<FontData>& fD);
|
||||
void paint(SkCanvas* canvas, const PaintOpts& paintOpts);
|
||||
void set_allow_newlines(bool allow);
|
||||
float get_height();
|
||||
|
|
@ -174,7 +174,7 @@ class TextBox {
|
|||
float width = 0.0f;
|
||||
bool needsRebuild = true;
|
||||
unsigned tabWidth = 8;
|
||||
sk_sp<skia::textlayout::FontCollection> fontCollection;
|
||||
std::shared_ptr<FontData> fontData;
|
||||
|
||||
struct ParagraphData {
|
||||
std::string text;
|
||||
|
|
|
|||
|
|
@ -170,6 +170,7 @@ bool SizeTextStyleModifier::equivalent_data(TextStyleModifier& modifier) const {
|
|||
}
|
||||
|
||||
|
||||
std::shared_ptr<FontData> FontFamiliesTextStyleModifier::globalFontData = nullptr;
|
||||
|
||||
FontFamiliesTextStyleModifier::FontFamiliesTextStyleModifier(const std::vector<SkString>& initFamilies): families(initFamilies) {}
|
||||
|
||||
|
|
@ -190,8 +191,11 @@ void FontFamiliesTextStyleModifier::load(cereal::PortableBinaryInputArchive& a)
|
|||
}
|
||||
|
||||
void FontFamiliesTextStyleModifier::modify_text_style(skia::textlayout::TextStyle& style) const {
|
||||
if(!globalFontData)
|
||||
throw std::runtime_error("[FontFamiliesTextStyleModifier::modify_text_style] global font data not set");
|
||||
|
||||
auto familiesToPush = families;
|
||||
push_default_font_families(familiesToPush);
|
||||
globalFontData->push_default_font_families(familiesToPush);
|
||||
style.setFontFamilies(familiesToPush);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
#include <modules/skparagraph/include/TextStyle.h>
|
||||
#include "cereal/archives/portable_binary.hpp"
|
||||
#include "../SharedTypes.hpp"
|
||||
#include "../FontData.hpp"
|
||||
|
||||
namespace RichText {
|
||||
|
||||
|
|
@ -108,6 +109,8 @@ class SizeTextStyleModifier : public TextStyleModifier {
|
|||
|
||||
class FontFamiliesTextStyleModifier : public TextStyleModifier {
|
||||
public:
|
||||
static std::shared_ptr<FontData> globalFontData;
|
||||
|
||||
FontFamiliesTextStyleModifier() = default;
|
||||
FontFamiliesTextStyleModifier(const std::vector<SkString>& initFamilies);
|
||||
virtual ModifierType get_type() const override;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue