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

improve text edit

Browse Source
This commit is contained in:
lixianjing 2021-08-17 17:30:37 +08:00
parent 69c02e1e60
commit 1493b5b880
2 changed files with 3 additions and 1 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 @@
2021/08/17
* 修复设置后台窗口焦点导致的问题。
* 完善slide menu(感谢兆坤提供补丁)。
* 完善text edit(感谢雨欣提供补丁)。
2021/08/16
* check button允许使用radio属性控制单选多选。

3
src/base/text_edit.c
View File

@ -452,7 +452,7 @@ static ret_t text_edit_layout_impl(text_edit_t* text_edit) {
wstr_t* text = &(text_edit->widget->text);
uint32_t size = text_edit->widget->text.size;
text_layout_info_t* layout_info = &(impl->layout_info);
uint32_t char_w = canvas_measure_text(c, text->str, 1) + CHAR_SPACING;
uint32_t char_w = 0;
uint32_t line_index = 0;
impl->caret.x = 0;
impl->caret.y = 0;
@ -463,6 +463,7 @@ static ret_t text_edit_layout_impl(text_edit_t* text_edit) {
widget_prepare_text_style(text_edit->widget, c);
impl->line_height = c->font_size * FONT_BASELINE;
widget_get_text_layout_info(text_edit->widget, layout_info);
char_w = canvas_measure_text(c, text->str, 1) + CHAR_SPACING;
if (layout_info->w < char_w) {
return RET_OK;