conr2d pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=eeb2809d9e0d6fd9ea30d1555946d4ff384791dc

commit eeb2809d9e0d6fd9ea30d1555946d4ff384791dc
Author: Jeeyong Um <con...@gmail.com>
Date:   Tue Nov 21 23:51:21 2017 +0900

    edje_cc: Not reset inherit_script during group inherit
    
    If group inherits after setting "inherit_script: 1;", inherit_script
    is overwritten by the value of parent group. However, inherit_script
    indicates user wants to inherit script in this context, it should not
    be initialized as false.
---
 src/bin/edje/edje_cc_handlers.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 74e5ad9c0d..c32609b1df 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -5034,7 +5034,8 @@ st_collections_group_inherit(void)
    pcp = (Edje_Part_Collection_Parser *)pc;
    pcp2 = (Edje_Part_Collection_Parser *)pc2;
    pcp->default_mouse_events = pcp2->default_mouse_events;
-   pcp->inherit_script = pcp2->inherit_script;
+   if (pcp2->inherit_script)
+     pcp->inherit_script = pcp2->inherit_script;
 
    /* as of 7 April 2014, target groups cannot be modified and are not freed.
     * this code will break if that ever changes.

-- 


Reply via email to