improve edit

zlgopen · Feb 7, 2025 · 1490d3f · 1490d3f
1 parent aabdf10
commit 1490d3f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/docs/changes.md b/docs/changes.md
@@ -1,5 +1,8 @@
 # 最新动态
 
+2025/02/07
+  * 修复 edit 控件在 xml 上面 max 和 min 的顺序导致 edit 进入错误状态(感谢智明提供补丁)
+
 2025/02/05
   * 修复Linux音频初始化失败的问题(感谢朝泽发现问题)
 

diff --git a/src/widgets/edit.c b/src/widgets/edit.c
@@ -1073,6 +1073,8 @@ ret_t edit_set_text_limit(widget_t* widget, uint32_t min, uint32_t max) {
   edit->min = min;
   edit->max = max;
   edit->input_type = INPUT_TEXT;
+  edit_check_valid_value(widget);
+  edit_update_status(widget);
 
   return RET_OK;
 }
@@ -1090,6 +1092,8 @@ ret_t edit_set_int_limit(widget_t* widget, int32_t min, int32_t max, uint32_t st
     edit->max = (uint32_t)max;
   }
   edit->step = step;
+  edit_check_valid_value(widget);
+  edit_update_status(widget);
   return RET_OK;
 }
 
@@ -1104,7 +1108,8 @@ ret_t edit_set_float_limit(widget_t* widget, double min, double max, double step
   if (edit->input_type != INPUT_UFLOAT) {
     edit->input_type = INPUT_FLOAT;
   }
-
+  edit_check_valid_value(widget);
+  edit_update_status(widget);
   return RET_OK;
 }
 
@@ -1517,13 +1522,17 @@ ret_t edit_set_prop(widget_t* widget, const char* name, const value_t* v) {
     } else {
       edit->min = value_int(v);
     }
+    edit_check_valid_value(widget);
+    edit_update_status(widget);
     return RET_OK;
   } else if (tk_str_eq(name, WIDGET_PROP_MAX)) {
     if (input_type == INPUT_FLOAT || input_type == INPUT_UFLOAT) {
       edit->max = value_double(v);
     } else {
       edit->max = value_int64(v);
     }
+    edit_check_valid_value(widget);
+    edit_update_status(widget);
     return RET_OK;
   } else if (tk_str_eq(name, WIDGET_PROP_STEP)) {
     edit->step = value_double(v);