summaryrefslogtreecommitdiff
path: root/src/lib/edje/edje_smart.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-09-11 13:38:21 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-09-11 13:38:21 -0400
commit54894824847c69b1acaa0a4382de6e39bf83a66b (patch)
tree93ac7ded917c606adac201128274b78b6e97cd51 /src/lib/edje/edje_smart.c
parent7f691b47fb1d9742380a0222915503110e5a22fa (diff)
efl: check file's mtime in efl.file::file_set to determine if file is the same
Summary: historically, if the mtime of an edj file changes after being loaded, the edje file should be reloaded. this needs to occur in a single call with the previous user definitions intact, so verify that the mtime is the same in efl.file::file_set when using the same file name @fix Reviewers: cedric Reviewed By: cedric Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9877
Diffstat (limited to 'src/lib/edje/edje_smart.c')
-rw-r--r--src/lib/edje/edje_smart.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 674c7cd..4801432 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -466,17 +466,7 @@ edje_object_mmap_set(Edje_Object *obj, const Eina_File *file, const char *group)
466EAPI Eina_Bool 466EAPI Eina_Bool
467edje_object_file_set(Edje_Object *obj, const char *file, const char *group) 467edje_object_file_set(Edje_Object *obj, const char *file, const char *group)
468{ 468{
469 // We can't blindly unload here - this loses swallowed content (in 469 /* mtime checking of file is handled in efl.file mixin */
470 // swallows, boxes, tables etc.) ... this here along with an actual
471 // implementation of file unload broke the pager in E for starters
472 // as shading then unshading (double click titlebar) a window would
473 // lose the mini preview image obj swallowed in. also fullscreening
474 // would do it. this also broke gadget bar, the xkb gadget in it too
475 // and more... so this is a particularly bad thing break. we need to
476 // iterate over every child and re-swallow, re-pack into boxes, tables
477 // etc. because that is what edje used to do. unloading here is definitely
478 // worse ... so disable for now.
479 // efl_file_unload(obj);
480 return efl_file_simple_load(obj, file, group); 470 return efl_file_simple_load(obj, file, group);
481} 471}
482 472