|
|
@@ -74,6 +74,11 @@ void TextParagraph::_bind_methods() {
|
|
|
|
|
|
ADD_PROPERTY(PropertyInfo(Variant::INT, "flags", PROPERTY_HINT_FLAGS, "Kashida Justify,Word Justify,Trim Edge Spaces After Justify,Justify Only After Last Tab,Break Mandatory,Break Words,Break Graphemes"), "set_flags", "get_flags");
|
|
|
|
|
|
+ ClassDB::bind_method(D_METHOD("set_text_overrun_behavior", "overrun_behavior"), &TextParagraph::set_text_overrun_behavior);
|
|
|
+ ClassDB::bind_method(D_METHOD("get_text_overrun_behavior"), &TextParagraph::get_text_overrun_behavior);
|
|
|
+
|
|
|
+ ADD_PROPERTY(PropertyInfo(Variant::INT, "text_overrun_behavior", PROPERTY_HINT_ENUM, "Trim Nothing,Trim Characters,Trim Words,Ellipsis,Word Ellipsis"), "set_text_overrun_behavior", "get_text_overrun_behavior");
|
|
|
+
|
|
|
ClassDB::bind_method(D_METHOD("set_width", "width"), &TextParagraph::set_width);
|
|
|
ClassDB::bind_method(D_METHOD("get_width"), &TextParagraph::get_width);
|
|
|
|
|
|
@@ -88,6 +93,11 @@ void TextParagraph::_bind_methods() {
|
|
|
|
|
|
ClassDB::bind_method(D_METHOD("get_line_count"), &TextParagraph::get_line_count);
|
|
|
|
|
|
+ ClassDB::bind_method(D_METHOD("set_max_lines_visible", "max_lines_visible"), &TextParagraph::set_max_lines_visible);
|
|
|
+ ClassDB::bind_method(D_METHOD("get_max_lines_visible"), &TextParagraph::get_max_lines_visible);
|
|
|
+
|
|
|
+ ADD_PROPERTY(PropertyInfo(Variant::INT, "max_lines_visible"), "set_max_lines_visible", "get_max_lines_visible");
|
|
|
+
|
|
|
ClassDB::bind_method(D_METHOD("get_line_objects", "line"), &TextParagraph::get_line_objects);
|
|
|
ClassDB::bind_method(D_METHOD("get_line_object_rect", "line", "key"), &TextParagraph::get_line_object_rect);
|
|
|
ClassDB::bind_method(D_METHOD("get_line_size", "line"), &TextParagraph::get_line_size);
|
|
|
@@ -114,14 +124,20 @@ void TextParagraph::_bind_methods() {
|
|
|
ClassDB::bind_method(D_METHOD("draw_dropcap_outline", "canvas", "pos", "outline_size", "color"), &TextParagraph::draw_dropcap_outline, DEFVAL(1), DEFVAL(Color(1, 1, 1)));
|
|
|
|
|
|
ClassDB::bind_method(D_METHOD("hit_test", "coords"), &TextParagraph::hit_test);
|
|
|
+
|
|
|
+ BIND_ENUM_CONSTANT(OVERRUN_NO_TRIMMING);
|
|
|
+ BIND_ENUM_CONSTANT(OVERRUN_TRIM_CHAR);
|
|
|
+ BIND_ENUM_CONSTANT(OVERRUN_TRIM_WORD);
|
|
|
+ BIND_ENUM_CONSTANT(OVERRUN_TRIM_ELLIPSIS);
|
|
|
+ BIND_ENUM_CONSTANT(OVERRUN_TRIM_WORD_ELLIPSIS);
|
|
|
}
|
|
|
|
|
|
void TextParagraph::_shape_lines() {
|
|
|
- if (dirty_lines) {
|
|
|
- for (int i = 0; i < lines.size(); i++) {
|
|
|
- TS->free(lines[i]);
|
|
|
+ if (lines_dirty) {
|
|
|
+ for (int i = 0; i < lines_rid.size(); i++) {
|
|
|
+ TS->free(lines_rid[i]);
|
|
|
}
|
|
|
- lines.clear();
|
|
|
+ lines_rid.clear();
|
|
|
|
|
|
if (!tab_stops.is_empty()) {
|
|
|
TS->shaped_text_tab_align(rid, tab_stops);
|
|
|
@@ -153,13 +169,10 @@ void TextParagraph::_shape_lines() {
|
|
|
if (!tab_stops.is_empty()) {
|
|
|
TS->shaped_text_tab_align(line, tab_stops);
|
|
|
}
|
|
|
- if (align == HALIGN_FILL && (line_breaks.size() == 1 || i < line_breaks.size() - 1)) {
|
|
|
- TS->shaped_text_fit_to_width(line, width - h_offset, flags);
|
|
|
- }
|
|
|
dropcap_lines++;
|
|
|
v_offset -= h;
|
|
|
start = line_breaks[i].y;
|
|
|
- lines.push_back(line);
|
|
|
+ lines_rid.push_back(line);
|
|
|
}
|
|
|
}
|
|
|
// Use fixed for the rest of lines.
|
|
|
@@ -169,12 +182,69 @@ void TextParagraph::_shape_lines() {
|
|
|
if (!tab_stops.is_empty()) {
|
|
|
TS->shaped_text_tab_align(line, tab_stops);
|
|
|
}
|
|
|
- if (align == HALIGN_FILL && (line_breaks.size() == 1 || i < line_breaks.size() - 1)) {
|
|
|
- TS->shaped_text_fit_to_width(line, width, flags);
|
|
|
+ lines_rid.push_back(line);
|
|
|
+ }
|
|
|
+
|
|
|
+ uint8_t overrun_flags = TextServer::OVERRUN_NO_TRIMMING;
|
|
|
+ if (overrun_behavior != OVERRUN_NO_TRIMMING) {
|
|
|
+ switch (overrun_behavior) {
|
|
|
+ case OVERRUN_TRIM_WORD_ELLIPSIS:
|
|
|
+ overrun_flags |= TextServer::OVERRUN_TRIM;
|
|
|
+ overrun_flags |= TextServer::OVERRUN_TRIM_WORD_ONLY;
|
|
|
+ overrun_flags |= TextServer::OVERRUN_ADD_ELLIPSIS;
|
|
|
+ break;
|
|
|
+ case OVERRUN_TRIM_ELLIPSIS:
|
|
|
+ overrun_flags |= TextServer::OVERRUN_TRIM;
|
|
|
+ overrun_flags |= TextServer::OVERRUN_ADD_ELLIPSIS;
|
|
|
+ break;
|
|
|
+ case OVERRUN_TRIM_WORD:
|
|
|
+ overrun_flags |= TextServer::OVERRUN_TRIM;
|
|
|
+ overrun_flags |= TextServer::OVERRUN_TRIM_WORD_ONLY;
|
|
|
+ break;
|
|
|
+ case OVERRUN_TRIM_CHAR:
|
|
|
+ overrun_flags |= TextServer::OVERRUN_TRIM;
|
|
|
+ break;
|
|
|
+ case OVERRUN_NO_TRIMMING:
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ bool autowrap_enabled = ((flags & TextServer::BREAK_WORD_BOUND) == TextServer::BREAK_WORD_BOUND) || ((flags & TextServer::BREAK_GRAPHEME_BOUND) == TextServer::BREAK_GRAPHEME_BOUND);
|
|
|
+
|
|
|
+ // Fill after min_size calculation.
|
|
|
+ if (autowrap_enabled) {
|
|
|
+ int visible_lines = (max_lines_visible >= 0) ? MIN(max_lines_visible, lines_rid.size()) : lines_rid.size();
|
|
|
+ bool lines_hidden = visible_lines > 0 && visible_lines < lines_rid.size();
|
|
|
+ if (lines_hidden) {
|
|
|
+ overrun_flags |= TextServer::OVERRUN_ENFORCE_ELLIPSIS;
|
|
|
+ }
|
|
|
+ if (align == HALIGN_FILL) {
|
|
|
+ for (int i = 0; i < lines_rid.size(); i++) {
|
|
|
+ if (i < visible_lines - 1 || lines_rid.size() == 1) {
|
|
|
+ TS->shaped_text_fit_to_width(lines_rid[i], width, flags);
|
|
|
+ } else if (i == (visible_lines - 1)) {
|
|
|
+ TS->shaped_text_overrun_trim_to_width(lines_rid[visible_lines - 1], width, overrun_flags);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ } else if (lines_hidden) {
|
|
|
+ TS->shaped_text_overrun_trim_to_width(lines_rid[visible_lines - 1], width, overrun_flags);
|
|
|
+ }
|
|
|
+
|
|
|
+ } else {
|
|
|
+ // Autowrap disabled.
|
|
|
+ for (int i = 0; i < lines_rid.size(); i++) {
|
|
|
+ if (align == HALIGN_FILL) {
|
|
|
+ TS->shaped_text_fit_to_width(lines_rid[i], width, flags);
|
|
|
+ overrun_flags |= TextServer::OVERRUN_JUSTIFICATION_AWARE;
|
|
|
+ TS->shaped_text_overrun_trim_to_width(lines_rid[i], width, overrun_flags);
|
|
|
+ TS->shaped_text_fit_to_width(lines_rid[i], width, flags | TextServer::JUSTIFICATION_CONSTRAIN_ELLIPSIS);
|
|
|
+ } else {
|
|
|
+ TS->shaped_text_overrun_trim_to_width(lines_rid[i], width, overrun_flags);
|
|
|
+ }
|
|
|
}
|
|
|
- lines.push_back(line);
|
|
|
}
|
|
|
- dirty_lines = false;
|
|
|
+ lines_dirty = false;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -184,8 +254,8 @@ RID TextParagraph::get_rid() const {
|
|
|
|
|
|
RID TextParagraph::get_line_rid(int p_line) const {
|
|
|
const_cast<TextParagraph *>(this)->_shape_lines();
|
|
|
- ERR_FAIL_COND_V(p_line < 0 || p_line >= lines.size(), RID());
|
|
|
- return lines[p_line];
|
|
|
+ ERR_FAIL_COND_V(p_line < 0 || p_line >= lines_rid.size(), RID());
|
|
|
+ return lines_rid[p_line];
|
|
|
}
|
|
|
|
|
|
RID TextParagraph::get_dropcap_rid() const {
|
|
|
@@ -195,10 +265,10 @@ RID TextParagraph::get_dropcap_rid() const {
|
|
|
void TextParagraph::clear() {
|
|
|
spacing_top = 0;
|
|
|
spacing_bottom = 0;
|
|
|
- for (int i = 0; i < lines.size(); i++) {
|
|
|
- TS->free(lines[i]);
|
|
|
+ for (int i = 0; i < lines_rid.size(); i++) {
|
|
|
+ TS->free(lines_rid[i]);
|
|
|
}
|
|
|
- lines.clear();
|
|
|
+ lines_rid.clear();
|
|
|
TS->shaped_text_clear(rid);
|
|
|
TS->shaped_text_clear(dropcap_rid);
|
|
|
}
|
|
|
@@ -206,7 +276,7 @@ void TextParagraph::clear() {
|
|
|
void TextParagraph::set_preserve_invalid(bool p_enabled) {
|
|
|
TS->shaped_text_set_preserve_invalid(rid, p_enabled);
|
|
|
TS->shaped_text_set_preserve_invalid(dropcap_rid, p_enabled);
|
|
|
- dirty_lines = true;
|
|
|
+ lines_dirty = true;
|
|
|
}
|
|
|
|
|
|
bool TextParagraph::get_preserve_invalid() const {
|
|
|
@@ -216,7 +286,7 @@ bool TextParagraph::get_preserve_invalid() const {
|
|
|
void TextParagraph::set_preserve_control(bool p_enabled) {
|
|
|
TS->shaped_text_set_preserve_control(rid, p_enabled);
|
|
|
TS->shaped_text_set_preserve_control(dropcap_rid, p_enabled);
|
|
|
- dirty_lines = true;
|
|
|
+ lines_dirty = true;
|
|
|
}
|
|
|
|
|
|
bool TextParagraph::get_preserve_control() const {
|
|
|
@@ -226,7 +296,7 @@ bool TextParagraph::get_preserve_control() const {
|
|
|
void TextParagraph::set_direction(TextServer::Direction p_direction) {
|
|
|
TS->shaped_text_set_direction(rid, p_direction);
|
|
|
TS->shaped_text_set_direction(dropcap_rid, p_direction);
|
|
|
- dirty_lines = true;
|
|
|
+ lines_dirty = true;
|
|
|
}
|
|
|
|
|
|
TextServer::Direction TextParagraph::get_direction() const {
|
|
|
@@ -237,7 +307,7 @@ TextServer::Direction TextParagraph::get_direction() const {
|
|
|
void TextParagraph::set_orientation(TextServer::Orientation p_orientation) {
|
|
|
TS->shaped_text_set_orientation(rid, p_orientation);
|
|
|
TS->shaped_text_set_orientation(dropcap_rid, p_orientation);
|
|
|
- dirty_lines = true;
|
|
|
+ lines_dirty = true;
|
|
|
}
|
|
|
|
|
|
TextServer::Orientation TextParagraph::get_orientation() const {
|
|
|
@@ -250,14 +320,14 @@ bool TextParagraph::set_dropcap(const String &p_text, const Ref<Font> &p_fonts,
|
|
|
TS->shaped_text_clear(dropcap_rid);
|
|
|
dropcap_margins = p_dropcap_margins;
|
|
|
bool res = TS->shaped_text_add_string(dropcap_rid, p_text, p_fonts->get_rids(), p_size, p_opentype_features, p_language);
|
|
|
- dirty_lines = true;
|
|
|
+ lines_dirty = true;
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
void TextParagraph::clear_dropcap() {
|
|
|
dropcap_margins = Rect2();
|
|
|
TS->shaped_text_clear(dropcap_rid);
|
|
|
- dirty_lines = true;
|
|
|
+ lines_dirty = true;
|
|
|
}
|
|
|
|
|
|
bool TextParagraph::add_string(const String &p_text, const Ref<Font> &p_fonts, int p_size, const Dictionary &p_opentype_features, const String &p_language) {
|
|
|
@@ -265,7 +335,7 @@ bool TextParagraph::add_string(const String &p_text, const Ref<Font> &p_fonts, i
|
|
|
bool res = TS->shaped_text_add_string(rid, p_text, p_fonts->get_rids(), p_size, p_opentype_features, p_language);
|
|
|
spacing_top = p_fonts->get_spacing(Font::SPACING_TOP);
|
|
|
spacing_bottom = p_fonts->get_spacing(Font::SPACING_BOTTOM);
|
|
|
- dirty_lines = true;
|
|
|
+ lines_dirty = true;
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -287,18 +357,18 @@ void TextParagraph::_set_bidi_override(const Array &p_override) {
|
|
|
|
|
|
void TextParagraph::set_bidi_override(const Vector<Vector2i> &p_override) {
|
|
|
TS->shaped_text_set_bidi_override(rid, p_override);
|
|
|
- dirty_lines = true;
|
|
|
+ lines_dirty = true;
|
|
|
}
|
|
|
|
|
|
bool TextParagraph::add_object(Variant p_key, const Size2 &p_size, VAlign p_inline_align, int p_length) {
|
|
|
bool res = TS->shaped_text_add_object(rid, p_key, p_size, p_inline_align, p_length);
|
|
|
- dirty_lines = true;
|
|
|
+ lines_dirty = true;
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
bool TextParagraph::resize_object(Variant p_key, const Size2 &p_size, VAlign p_inline_align) {
|
|
|
bool res = TS->shaped_text_resize_object(rid, p_key, p_size, p_inline_align);
|
|
|
- dirty_lines = true;
|
|
|
+ lines_dirty = true;
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -306,7 +376,7 @@ void TextParagraph::set_align(HAlign p_align) {
|
|
|
if (align != p_align) {
|
|
|
if (align == HALIGN_FILL || p_align == HALIGN_FILL) {
|
|
|
align = p_align;
|
|
|
- dirty_lines = true;
|
|
|
+ lines_dirty = true;
|
|
|
} else {
|
|
|
align = p_align;
|
|
|
}
|
|
|
@@ -319,13 +389,13 @@ HAlign TextParagraph::get_align() const {
|
|
|
|
|
|
void TextParagraph::tab_align(const Vector<float> &p_tab_stops) {
|
|
|
tab_stops = p_tab_stops;
|
|
|
- dirty_lines = true;
|
|
|
+ lines_dirty = true;
|
|
|
}
|
|
|
|
|
|
void TextParagraph::set_flags(uint8_t p_flags) {
|
|
|
if (flags != p_flags) {
|
|
|
flags = p_flags;
|
|
|
- dirty_lines = true;
|
|
|
+ lines_dirty = true;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -333,10 +403,21 @@ uint8_t TextParagraph::get_flags() const {
|
|
|
return flags;
|
|
|
}
|
|
|
|
|
|
+void TextParagraph::set_text_overrun_behavior(TextParagraph::OverrunBehavior p_behavior) {
|
|
|
+ if (overrun_behavior != p_behavior) {
|
|
|
+ overrun_behavior = p_behavior;
|
|
|
+ lines_dirty = true;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+TextParagraph::OverrunBehavior TextParagraph::get_text_overrun_behavior() const {
|
|
|
+ return overrun_behavior;
|
|
|
+}
|
|
|
+
|
|
|
void TextParagraph::set_width(float p_width) {
|
|
|
if (width != p_width) {
|
|
|
width = p_width;
|
|
|
- dirty_lines = true;
|
|
|
+ lines_dirty = true;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -356,9 +437,9 @@ Size2 TextParagraph::get_non_wraped_size() const {
|
|
|
Size2 TextParagraph::get_size() const {
|
|
|
const_cast<TextParagraph *>(this)->_shape_lines();
|
|
|
Size2 size;
|
|
|
- for (int i = 0; i < lines.size(); i++) {
|
|
|
- Size2 lsize = TS->shaped_text_get_size(lines[i]);
|
|
|
- if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ for (int i = 0; i < lines_rid.size(); i++) {
|
|
|
+ Size2 lsize = TS->shaped_text_get_size(lines_rid[i]);
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
size.x = MAX(size.x, lsize.x);
|
|
|
size.y += lsize.y + spacing_top + spacing_bottom;
|
|
|
} else {
|
|
|
@@ -371,22 +452,33 @@ Size2 TextParagraph::get_size() const {
|
|
|
|
|
|
int TextParagraph::get_line_count() const {
|
|
|
const_cast<TextParagraph *>(this)->_shape_lines();
|
|
|
- return lines.size();
|
|
|
+ return lines_rid.size();
|
|
|
+}
|
|
|
+
|
|
|
+void TextParagraph::set_max_lines_visible(int p_lines) {
|
|
|
+ if (p_lines != max_lines_visible) {
|
|
|
+ max_lines_visible = p_lines;
|
|
|
+ lines_dirty = true;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+int TextParagraph::get_max_lines_visible() const {
|
|
|
+ return max_lines_visible;
|
|
|
}
|
|
|
|
|
|
Array TextParagraph::get_line_objects(int p_line) const {
|
|
|
const_cast<TextParagraph *>(this)->_shape_lines();
|
|
|
- ERR_FAIL_COND_V(p_line < 0 || p_line >= lines.size(), Array());
|
|
|
- return TS->shaped_text_get_objects(lines[p_line]);
|
|
|
+ ERR_FAIL_COND_V(p_line < 0 || p_line >= lines_rid.size(), Array());
|
|
|
+ return TS->shaped_text_get_objects(lines_rid[p_line]);
|
|
|
}
|
|
|
|
|
|
Rect2 TextParagraph::get_line_object_rect(int p_line, Variant p_key) const {
|
|
|
const_cast<TextParagraph *>(this)->_shape_lines();
|
|
|
- ERR_FAIL_COND_V(p_line < 0 || p_line >= lines.size(), Rect2());
|
|
|
- Rect2 xrect = TS->shaped_text_get_object_rect(lines[p_line], p_key);
|
|
|
+ ERR_FAIL_COND_V(p_line < 0 || p_line >= lines_rid.size(), Rect2());
|
|
|
+ Rect2 xrect = TS->shaped_text_get_object_rect(lines_rid[p_line], p_key);
|
|
|
for (int i = 0; i < p_line; i++) {
|
|
|
- Size2 lsize = TS->shaped_text_get_size(lines[i]);
|
|
|
- if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ Size2 lsize = TS->shaped_text_get_size(lines_rid[i]);
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
xrect.position.y += lsize.y + spacing_top + spacing_bottom;
|
|
|
} else {
|
|
|
xrect.position.x += lsize.x + spacing_top + spacing_bottom;
|
|
|
@@ -397,48 +489,48 @@ Rect2 TextParagraph::get_line_object_rect(int p_line, Variant p_key) const {
|
|
|
|
|
|
Size2 TextParagraph::get_line_size(int p_line) const {
|
|
|
const_cast<TextParagraph *>(this)->_shape_lines();
|
|
|
- ERR_FAIL_COND_V(p_line < 0 || p_line >= lines.size(), Size2());
|
|
|
- if (TS->shaped_text_get_orientation(lines[p_line]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
- return Size2(TS->shaped_text_get_size(lines[p_line]).x, TS->shaped_text_get_size(lines[p_line]).y + spacing_top + spacing_bottom);
|
|
|
+ ERR_FAIL_COND_V(p_line < 0 || p_line >= lines_rid.size(), Size2());
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[p_line]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ return Size2(TS->shaped_text_get_size(lines_rid[p_line]).x, TS->shaped_text_get_size(lines_rid[p_line]).y + spacing_top + spacing_bottom);
|
|
|
} else {
|
|
|
- return Size2(TS->shaped_text_get_size(lines[p_line]).x + spacing_top + spacing_bottom, TS->shaped_text_get_size(lines[p_line]).y);
|
|
|
+ return Size2(TS->shaped_text_get_size(lines_rid[p_line]).x + spacing_top + spacing_bottom, TS->shaped_text_get_size(lines_rid[p_line]).y);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
Vector2i TextParagraph::get_line_range(int p_line) const {
|
|
|
const_cast<TextParagraph *>(this)->_shape_lines();
|
|
|
- ERR_FAIL_COND_V(p_line < 0 || p_line >= lines.size(), Vector2i());
|
|
|
- return TS->shaped_text_get_range(lines[p_line]);
|
|
|
+ ERR_FAIL_COND_V(p_line < 0 || p_line >= lines_rid.size(), Vector2i());
|
|
|
+ return TS->shaped_text_get_range(lines_rid[p_line]);
|
|
|
}
|
|
|
|
|
|
float TextParagraph::get_line_ascent(int p_line) const {
|
|
|
const_cast<TextParagraph *>(this)->_shape_lines();
|
|
|
- ERR_FAIL_COND_V(p_line < 0 || p_line >= lines.size(), 0.f);
|
|
|
- return TS->shaped_text_get_ascent(lines[p_line]) + spacing_top;
|
|
|
+ ERR_FAIL_COND_V(p_line < 0 || p_line >= lines_rid.size(), 0.f);
|
|
|
+ return TS->shaped_text_get_ascent(lines_rid[p_line]) + spacing_top;
|
|
|
}
|
|
|
|
|
|
float TextParagraph::get_line_descent(int p_line) const {
|
|
|
const_cast<TextParagraph *>(this)->_shape_lines();
|
|
|
- ERR_FAIL_COND_V(p_line < 0 || p_line >= lines.size(), 0.f);
|
|
|
- return TS->shaped_text_get_descent(lines[p_line]) + spacing_bottom;
|
|
|
+ ERR_FAIL_COND_V(p_line < 0 || p_line >= lines_rid.size(), 0.f);
|
|
|
+ return TS->shaped_text_get_descent(lines_rid[p_line]) + spacing_bottom;
|
|
|
}
|
|
|
|
|
|
float TextParagraph::get_line_width(int p_line) const {
|
|
|
const_cast<TextParagraph *>(this)->_shape_lines();
|
|
|
- ERR_FAIL_COND_V(p_line < 0 || p_line >= lines.size(), 0.f);
|
|
|
- return TS->shaped_text_get_width(lines[p_line]);
|
|
|
+ ERR_FAIL_COND_V(p_line < 0 || p_line >= lines_rid.size(), 0.f);
|
|
|
+ return TS->shaped_text_get_width(lines_rid[p_line]);
|
|
|
}
|
|
|
|
|
|
float TextParagraph::get_line_underline_position(int p_line) const {
|
|
|
const_cast<TextParagraph *>(this)->_shape_lines();
|
|
|
- ERR_FAIL_COND_V(p_line < 0 || p_line >= lines.size(), 0.f);
|
|
|
- return TS->shaped_text_get_underline_position(lines[p_line]);
|
|
|
+ ERR_FAIL_COND_V(p_line < 0 || p_line >= lines_rid.size(), 0.f);
|
|
|
+ return TS->shaped_text_get_underline_position(lines_rid[p_line]);
|
|
|
}
|
|
|
|
|
|
float TextParagraph::get_line_underline_thickness(int p_line) const {
|
|
|
const_cast<TextParagraph *>(this)->_shape_lines();
|
|
|
- ERR_FAIL_COND_V(p_line < 0 || p_line >= lines.size(), 0.f);
|
|
|
- return TS->shaped_text_get_underline_thickness(lines[p_line]);
|
|
|
+ ERR_FAIL_COND_V(p_line < 0 || p_line >= lines_rid.size(), 0.f);
|
|
|
+ return TS->shaped_text_get_underline_thickness(lines_rid[p_line]);
|
|
|
}
|
|
|
|
|
|
Size2 TextParagraph::get_dropcap_size() const {
|
|
|
@@ -472,11 +564,13 @@ void TextParagraph::draw(RID p_canvas, const Vector2 &p_pos, const Color &p_colo
|
|
|
TS->shaped_text_draw(dropcap_rid, p_canvas, dc_off + Vector2(0, TS->shaped_text_get_ascent(dropcap_rid) + dropcap_margins.size.y + dropcap_margins.position.y / 2), -1, -1, p_dc_color);
|
|
|
}
|
|
|
|
|
|
- for (int i = 0; i < lines.size(); i++) {
|
|
|
+ int lines_visible = (max_lines_visible >= 0) ? MIN(max_lines_visible, lines_rid.size()) : lines_rid.size();
|
|
|
+
|
|
|
+ for (int i = 0; i < lines_visible; i++) {
|
|
|
float l_width = width;
|
|
|
- if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
ofs.x = p_pos.x;
|
|
|
- ofs.y += TS->shaped_text_get_ascent(lines[i]) + spacing_top;
|
|
|
+ ofs.y += TS->shaped_text_get_ascent(lines_rid[i]) + spacing_top;
|
|
|
if (i <= dropcap_lines) {
|
|
|
if (TS->shaped_text_get_direction(dropcap_rid) == TextServer::DIRECTION_LTR) {
|
|
|
ofs.x -= h_offset;
|
|
|
@@ -485,7 +579,7 @@ void TextParagraph::draw(RID p_canvas, const Vector2 &p_pos, const Color &p_colo
|
|
|
}
|
|
|
} else {
|
|
|
ofs.y = p_pos.y;
|
|
|
- ofs.x += TS->shaped_text_get_ascent(lines[i]) + spacing_top;
|
|
|
+ ofs.x += TS->shaped_text_get_ascent(lines_rid[i]) + spacing_top;
|
|
|
if (i <= dropcap_lines) {
|
|
|
if (TS->shaped_text_get_direction(dropcap_rid) == TextServer::DIRECTION_LTR) {
|
|
|
ofs.x -= h_offset;
|
|
|
@@ -493,21 +587,29 @@ void TextParagraph::draw(RID p_canvas, const Vector2 &p_pos, const Color &p_colo
|
|
|
l_width -= h_offset;
|
|
|
}
|
|
|
}
|
|
|
- float length = TS->shaped_text_get_width(lines[i]);
|
|
|
+ float length = TS->shaped_text_get_width(lines_rid[i]);
|
|
|
if (width > 0) {
|
|
|
switch (align) {
|
|
|
case HALIGN_FILL:
|
|
|
+ if (TS->shaped_text_get_direction(lines_rid[i]) == TextServer::DIRECTION_RTL) {
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ ofs.x += l_width - length;
|
|
|
+ } else {
|
|
|
+ ofs.y += l_width - length;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ break;
|
|
|
case HALIGN_LEFT:
|
|
|
break;
|
|
|
case HALIGN_CENTER: {
|
|
|
- if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
ofs.x += Math::floor((l_width - length) / 2.0);
|
|
|
} else {
|
|
|
ofs.y += Math::floor((l_width - length) / 2.0);
|
|
|
}
|
|
|
} break;
|
|
|
case HALIGN_RIGHT: {
|
|
|
- if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
ofs.x += l_width - length;
|
|
|
} else {
|
|
|
ofs.y += l_width - length;
|
|
|
@@ -516,18 +618,18 @@ void TextParagraph::draw(RID p_canvas, const Vector2 &p_pos, const Color &p_colo
|
|
|
}
|
|
|
}
|
|
|
float clip_l;
|
|
|
- if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
clip_l = MAX(0, p_pos.x - ofs.x);
|
|
|
} else {
|
|
|
clip_l = MAX(0, p_pos.y - ofs.y);
|
|
|
}
|
|
|
- TS->shaped_text_draw(lines[i], p_canvas, ofs, clip_l, clip_l + l_width, p_color);
|
|
|
- if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ TS->shaped_text_draw(lines_rid[i], p_canvas, ofs, clip_l, clip_l + l_width, p_color);
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
ofs.x = p_pos.x;
|
|
|
- ofs.y += TS->shaped_text_get_descent(lines[i]) + spacing_bottom;
|
|
|
+ ofs.y += TS->shaped_text_get_descent(lines_rid[i]) + spacing_bottom;
|
|
|
} else {
|
|
|
ofs.y = p_pos.y;
|
|
|
- ofs.x += TS->shaped_text_get_descent(lines[i]) + spacing_bottom;
|
|
|
+ ofs.x += TS->shaped_text_get_descent(lines_rid[i]) + spacing_bottom;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -556,11 +658,11 @@ void TextParagraph::draw_outline(RID p_canvas, const Vector2 &p_pos, int p_outli
|
|
|
TS->shaped_text_draw_outline(dropcap_rid, p_canvas, dc_off + Vector2(dropcap_margins.position.x, TS->shaped_text_get_ascent(dropcap_rid) + dropcap_margins.position.y), -1, -1, p_outline_size, p_dc_color);
|
|
|
}
|
|
|
|
|
|
- for (int i = 0; i < lines.size(); i++) {
|
|
|
+ for (int i = 0; i < lines_rid.size(); i++) {
|
|
|
float l_width = width;
|
|
|
- if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
ofs.x = p_pos.x;
|
|
|
- ofs.y += TS->shaped_text_get_ascent(lines[i]) + spacing_top;
|
|
|
+ ofs.y += TS->shaped_text_get_ascent(lines_rid[i]) + spacing_top;
|
|
|
if (i <= dropcap_lines) {
|
|
|
if (TS->shaped_text_get_direction(dropcap_rid) == TextServer::DIRECTION_LTR) {
|
|
|
ofs.x -= h_offset;
|
|
|
@@ -569,7 +671,7 @@ void TextParagraph::draw_outline(RID p_canvas, const Vector2 &p_pos, int p_outli
|
|
|
}
|
|
|
} else {
|
|
|
ofs.y = p_pos.y;
|
|
|
- ofs.x += TS->shaped_text_get_ascent(lines[i]) + spacing_top;
|
|
|
+ ofs.x += TS->shaped_text_get_ascent(lines_rid[i]) + spacing_top;
|
|
|
if (i <= dropcap_lines) {
|
|
|
if (TS->shaped_text_get_direction(dropcap_rid) == TextServer::DIRECTION_LTR) {
|
|
|
ofs.x -= h_offset;
|
|
|
@@ -577,21 +679,29 @@ void TextParagraph::draw_outline(RID p_canvas, const Vector2 &p_pos, int p_outli
|
|
|
l_width -= h_offset;
|
|
|
}
|
|
|
}
|
|
|
- float length = TS->shaped_text_get_width(lines[i]);
|
|
|
+ float length = TS->shaped_text_get_width(lines_rid[i]);
|
|
|
if (width > 0) {
|
|
|
switch (align) {
|
|
|
case HALIGN_FILL:
|
|
|
+ if (TS->shaped_text_get_direction(lines_rid[i]) == TextServer::DIRECTION_RTL) {
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ ofs.x += l_width - length;
|
|
|
+ } else {
|
|
|
+ ofs.y += l_width - length;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ break;
|
|
|
case HALIGN_LEFT:
|
|
|
break;
|
|
|
case HALIGN_CENTER: {
|
|
|
- if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
ofs.x += Math::floor((l_width - length) / 2.0);
|
|
|
} else {
|
|
|
ofs.y += Math::floor((l_width - length) / 2.0);
|
|
|
}
|
|
|
} break;
|
|
|
case HALIGN_RIGHT: {
|
|
|
- if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
ofs.x += l_width - length;
|
|
|
} else {
|
|
|
ofs.y += l_width - length;
|
|
|
@@ -600,18 +710,18 @@ void TextParagraph::draw_outline(RID p_canvas, const Vector2 &p_pos, int p_outli
|
|
|
}
|
|
|
}
|
|
|
float clip_l;
|
|
|
- if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
clip_l = MAX(0, p_pos.x - ofs.x);
|
|
|
} else {
|
|
|
clip_l = MAX(0, p_pos.y - ofs.y);
|
|
|
}
|
|
|
- TS->shaped_text_draw_outline(lines[i], p_canvas, ofs, clip_l, clip_l + l_width, p_outline_size, p_color);
|
|
|
- if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ TS->shaped_text_draw_outline(lines_rid[i], p_canvas, ofs, clip_l, clip_l + l_width, p_outline_size, p_color);
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
ofs.x = p_pos.x;
|
|
|
- ofs.y += TS->shaped_text_get_descent(lines[i]) + spacing_bottom;
|
|
|
+ ofs.y += TS->shaped_text_get_descent(lines_rid[i]) + spacing_bottom;
|
|
|
} else {
|
|
|
ofs.y = p_pos.y;
|
|
|
- ofs.x += TS->shaped_text_get_descent(lines[i]) + spacing_bottom;
|
|
|
+ ofs.x += TS->shaped_text_get_descent(lines_rid[i]) + spacing_bottom;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -628,17 +738,17 @@ int TextParagraph::hit_test(const Point2 &p_coords) const {
|
|
|
return 0;
|
|
|
}
|
|
|
}
|
|
|
- for (int i = 0; i < lines.size(); i++) {
|
|
|
- if (TS->shaped_text_get_orientation(lines[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
- if ((p_coords.y >= ofs.y) && (p_coords.y <= ofs.y + TS->shaped_text_get_size(lines[i]).y)) {
|
|
|
- return TS->shaped_text_hit_test_position(lines[i], p_coords.x);
|
|
|
+ for (int i = 0; i < lines_rid.size(); i++) {
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ if ((p_coords.y >= ofs.y) && (p_coords.y <= ofs.y + TS->shaped_text_get_size(lines_rid[i]).y)) {
|
|
|
+ return TS->shaped_text_hit_test_position(lines_rid[i], p_coords.x);
|
|
|
}
|
|
|
- ofs.y += TS->shaped_text_get_size(lines[i]).y + spacing_bottom + spacing_top;
|
|
|
+ ofs.y += TS->shaped_text_get_size(lines_rid[i]).y + spacing_bottom + spacing_top;
|
|
|
} else {
|
|
|
- if ((p_coords.x >= ofs.x) && (p_coords.x <= ofs.x + TS->shaped_text_get_size(lines[i]).x)) {
|
|
|
- return TS->shaped_text_hit_test_position(lines[i], p_coords.y);
|
|
|
+ if ((p_coords.x >= ofs.x) && (p_coords.x <= ofs.x + TS->shaped_text_get_size(lines_rid[i]).x)) {
|
|
|
+ return TS->shaped_text_hit_test_position(lines_rid[i], p_coords.y);
|
|
|
}
|
|
|
- ofs.y += TS->shaped_text_get_size(lines[i]).x + spacing_bottom + spacing_top;
|
|
|
+ ofs.y += TS->shaped_text_get_size(lines_rid[i]).x + spacing_bottom + spacing_top;
|
|
|
}
|
|
|
}
|
|
|
return TS->shaped_text_get_range(rid).y;
|
|
|
@@ -690,29 +800,29 @@ void TextParagraph::draw_dropcap_outline(RID p_canvas, const Vector2 &p_pos, int
|
|
|
|
|
|
void TextParagraph::draw_line(RID p_canvas, const Vector2 &p_pos, int p_line, const Color &p_color) const {
|
|
|
const_cast<TextParagraph *>(this)->_shape_lines();
|
|
|
- ERR_FAIL_COND(p_line < 0 || p_line >= lines.size());
|
|
|
+ ERR_FAIL_COND(p_line < 0 || p_line >= lines_rid.size());
|
|
|
|
|
|
Vector2 ofs = p_pos;
|
|
|
|
|
|
- if (TS->shaped_text_get_orientation(lines[p_line]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
- ofs.y += TS->shaped_text_get_ascent(lines[p_line]) + spacing_top;
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[p_line]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ ofs.y += TS->shaped_text_get_ascent(lines_rid[p_line]) + spacing_top;
|
|
|
} else {
|
|
|
- ofs.x += TS->shaped_text_get_ascent(lines[p_line]) + spacing_top;
|
|
|
+ ofs.x += TS->shaped_text_get_ascent(lines_rid[p_line]) + spacing_top;
|
|
|
}
|
|
|
- return TS->shaped_text_draw(lines[p_line], p_canvas, ofs, -1, -1, p_color);
|
|
|
+ return TS->shaped_text_draw(lines_rid[p_line], p_canvas, ofs, -1, -1, p_color);
|
|
|
}
|
|
|
|
|
|
void TextParagraph::draw_line_outline(RID p_canvas, const Vector2 &p_pos, int p_line, int p_outline_size, const Color &p_color) const {
|
|
|
const_cast<TextParagraph *>(this)->_shape_lines();
|
|
|
- ERR_FAIL_COND(p_line < 0 || p_line >= lines.size());
|
|
|
+ ERR_FAIL_COND(p_line < 0 || p_line >= lines_rid.size());
|
|
|
|
|
|
Vector2 ofs = p_pos;
|
|
|
- if (TS->shaped_text_get_orientation(lines[p_line]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
- ofs.y += TS->shaped_text_get_ascent(lines[p_line]) + spacing_top;
|
|
|
+ if (TS->shaped_text_get_orientation(lines_rid[p_line]) == TextServer::ORIENTATION_HORIZONTAL) {
|
|
|
+ ofs.y += TS->shaped_text_get_ascent(lines_rid[p_line]) + spacing_top;
|
|
|
} else {
|
|
|
- ofs.x += TS->shaped_text_get_ascent(lines[p_line]) + spacing_top;
|
|
|
+ ofs.x += TS->shaped_text_get_ascent(lines_rid[p_line]) + spacing_top;
|
|
|
}
|
|
|
- return TS->shaped_text_draw_outline(lines[p_line], p_canvas, ofs, -1, -1, p_outline_size, p_color);
|
|
|
+ return TS->shaped_text_draw_outline(lines_rid[p_line], p_canvas, ofs, -1, -1, p_outline_size, p_color);
|
|
|
}
|
|
|
|
|
|
TextParagraph::TextParagraph(const String &p_text, const Ref<Font> &p_fonts, int p_size, const Dictionary &p_opentype_features, const String &p_language, float p_width, TextServer::Direction p_direction, TextServer::Orientation p_orientation) {
|
|
|
@@ -729,10 +839,10 @@ TextParagraph::TextParagraph() {
|
|
|
}
|
|
|
|
|
|
TextParagraph::~TextParagraph() {
|
|
|
- for (int i = 0; i < lines.size(); i++) {
|
|
|
- TS->free(lines[i]);
|
|
|
+ for (int i = 0; i < lines_rid.size(); i++) {
|
|
|
+ TS->free(lines_rid[i]);
|
|
|
}
|
|
|
- lines.clear();
|
|
|
+ lines_rid.clear();
|
|
|
TS->free(rid);
|
|
|
TS->free(dropcap_rid);
|
|
|
}
|
Hendrik Brucker