copilot/infinipaint
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Using new RichTextBox instead of CollabTextBox in program. Fixes still needed to work properly

Browse source
This commit is contained in:
Yousef Khadadeh 2025-10-20 17:30:36 +03:00
parent ec68dd9b71
commit 4db5838a64
18 changed files with 157 additions and 1441 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/DrawComponents/DrawTextBox.cpp
View file

@ -9,16 +9,21 @@
#include "../DrawCollision.hpp"
#endif
DrawTextBox::DrawTextBox():
textBox(std::make_shared<RichTextBox>()),
cursor(std::make_shared<RichTextBox::Cursor>())
{}
DrawComponentType DrawTextBox::get_type() const {
return DRAWCOMPONENT_TEXTBOX;
}
void DrawTextBox::save(cereal::PortableBinaryOutputArchive& a) const {
a(d.editing, d.p1, d.p2, d.textColor, d.textSize, d.cursor, d.currentText);
a(d.editing, d.p1, d.p2, d.textColor, d.textSize, *cursor, d.currentText);
}
void DrawTextBox::load(cereal::PortableBinaryInputArchive& a) {
a(d.editing, d.p1, d.p2, d.textColor, d.textSize, d.cursor, d.currentText);
a(d.editing, d.p1, d.p2, d.textColor, d.textSize, *cursor, d.currentText);
#ifndef IS_SERVER
textboxUpdate = true;
#endif
@ -39,7 +44,6 @@ std::shared_ptr<DrawComponent> DrawTextBox::deep_copy() const {
a->coords = coords;
a->textboxUpdate = false;
a->collisionTree = collisionTree;
a->textBox = textBox;
return a;
}
@ -50,18 +54,9 @@ void DrawTextBox::update_from_delayed_ptr(const std::shared_ptr<DrawComponent>&
}
void DrawTextBox::init_text_box(DrawingProgram& drawP) {
textBox.setFontMgr(drawP.world.main.fonts.mgr);
SkFont f(drawP.world.main.fonts.map["Roboto"], d.textSize);
f.setLinearMetrics(true);
f.setHinting(SkFontHinting::kNormal);
//font.setForceAutoHinting(true);
f.setSubpixel(true);
f.setBaselineSnap(true);
f.setEdging(SkFont::Edging::kSubpixelAntiAlias);
textBox.setFont(f);
textBox.setWidth(d.p2.x() - d.p1.x());
textBox.fLines.clear();
textBox.insert({0, 0}, d.currentText);
textBox->set_font_collection(drawP.world.main.fonts.collection);
textBox->set_width(d.p2.x() - d.p1.x());
textBox->insert({0, 0}, d.currentText);
}
void DrawTextBox::draw(SkCanvas* canvas, const DrawData& drawData) {
@ -79,14 +74,12 @@ void DrawTextBox::draw(SkCanvas* canvas, const DrawData& drawData) {
canvas->clipRect(clipR);
canvas->translate(d.p1.x(), d.p1.y());
CollabTextBox::Editor::PaintOpts paintOpts;
paintOpts.fForegroundColor = convert_vec4<SkColor4f>(d.textColor);
paintOpts.fBackgroundColor = {0.0f, 0.0f, 0.0f, 0.0f};
paintOpts.cursorColor = {0.7f, 0.7f, 1.0f, 1.0f};
paintOpts.showCursor = d.editing;
paintOpts.cursor = d.cursor;
RichTextBox::PaintOpts paintOpts;
paintOpts.cursorColor = {0.7f, 0.7f, 1.0f};
if(d.editing && cursor)
paintOpts.cursor = *cursor;
textBox.paint(canvas, paintOpts);
textBox->paint(canvas, paintOpts);
canvas->restore();
}
}
@ -98,13 +91,13 @@ void DrawTextBox::update(DrawingProgram& drawP) {
void DrawTextBox::set_textbox_string(const std::string& str) {
d.currentText = str;
textBox.fLines.clear();
textBox.insert({0, 0}, d.currentText);
textBox->remove({0, 0}, textBox->move(RichTextBox::Movement::END, {0, 0}));
textBox->insert({0, 0}, d.currentText);
textboxUpdate = false;
}
void DrawTextBox::update_contained_string(DrawingProgram& drawP) {
d.currentText = textBox.get_string();
d.currentText = textBox->get_string();
}
Vector2f DrawTextBox::get_mouse_pos(DrawingProgram& drawP) {

8
src/DrawComponents/DrawTextBox.hpp
View file

@ -1,16 +1,16 @@
#pragma once
#include "../SharedTypes.hpp"
#include "DrawComponent.hpp"
#include "../CollabTextBox/CollabTextBoxCursor.hpp"
#include "../CoordSpaceHelper.hpp"
#include "../RichTextBox/RichTextBox.hpp"
#ifndef IS_SERVER
#include <include/core/SkPath.h>
#include "../CollabTextBox/CollabTextBox.hpp"
#endif
class DrawTextBox : public DrawComponent {
public:
DrawTextBox();
virtual DrawComponentType get_type() const override;
virtual void save(cereal::PortableBinaryOutputArchive& a) const override;
virtual void load(cereal::PortableBinaryInputArchive& a) override;
@ -22,7 +22,6 @@ class DrawTextBox : public DrawComponent {
Vector2f p1;
Vector2f p2;
std::string currentText;
CollabTextBox::Cursor cursor;
bool editing = false;
bool operator==(const Data& o) const = default;
bool operator!=(const Data& o) const = default;
@ -46,7 +45,8 @@ class DrawTextBox : public DrawComponent {
virtual SCollision::AABB<float> get_obj_coord_bounds() const override;
bool textboxUpdate = false;
CollabTextBox::Editor textBox;
std::shared_ptr<RichTextBox> textBox;
std::shared_ptr<RichTextBox::Cursor> cursor;
SCollision::BVHContainer<float> collisionTree;
#endif
};