summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaehyub Kim <taehyub.kim@samsung.com>2020-06-12 16:14:56 +0900
committerHermet Park <chuneon.park@samsung.com>2020-06-12 16:14:56 +0900
commit0826b4916efb0bce20a353cece56e84d05fb406c (patch)
tree85d806906de373a537821cabcb47f601e64934d3
parentb4f5d652598b8384ecb7e8e66fdbc0bfcf12d39e (diff)
efl_ui_image: fixed elm_image_preload_disabled_set api is not working when it is called before file set
Summary: when elm_image_preload_disabled_set(img, EINA_TRUE) is called before file set. The image preload is not canceled, because the function will be returned since the image is not loaded. so preload disabled api is fixed to work even if it is called before file set. @fix Reviewers: Hermet, kimcinoo, jsuya Reviewed By: Hermet Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11969
-rw-r--r--src/lib/elementary/efl_ui_image.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 4dea543391..55a197e7a0 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -2557,7 +2557,12 @@ elm_image_preload_disabled_set(Evas_Object *obj, Eina_Bool disable)
2557 EFL_UI_IMAGE_CHECK(obj); 2557 EFL_UI_IMAGE_CHECK(obj);
2558 EFL_UI_IMAGE_DATA_GET(obj, sd); 2558 EFL_UI_IMAGE_DATA_GET(obj, sd);
2559 2559
2560 if (sd->edje || !sd->img) return; 2560 if (sd->edje) return;
2561 if (!sd->img)
2562 {
2563 if (disable) sd->preload_status = EFL_UI_IMAGE_PRELOAD_DISABLED;
2564 return;
2565 }
2561 2566
2562 if (disable) 2567 if (disable)
2563 { 2568 {