Fixed issues with stacking styles and duplicate/empty styles
This commit is contained in:
parent
ee887c82dd
commit
fe936b6c25
3 changed files with 68 additions and 28 deletions
|
|
@ -12,7 +12,23 @@
|
||||||
DrawTextBox::DrawTextBox():
|
DrawTextBox::DrawTextBox():
|
||||||
textBox(std::make_shared<RichTextBox>()),
|
textBox(std::make_shared<RichTextBox>()),
|
||||||
cursor(std::make_shared<RichTextBox::Cursor>())
|
cursor(std::make_shared<RichTextBox::Cursor>())
|
||||||
{}
|
{
|
||||||
|
skia::textlayout::TextStyle tStyle;
|
||||||
|
tStyle.setFontFamilies({SkString{"Roboto"}});
|
||||||
|
tStyle.setFontSize(16.0f);
|
||||||
|
tStyle.setForegroundPaint(SkPaint{SkColor4f{0.0f, 1.0f, 1.0f, 1.0f}});
|
||||||
|
textBox->set_initial_text_style(tStyle);
|
||||||
|
|
||||||
|
auto boldMod = std::make_shared<WeightTextStyleModifier>();
|
||||||
|
boldMod->set_weight(SkFontStyle::kNormal_Weight);
|
||||||
|
textBox->set_initial_text_style_modifier(boldMod);
|
||||||
|
auto italicMod = std::make_shared<SlantTextStyleModifier>();
|
||||||
|
italicMod->set_slant(SkFontStyle::Slant::kUpright_Slant);
|
||||||
|
textBox->set_initial_text_style_modifier(italicMod);
|
||||||
|
auto colorMod = std::make_shared<ColorTextStyleModifier>();
|
||||||
|
colorMod->color = {1.0f, 1.0f, 1.0f, 1.0f};
|
||||||
|
textBox->set_initial_text_style_modifier(colorMod);
|
||||||
|
}
|
||||||
|
|
||||||
DrawComponentType DrawTextBox::get_type() const {
|
DrawComponentType DrawTextBox::get_type() const {
|
||||||
return DRAWCOMPONENT_TEXTBOX;
|
return DRAWCOMPONENT_TEXTBOX;
|
||||||
|
|
@ -54,20 +70,6 @@ void DrawTextBox::update_from_delayed_ptr(const std::shared_ptr<DrawComponent>&
|
||||||
void DrawTextBox::init_text_box(DrawingProgram& drawP) {
|
void DrawTextBox::init_text_box(DrawingProgram& drawP) {
|
||||||
textBox->set_font_collection(drawP.world.main.fonts.collection); // Getting a segfault relating to the paragraph cache means that the font collection hasn't been set yet
|
textBox->set_font_collection(drawP.world.main.fonts.collection); // Getting a segfault relating to the paragraph cache means that the font collection hasn't been set yet
|
||||||
textBox->set_width(d.p2.x() - d.p1.x());
|
textBox->set_width(d.p2.x() - d.p1.x());
|
||||||
skia::textlayout::TextStyle tStyle;
|
|
||||||
tStyle.setFontFamilies({SkString{"Roboto"}});
|
|
||||||
tStyle.setFontSize(16.0f);
|
|
||||||
textBox->set_initial_text_style(tStyle);
|
|
||||||
|
|
||||||
auto boldMod = std::make_shared<WeightTextStyleModifier>();
|
|
||||||
boldMod->set_weight(SkFontStyle::kNormal_Weight);
|
|
||||||
textBox->set_initial_text_style_modifier(boldMod);
|
|
||||||
auto italicMod = std::make_shared<SlantTextStyleModifier>();
|
|
||||||
italicMod->set_slant(SkFontStyle::Slant::kUpright_Slant);
|
|
||||||
textBox->set_initial_text_style_modifier(italicMod);
|
|
||||||
auto colorMod = std::make_shared<ColorTextStyleModifier>();
|
|
||||||
colorMod->color = {1.0f, 1.0f, 1.0f, 1.0f};
|
|
||||||
textBox->set_initial_text_style_modifier(colorMod);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void DrawTextBox::draw(SkCanvas* canvas, const DrawData& drawData) {
|
void DrawTextBox::draw(SkCanvas* canvas, const DrawData& drawData) {
|
||||||
|
|
|
||||||
|
|
@ -336,6 +336,7 @@ void RichTextBox::set_initial_text_style_modifier(const std::shared_ptr<TextStyl
|
||||||
tStyleMods[0].pos = {0, 0};
|
tStyleMods[0].pos = {0, 0};
|
||||||
}
|
}
|
||||||
tStyleMods[0].mods[modifier->get_type()] = modifier;
|
tStyleMods[0].mods[modifier->get_type()] = modifier;
|
||||||
|
remove_duplicate_text_style_mods();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<TextStyleModifier> RichTextBox::get_last_text_style_mod_before_pos(TextPosition pos, TextStyleModifier::ModifierType modType) {
|
std::shared_ptr<TextStyleModifier> RichTextBox::get_last_text_style_mod_before_pos(TextPosition pos, TextStyleModifier::ModifierType modType) {
|
||||||
|
|
@ -376,22 +377,32 @@ void RichTextBox::set_text_style_modifier_between(TextPosition p1, TextPosition
|
||||||
return p >= start && modifier->get_type() == modToCheck->get_type();
|
return p >= start && modifier->get_type() == modToCheck->get_type();
|
||||||
});
|
});
|
||||||
insert_style_at_pos(start, modifier);
|
insert_style_at_pos(start, modifier);
|
||||||
insert_style_at_pos(end, lastModOfThisTypeBeforeEnd);
|
if(end != move(Movement::END, {0, 0}))
|
||||||
|
insert_style_at_pos(end, lastModOfThisTypeBeforeEnd);
|
||||||
|
remove_duplicate_text_style_mods();
|
||||||
needsRebuild = true;
|
needsRebuild = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void RichTextBox::insert_style_at_pos(TextPosition pos, const std::shared_ptr<TextStyleModifier>& modifier) {
|
void RichTextBox::insert_style_at_pos(TextPosition pos, const std::shared_ptr<TextStyleModifier>& modifier) {
|
||||||
size_t indexToPlaceAt = 0;
|
size_t indexToPlaceAt = 0;
|
||||||
|
bool finishedInsertingStyle = false;
|
||||||
for(auto& [tPos, tStyleModsInPos] : tStyleMods) {
|
for(auto& [tPos, tStyleModsInPos] : tStyleMods) {
|
||||||
if(tPos > pos)
|
if(tPos > pos)
|
||||||
break;
|
break;
|
||||||
else if(tPos == pos)
|
else if(tPos == pos) {
|
||||||
tStyleModsInPos[modifier->get_type()] = modifier;
|
tStyleModsInPos[modifier->get_type()] = modifier;
|
||||||
indexToPlaceAt++;
|
finishedInsertingStyle = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
indexToPlaceAt++;
|
||||||
|
}
|
||||||
|
if(!finishedInsertingStyle) {
|
||||||
|
auto it = tStyleMods.insert(tStyleMods.begin() + indexToPlaceAt, PositionedTextStyleMod{});
|
||||||
|
it->pos = pos;
|
||||||
|
it->mods[modifier->get_type()] = modifier;
|
||||||
}
|
}
|
||||||
auto it = tStyleMods.insert(tStyleMods.begin() + indexToPlaceAt, PositionedTextStyleMod{pos});
|
|
||||||
it->mods[modifier->get_type()] = modifier;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
RichTextBox::TextPosition RichTextBox::move(Movement movement, TextPosition pos, std::optional<float>* previousX, bool flipDependingOnTextDirection) {
|
RichTextBox::TextPosition RichTextBox::move(Movement movement, TextPosition pos, std::optional<float>* previousX, bool flipDependingOnTextDirection) {
|
||||||
|
|
@ -615,6 +626,7 @@ void RichTextBox::rebuild() {
|
||||||
auto& nextTStyleMod = *nextTStyleModIt;
|
auto& nextTStyleMod = *nextTStyleModIt;
|
||||||
|
|
||||||
// Print with previous style
|
// Print with previous style
|
||||||
|
|
||||||
a.pushStyle(tStyle);
|
a.pushStyle(tStyle);
|
||||||
a.addText(pData.text.c_str() + tIndex, nextTStyleMod.pos.fTextByteIndex - tIndex);
|
a.addText(pData.text.c_str() + tIndex, nextTStyleMod.pos.fTextByteIndex - tIndex);
|
||||||
a.pop();
|
a.pop();
|
||||||
|
|
@ -634,10 +646,30 @@ void RichTextBox::rebuild() {
|
||||||
heightOffset += pData.p->getHeight();
|
heightOffset += pData.p->getHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//std::cout << "size: " << tStyleMods.size() << std::endl;
|
||||||
|
//for(auto& s : tStyleMods)
|
||||||
|
// std::cout << s.pos.fParagraphIndex << " " << s.pos.fTextByteIndex << std::endl;
|
||||||
|
|
||||||
needsRebuild = false;
|
needsRebuild = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void RichTextBox::remove_duplicate_text_style_mods() {
|
||||||
|
std::unordered_map<TextStyleModifier::ModifierType, std::shared_ptr<TextStyleModifier>> previouslyAppliedMods;
|
||||||
|
std::erase_if(tStyleMods, [&previouslyAppliedMods](PositionedTextStyleMod& tStyleModsInPos) {
|
||||||
|
std::erase_if(tStyleModsInPos.mods, [&previouslyAppliedMods](const std::pair<TextStyleModifier::ModifierType, std::shared_ptr<TextStyleModifier>>& tStyleModPair) {
|
||||||
|
auto [placedIt, insertionTookPlace] = previouslyAppliedMods.emplace(tStyleModPair.first, tStyleModPair.second);
|
||||||
|
if(!insertionTookPlace) {
|
||||||
|
if(placedIt->second->equivalent(*tStyleModPair.second))
|
||||||
|
return true;
|
||||||
|
placedIt->second = tStyleModPair.second;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
return tStyleModsInPos.mods.empty();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void RichTextBox::set_tab_space_width(unsigned newTabWidth) {
|
void RichTextBox::set_tab_space_width(unsigned newTabWidth) {
|
||||||
tabWidth = newTabWidth;
|
tabWidth = newTabWidth;
|
||||||
}
|
}
|
||||||
|
|
@ -651,7 +683,7 @@ RichTextBox::TextPosition RichTextBox::insert(TextPosition pos, std::string_view
|
||||||
for(auto& [p, tStylesInPos] : tStyleMods) {
|
for(auto& [p, tStylesInPos] : tStyleMods) {
|
||||||
if(p.fParagraphIndex > pos.fParagraphIndex)
|
if(p.fParagraphIndex > pos.fParagraphIndex)
|
||||||
p.fParagraphIndex++;
|
p.fParagraphIndex++;
|
||||||
else if(p.fParagraphIndex == pos.fParagraphIndex && p.fTextByteIndex >= pos.fTextByteIndex) {
|
else if(p.fParagraphIndex == pos.fParagraphIndex && p.fTextByteIndex >= pos.fTextByteIndex && !(p.fTextByteIndex == pos.fTextByteIndex && p.fTextByteIndex == 0)) {
|
||||||
p.fTextByteIndex = p.fTextByteIndex - pos.fTextByteIndex;
|
p.fTextByteIndex = p.fTextByteIndex - pos.fTextByteIndex;
|
||||||
p.fParagraphIndex++;
|
p.fParagraphIndex++;
|
||||||
}
|
}
|
||||||
|
|
@ -665,7 +697,7 @@ RichTextBox::TextPosition RichTextBox::insert(TextPosition pos, std::string_view
|
||||||
}
|
}
|
||||||
else if(c == '\t') {
|
else if(c == '\t') {
|
||||||
for(auto& [p, tStylesInPos] : tStyleMods) {
|
for(auto& [p, tStylesInPos] : tStyleMods) {
|
||||||
if(p.fParagraphIndex == pos.fParagraphIndex && p.fTextByteIndex >= pos.fTextByteIndex)
|
if(p.fParagraphIndex == pos.fParagraphIndex && p.fTextByteIndex >= pos.fTextByteIndex && !(p.fTextByteIndex == pos.fTextByteIndex && p.fTextByteIndex == 0))
|
||||||
p.fTextByteIndex += tabWidth;
|
p.fTextByteIndex += tabWidth;
|
||||||
}
|
}
|
||||||
paragraphs[pos.fParagraphIndex].text.insert(pos.fTextByteIndex, std::string(tabWidth, ' '));
|
paragraphs[pos.fParagraphIndex].text.insert(pos.fTextByteIndex, std::string(tabWidth, ' '));
|
||||||
|
|
@ -673,7 +705,7 @@ RichTextBox::TextPosition RichTextBox::insert(TextPosition pos, std::string_view
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
for(auto& [p, tStylesInPos] : tStyleMods) {
|
for(auto& [p, tStylesInPos] : tStyleMods) {
|
||||||
if(p.fParagraphIndex == pos.fParagraphIndex && p.fTextByteIndex >= pos.fTextByteIndex)
|
if(p.fParagraphIndex == pos.fParagraphIndex && p.fTextByteIndex >= pos.fTextByteIndex && !(p.fTextByteIndex == pos.fTextByteIndex && p.fTextByteIndex == 0))
|
||||||
p.fTextByteIndex++;
|
p.fTextByteIndex++;
|
||||||
}
|
}
|
||||||
paragraphs[pos.fParagraphIndex].text.insert(paragraphs[pos.fParagraphIndex].text.begin() + pos.fTextByteIndex, c);
|
paragraphs[pos.fParagraphIndex].text.insert(paragraphs[pos.fParagraphIndex].text.begin() + pos.fTextByteIndex, c);
|
||||||
|
|
@ -681,7 +713,11 @@ RichTextBox::TextPosition RichTextBox::insert(TextPosition pos, std::string_view
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
needsRebuild = true;
|
if(!textToInsert.empty()) {
|
||||||
|
remove_duplicate_text_style_mods();
|
||||||
|
needsRebuild = true;
|
||||||
|
}
|
||||||
|
|
||||||
return pos;
|
return pos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -705,8 +741,6 @@ RichTextBox::TextPosition RichTextBox::remove(TextPosition p1, TextPosition p2)
|
||||||
paragraphs.erase(paragraphs.begin() + start.fParagraphIndex + 1, paragraphs.begin() + end.fParagraphIndex + 1);
|
paragraphs.erase(paragraphs.begin() + start.fParagraphIndex + 1, paragraphs.begin() + end.fParagraphIndex + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::optional<int32_t> prevTextStyleModIndex;
|
|
||||||
|
|
||||||
for(int32_t i = 0; i < static_cast<int32_t>(tStyleMods.size()); i++) {
|
for(int32_t i = 0; i < static_cast<int32_t>(tStyleMods.size()); i++) {
|
||||||
PositionedTextStyleMod& tStyleMod = tStyleMods[i];
|
PositionedTextStyleMod& tStyleMod = tStyleMods[i];
|
||||||
auto& p = tStyleMod.pos;
|
auto& p = tStyleMod.pos;
|
||||||
|
|
@ -722,8 +756,8 @@ RichTextBox::TextPosition RichTextBox::remove(TextPosition p1, TextPosition p2)
|
||||||
else
|
else
|
||||||
p.fParagraphIndex -= (end.fParagraphIndex - start.fParagraphIndex);
|
p.fParagraphIndex -= (end.fParagraphIndex - start.fParagraphIndex);
|
||||||
}
|
}
|
||||||
if(prevTextStyleModIndex.has_value() && tStyleMods[prevTextStyleModIndex.value()].pos == p) {
|
if(i > 0 && tStyleMods[i - 1].pos == p) {
|
||||||
auto& tStyleModsToMergeWith = tStyleMods[prevTextStyleModIndex.value()].mods;
|
auto& tStyleModsToMergeWith = tStyleMods[i - 1].mods;
|
||||||
for(auto& [modType, tStyle] : tStyleMod.mods)
|
for(auto& [modType, tStyle] : tStyleMod.mods)
|
||||||
tStyleModsToMergeWith[modType] = tStyle;
|
tStyleModsToMergeWith[modType] = tStyle;
|
||||||
tStyleMods.erase(tStyleMods.begin() + i);
|
tStyleMods.erase(tStyleMods.begin() + i);
|
||||||
|
|
@ -731,7 +765,9 @@ RichTextBox::TextPosition RichTextBox::remove(TextPosition p1, TextPosition p2)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
remove_duplicate_text_style_mods();
|
||||||
needsRebuild = true;
|
needsRebuild = true;
|
||||||
|
|
||||||
return start;
|
return start;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -131,6 +131,8 @@ class RichTextBox {
|
||||||
void erase_if_over_all_styles_until_pos(TextPosition pos, const std::function<bool(TextPosition, const std::shared_ptr<TextStyleModifier>&)>& func);
|
void erase_if_over_all_styles_until_pos(TextPosition pos, const std::function<bool(TextPosition, const std::shared_ptr<TextStyleModifier>&)>& func);
|
||||||
void insert_style_at_pos(TextPosition pos, const std::shared_ptr<TextStyleModifier>& modifier);
|
void insert_style_at_pos(TextPosition pos, const std::shared_ptr<TextStyleModifier>& modifier);
|
||||||
|
|
||||||
|
void remove_duplicate_text_style_mods();
|
||||||
|
|
||||||
void rebuild();
|
void rebuild();
|
||||||
|
|
||||||
bool newlinesAllowed = true;
|
bool newlinesAllowed = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue