Merge pull request #18909 from ianb96/getcharwidthfix
fix get_char_width for non-latin characters
This commit is contained in:
commit
6f4a90592f
|
@ -302,7 +302,7 @@ void TextEdit::Text::remove(int p_at) {
|
||||||
text.remove(p_at);
|
text.remove(p_at);
|
||||||
}
|
}
|
||||||
|
|
||||||
int TextEdit::Text::get_char_width(char c, char next_c, int px) const {
|
int TextEdit::Text::get_char_width(CharType c, CharType next_c, int px) const {
|
||||||
|
|
||||||
int tab_w = font->get_char_size(' ').width * indent_size;
|
int tab_w = font->get_char_size(' ').width * indent_size;
|
||||||
int w = 0;
|
int w = 0;
|
||||||
|
@ -3620,7 +3620,7 @@ void TextEdit::adjust_viewport_to_cursor() {
|
||||||
visible_width -= v_scroll->get_combined_minimum_size().width;
|
visible_width -= v_scroll->get_combined_minimum_size().width;
|
||||||
visible_width -= 20; // give it a little more space
|
visible_width -= 20; // give it a little more space
|
||||||
|
|
||||||
if (is_wrap_enabled()) {
|
if (!is_wrap_enabled()) {
|
||||||
// adjust x offset
|
// adjust x offset
|
||||||
int cursor_x = get_column_x_offset(cursor.column, text[cursor.line]);
|
int cursor_x = get_column_x_offset(cursor.column, text[cursor.line]);
|
||||||
|
|
||||||
|
|
|
@ -95,7 +95,7 @@ public:
|
||||||
void set_color_regions(const Vector<ColorRegion> *p_regions) { color_regions = p_regions; }
|
void set_color_regions(const Vector<ColorRegion> *p_regions) { color_regions = p_regions; }
|
||||||
int get_line_width(int p_line) const;
|
int get_line_width(int p_line) const;
|
||||||
int get_max_width(bool p_exclude_hidden = false) const;
|
int get_max_width(bool p_exclude_hidden = false) const;
|
||||||
int get_char_width(char c, char next_c, int px) const;
|
int get_char_width(CharType c, CharType next_c, int px) const;
|
||||||
void set_line_wrap_amount(int p_line, int p_wrap_amount) const;
|
void set_line_wrap_amount(int p_line, int p_wrap_amount) const;
|
||||||
int get_line_wrap_amount(int p_line) const;
|
int get_line_wrap_amount(int p_line) const;
|
||||||
const Map<int, ColorRegionInfo> &get_color_region_info(int p_line) const;
|
const Map<int, ColorRegionInfo> &get_color_region_info(int p_line) const;
|
||||||
|
|
Loading…
Reference in a new issue