summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHermet Park <chuneon.park@samsung.com>2021-03-09 10:33:43 +0900
committerHermet Park <chuneon.park@samsung.com>2021-03-09 10:33:43 +0900
commit59453a5ab986539b68fdea9fff73ac7676f194ce (patch)
treec28b87a7632a9e6bc7738a95b594d9953e86d56b /src
parentea61e95e4cb0d8567300400373da290daa86d92f (diff)
parentd8023529a1d747e97babca90a1072be5cddecbb7 (diff)
Merge branch 'master' into devs/hermet/lottie
Diffstat (limited to 'src')
-rw-r--r--src/bin/elementary/config.c10
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c27
2 files changed, 27 insertions, 10 deletions
diff --git a/src/bin/elementary/config.c b/src/bin/elementary/config.c
index 70c9a519f1..1131437849 100644
--- a/src/bin/elementary/config.c
+++ b/src/bin/elementary/config.c
@@ -1591,7 +1591,9 @@ _icon_preview_icon_add(const char *icon, const char *theme)
1591 elm_box_pack_end(icon_preview_frame, ic); 1591 elm_box_pack_end(icon_preview_frame, ic);
1592 evas_object_show(ic); 1592 evas_object_show(ic);
1593 1593
1594 if (strcmp(theme, ELM_CONFIG_ICON_THEME_ELEMENTARY)) 1594 if (!strcmp(theme, ELM_CONFIG_ICON_THEME_ELEMENTARY))
1595 elm_icon_standard_set(ic, icon);
1596 else
1595 elm_image_file_set(ic, efreet_icon_path_find(theme, icon, 48), NULL); 1597 elm_image_file_set(ic, efreet_icon_path_find(theme, icon, 48), NULL);
1596} 1598}
1597 1599
@@ -1602,9 +1604,9 @@ _icon_preview_update(Evas_Object *win)
1602 const char **example_icon, *example_icons[] = 1604 const char **example_icon, *example_icons[] =
1603 { 1605 {
1604 "folder", 1606 "folder",
1605 "user-home", 1607 "video-display",
1606 "text-x-generic", 1608 "mail-unread",
1607 "system-run", 1609 "start-here",
1608 "preferences-system", 1610 "preferences-system",
1609 NULL, 1611 NULL,
1610 }; 1612 };
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 012a7f4374..a9e654bdcb 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -1377,12 +1377,27 @@ evas_object_smart_changed_get(Evas_Object_Protected_Data *obj)
1377 return EINA_FALSE; 1377 return EINA_FALSE;
1378 1378
1379 //b. Object clipper visibility 1379 //b. Object clipper visibility
1380 if ((obj->prev->clipper && obj->cur->clipper) && 1380 if (obj->prev->clipper && obj->cur->clipper)
1381 ((!obj->prev->clipper->cur->visible && 1381 {
1382 !obj->cur->clipper->cur->visible) || 1382 if (obj->prev->clipper != obj->cur->clipper)
1383 ((obj->prev->clipper->cur->color.a == 0) && 1383 {
1384 (obj->cur->clipper->cur->color.a == 0)))) 1384 /* check between prev clipper and current clipper */
1385 return EINA_FALSE; 1385 if ((!obj->prev->clipper->cur->visible &&
1386 !obj->cur->clipper->cur->visible) ||
1387 ((obj->prev->clipper->cur->color.a == 0) &&
1388 (obj->cur->clipper->cur->color.a == 0)))
1389 return EINA_FALSE;
1390 }
1391 else
1392 {
1393 /* check between prev value and current value of clipper */
1394 if ((!obj->cur->clipper->prev->visible &&
1395 !obj->cur->clipper->cur->visible) ||
1396 ((obj->cur->clipper->prev->color.a == 0) &&
1397 (obj->cur->clipper->cur->color.a == 0)))
1398 return EINA_FALSE;
1399 }
1400 }
1386 1401
1387 if (!obj->clip.clipees) 1402 if (!obj->clip.clipees)
1388 { 1403 {