test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-11-30 02:58:26 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

improve text_edit

Browse Source
This commit is contained in:
lixianjing 2022-01-24 15:52:39 +08:00
parent fa1be0fcf0
commit 3d0866196f
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.md
View File

@ -3,6 +3,7 @@
2022/01/24 2022/01/24
* 优化tk\_strncpy（感谢智明提供补丁） * 优化tk\_strncpy（感谢智明提供补丁）
* 增加slider增加修改前景色的线帽形状属性（感谢智明提供补丁） * 增加slider增加修改前景色的线帽形状属性（感谢智明提供补丁）
* 修复demoui界面上有edit控件且控件中存在文本时切换主题会打印警告的问题（感谢兆坤提供补丁）
2022/01/23 2022/01/23
* 完善fscript debugger,支持attach/launch两种启动方式。 * 完善fscript debugger,支持attach/launch两种启动方式。

20
src/base/text_edit.c
View File

@ -256,11 +256,10 @@ static ret_t text_edit_set_caret_pos(text_edit_impl_t* impl, uint32_t x, uint32_
return RET_OK; return RET_OK;
} }
static uint32_t text_edit_measure_text(text_edit_t* text_edit, wchar_t* str, wchar_t mask_char, static uint32_t text_edit_measure_text_on_canvas(text_edit_t* text_edit, wchar_t* str,
uint32_t size) { wchar_t mask_char, uint32_t size, canvas_t* c) {
uint32_t i = 0; uint32_t i = 0;
uint32_t w = 0; uint32_t w = 0;
canvas_t* c = GET_CANVAS(text_edit);
DECL_IMPL(text_edit); DECL_IMPL(text_edit);
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
@ -274,6 +273,11 @@ static uint32_t text_edit_measure_text(text_edit_t* text_edit, wchar_t* str, wch
return w; return w;
} }
static uint32_t text_edit_measure_text(text_edit_t* text_edit, wchar_t* str, wchar_t mask_char,
uint32_t size) {
return text_edit_measure_text_on_canvas(text_edit, str, mask_char, size, GET_CANVAS(text_edit));
}
static row_info_t* text_edit_single_line_layout_line(text_edit_t* text_edit, uint32_t row_num, static row_info_t* text_edit_single_line_layout_line(text_edit_t* text_edit, uint32_t row_num,
uint32_t line_index, uint32_t offset) { uint32_t line_index, uint32_t offset) {
uint32_t y = 0; uint32_t y = 0;
@ -627,7 +631,7 @@ static ret_t text_edit_paint_tips_text(text_edit_t* text_edit, canvas_t* c) {
return RET_OK; return RET_OK;
} }
static int32_t text_edit_calc_x(text_edit_t* text_edit, line_info_t* iter) { static int32_t text_edit_calc_x_on_canvas(text_edit_t* text_edit, line_info_t* iter, canvas_t* c) {
DECL_IMPL(text_edit); DECL_IMPL(text_edit);
widget_t* widget = text_edit->widget; widget_t* widget = text_edit->widget;
wstr_t* text = &(widget->text); wstr_t* text = &(widget->text);
@ -636,7 +640,7 @@ static int32_t text_edit_calc_x(text_edit_t* text_edit, line_info_t* iter) {
align_h_t align_h = widget_get_text_align_h(text_edit->widget); align_h_t align_h = widget_get_text_align_h(text_edit->widget);
uint32_t row_width = uint32_t row_width =
text_edit_measure_text(text_edit, text->str + iter->offset, chr, iter->length); text_edit_measure_text_on_canvas(text_edit, text->str + iter->offset, chr, iter->length, c);
if (row_width < layout_info->w) { if (row_width < layout_info->w) {
switch (align_h) { switch (align_h) {
case ALIGN_H_CENTER: { case ALIGN_H_CENTER: {
@ -654,6 +658,10 @@ static int32_t text_edit_calc_x(text_edit_t* text_edit, line_info_t* iter) {
return 0; return 0;
} }
static int32_t text_edit_calc_x(text_edit_t* text_edit, line_info_t* iter) {
return text_edit_calc_x_on_canvas(text_edit, iter, GET_CANVAS(text_edit));
}
static ret_t text_edit_paint_line(text_edit_t* text_edit, canvas_t* c, line_info_t* iter, static ret_t text_edit_paint_line(text_edit_t* text_edit, canvas_t* c, line_info_t* iter,
uint32_t y) { uint32_t y) {
bidi_t b; bidi_t b;
@ -676,7 +684,7 @@ static ret_t text_edit_paint_line(text_edit_t* text_edit, canvas_t* c, line_info
uint32_t select_end = tk_max(state->select_start, state->select_end); uint32_t select_end = tk_max(state->select_start, state->select_end);
if (impl->single_line) { if (impl->single_line) {
x = layout_info->margin_l + text_edit_calc_x(text_edit, iter); x = layout_info->margin_l + text_edit_calc_x_on_canvas(text_edit, iter, c);
} else { } else {
x = layout_info->margin_l; x = layout_info->margin_l;
} }