improve object wrapper event

zlgopen · Dec 31, 2023 · dd3da7e · dd3da7e
1 parent 82c82da
commit dd3da7e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/docs/changes.md b/docs/changes.md
@@ -1,5 +1,8 @@
 # 最新动态
 
+* 2023/12/30
+  * 修复view\_model\_object\_wrapper/view\_model\_array\_object\_wrapper 事件分发的问题。
+
 * 2023/12/29
   * 修复selected\_index可能大于size的问题。
 

diff --git a/src/mvvm/base/view_model_array_object_wrapper.c b/src/mvvm/base/view_model_array_object_wrapper.c
@@ -31,10 +31,12 @@ static ret_t view_model_array_object_wrapper_on_changed(void* ctx, event_t* e) {
 
   if (e->target == object_wrapper->obj) {
     e->target = object_wrapper;
+    emitter_dispatch(EMITTER(object_wrapper), e);
+    e->target = object_wrapper->obj;
+  } else {
+    emitter_dispatch(EMITTER(object_wrapper), e);
   }
 
-  emitter_dispatch(EMITTER(object_wrapper), e);
-
   return RET_OK;
 }
 

diff --git a/src/mvvm/base/view_model_object_wrapper.c b/src/mvvm/base/view_model_object_wrapper.c
@@ -30,10 +30,12 @@ static ret_t view_model_object_wrapper_on_changed(void* ctx, event_t* e) {
 
   if (e->target == object_wrapper->obj) {
     e->target = object_wrapper;
+    emitter_dispatch(EMITTER(object_wrapper), e);
+    e->target = object_wrapper->obj;
+  } else {
+    emitter_dispatch(EMITTER(object_wrapper), e);
   }
 
-  emitter_dispatch(EMITTER(object_wrapper), e);
-
   return RET_OK;
 }