asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #88185 from bruvzg/font_draw_no_ellipsis

Browse source 
[Font] Do not use trim with ellipsis in the basic Font string drawing functions.
This commit is contained in:
Rémi Verschelde 2024-02-15 17:35:44 +01:00
commit 7e14974d07
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/resources/font.cpp
View file

@ -288,6 +288,7 @@ Size2 Font::get_string_size(const String &p_text, HorizontalAlignment p_alignmen
buffer.instantiate();
buffer->set_direction(p_direction);
buffer->set_orientation(p_orientation);
buffer->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_CHAR);
buffer->add_string(p_text, Ref<Font>(this), p_font_size);
cache.insert(key, buffer);
}
@ -315,6 +316,7 @@ Size2 Font::get_multiline_string_size(const String &p_text, HorizontalAlignment
lines_buffer->set_width(p_width);
lines_buffer->set_break_flags(p_brk_flags);
lines_buffer->set_justification_flags(p_jst_flags);
lines_buffer->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_CHAR);
cache_wrap.insert(key, lines_buffer);
}
@ -335,6 +337,7 @@ void Font::draw_string(RID p_canvas_item, const Point2 &p_pos, const String &p_t
buffer.instantiate();
buffer->set_direction(p_direction);
buffer->set_orientation(p_orientation);
buffer->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_CHAR);
buffer->add_string(p_text, Ref<Font>(this), p_font_size);
cache.insert(key, buffer);
}
@ -369,6 +372,7 @@ void Font::draw_multiline_string(RID p_canvas_item, const Point2 &p_pos, const S
lines_buffer->set_width(p_width);
lines_buffer->set_break_flags(p_brk_flags);
lines_buffer->set_justification_flags(p_jst_flags);
lines_buffer->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_CHAR);
cache_wrap.insert(key, lines_buffer);
}
@ -396,6 +400,7 @@ void Font::draw_string_outline(RID p_canvas_item, const Point2 &p_pos, const Str
buffer.instantiate();
buffer->set_direction(p_direction);
buffer->set_orientation(p_orientation);
buffer->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_CHAR);
buffer->add_string(p_text, Ref<Font>(this), p_font_size);
cache.insert(key, buffer);
}
@ -430,6 +435,7 @@ void Font::draw_multiline_string_outline(RID p_canvas_item, const Point2 &p_pos,
lines_buffer->set_width(p_width);
lines_buffer->set_break_flags(p_brk_flags);
lines_buffer->set_justification_flags(p_jst_flags);
lines_buffer->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_CHAR);
cache_wrap.insert(key, lines_buffer);
}