cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7affe8c2047a41a2945cf6c048d59f28c974aa7a
commit 7affe8c2047a41a2945cf6c048d59f28c974aa7a Author: Cedric BAIL <[email protected]> Date: Thu Jul 21 11:17:51 2016 -0700 elementary: disable visual hint at odd/even. This is a work around a huge bug in how genlist handle index. Fixing it in genlist for this release is way to risky. The default theme is temporary updated to not use this feature and this patch should be reverted as soon as we start working on 1.19. --- data/elementary/themes/edc/elm/genlist.edc | 136 +++++++++++++++++------------ 1 file changed, 80 insertions(+), 56 deletions(-) diff --git a/data/elementary/themes/edc/elm/genlist.edc b/data/elementary/themes/edc/elm/genlist.edc index 288440a..3953e2a 100644 --- a/data/elementary/themes/edc/elm/genlist.edc +++ b/data/elementary/themes/edc/elm/genlist.edc @@ -282,12 +282,12 @@ group { "genlist_base"; inherit_only: 1; nomouse; program_source: "elm"; color: 64 64 64 255; color_class: "list_item_base"; link.base: "elm,state,even"; - } - desc { "odd"; - color: 56 56 56 255; - color_class: "list_item_base_odd"; link.base: "elm,state,odd"; } +// desc { "odd"; +// color: 56 56 56 255; +// color_class: "list_item_base_odd"; +// } } image { "bevel"; desc { "default"; @@ -389,6 +389,7 @@ group { "elm/genlist/item/default/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; + alias: "elm/genlist/item_odd/default/default"; parts { //##// text { "elm.text"; @@ -565,9 +566,9 @@ group { "elm/genlist/item/default/default"; nomouse; } inherit: "genlist_top"; } -ODD("elm/genlist/item_odd/default/default", "elm/genlist/item/default/default") +// ODD("elm/genlist/item_odd/default/default", "elm/genlist/item/default/default") COMPRESS("elm/genlist/item_compress/default/default", "elm/genlist/item/default/default") -COMPRESS_ODD("elm/genlist/item_compress_odd/default/default", "elm/genlist/item/default/default") +COMPRESS("elm/genlist/item_compress_odd/default/default", "elm/genlist/item/default/default") group { "elm/genlist/item/default_style/default"; nomouse; data.item: "selectraise" "on"; @@ -576,6 +577,7 @@ group { "elm/genlist/item/default_style/default"; nomouse; data.item: "contents" "elm.swallow.icon elm.swallow.end"; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; + alias: "elm/genlist/item_odd/default_style/default"; styles.style { "genlist_style"; base: "font="FN" font_size=10 align=left valign=0.5 color=#fff style=shadow,bottom shadow_color=#00000080 text_class=list_item"; tag: "br" "\n"; @@ -775,9 +777,9 @@ group { "elm/genlist/item/default_style/default"; nomouse; } inherit: "genlist_top"; } -ODD("elm/genlist/item_odd/default_style/default", "elm/genlist/item/default_style/default") +// ODD("elm/genlist/item_odd/default_style/default", "elm/genlist/item/default_style/default") COMPRESS("elm/genlist/item_compress/default_style/default", "elm/genlist/item/default_style/default") -COMPRESS_ODD("elm/genlist/item_compress_odd/default_style/default", "elm/genlist/item/default_style/default") +COMPRESS("elm/genlist/item_compress_odd/default_style/default", "elm/genlist/item/default_style/default") group { "elm/genlist/item/one_icon/default"; nomouse; data.item: "selectraise" "on"; @@ -787,6 +789,7 @@ group { "elm/genlist/item/one_icon/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; + alias: "elm/genlist/item_odd/one_icon/default"; parts { //##// @@ -946,9 +949,9 @@ group { "elm/genlist/item/one_icon/default"; nomouse; } inherit: "genlist_top"; } -ODD("elm/genlist/item_odd/one_icon/default", "elm/genlist/item/one_icon/default") +// ODD("elm/genlist/item_odd/one_icon/default", "elm/genlist/item/one_icon/default") COMPRESS("elm/genlist/item_compress/one_icon/default", "elm/genlist/item/one_icon/default") -COMPRESS_ODD("elm/genlist/item_compress_odd/one_icon/default", "elm/genlist/item/one_icon/default") +COMPRESS("elm/genlist/item_compress_odd/one_icon/default", "elm/genlist/item/one_icon/default") group { "elm/genlist/item/end_icon/default"; nomouse; data.item: "selectraise" "on"; @@ -958,6 +961,7 @@ group { "elm/genlist/item/end_icon/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; + alias: "elm/genlist/item_odd/end_icon/default"; parts { //##// @@ -1126,9 +1130,9 @@ group { "elm/genlist/item/end_icon/default"; nomouse; } inherit: "genlist_top"; } -ODD("elm/genlist/item_odd/end_icon/default", "elm/genlist/item/end_icon/default") +// ODD("elm/genlist/item_odd/end_icon/default", "elm/genlist/item/end_icon/default") COMPRESS("elm/genlist/item_compress/end_icon/default", "elm/genlist/item/end_icon/default") -COMPRESS_ODD("elm/genlist/item_compress_odd/end_icon/default", "elm/genlist/item/end_icon/default") +COMPRESS("elm/genlist/item_compress_odd/end_icon/default", "elm/genlist/item/end_icon/default") group { "elm/genlist/item/no_icon/default"; nomouse; data.item: "selectraise" "on"; @@ -1137,6 +1141,7 @@ group { "elm/genlist/item/no_icon/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; + alias: "elm/genlist/item_odd/no_icon/default"; parts { //##// @@ -1287,9 +1292,9 @@ group { "elm/genlist/item/no_icon/default"; nomouse; } inherit: "genlist_top"; } -ODD("elm/genlist/item_odd/no_icon/default", "elm/genlist/item/no_icon/default") +// ODD("elm/genlist/item_odd/no_icon/default", "elm/genlist/item/no_icon/default") COMPRESS("elm/genlist/item_compress/no_icon/default", "elm/genlist/item/no_icon/default") -COMPRESS_ODD("elm/genlist/item_compress_odd/no_icon/default", "elm/genlist/item/no_icon/default") +COMPRESS("elm/genlist/item_compress_odd/no_icon/default", "elm/genlist/item/no_icon/default") group { "elm/genlist/item/full/default"; nomouse; data.item: "selectraise" "on"; @@ -1298,6 +1303,7 @@ group { "elm/genlist/item/full/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; + alias: "elm/genlist/item_odd/full/default"; parts { //##// @@ -1326,7 +1332,7 @@ group { "elm/genlist/item/full/default"; nomouse; } inherit: "genlist_top"; } -ODD("elm/genlist/item_odd/full/default", "elm/genlist/item/full/default") +//ODD("elm/genlist/item_odd/full/default", "elm/genlist/item/full/default") group { "elm/genlist/item_compress/full/default"; inherit: "elm/genlist/item/full/default"; } @@ -1519,6 +1525,7 @@ group { "genlist_arrow"; inherit_only: 1; program_source: "elm"; //-- tree_compress_odd group { "elm/genlist/tree/default/default"; nomouse; inherit: "elm/genlist/item/default/default"; + alias: "elm/genlist/tree_odd/default/default"; // XXX: these need to be... done specially. // alias: "elm/genlist/tree/tree_effect/default"; // alias: "elm/genlist/item/tree_effect/default"; @@ -1542,12 +1549,13 @@ group { "elm/genlist/tree/default/default"; nomouse; } inherit: "genlist_arrow"; } -ODD("elm/genlist/tree_odd/default/default", "elm/genlist/tree/default/default") +//ODD("elm/genlist/tree_odd/default/default", "elm/genlist/tree/default/default") COMPRESS("elm/genlist/tree_compress/default/default", "elm/genlist/tree/default/default") -COMPRESS_ODD("elm/genlist/tree_compress_odd/default/default", "elm/genlist/tree/default/default") +COMPRESS("elm/genlist/tree_compress_odd/default/default", "elm/genlist/tree/default/default") group { "elm/genlist/tree/default_style/default"; inherit: "elm/genlist/item/default_style/default"; + alias: "elm/genlist/tree_odd/default_style/default"; parts { swallow { "elm.swallow.icon"; desc { "default"; @@ -1566,12 +1574,13 @@ group { "elm/genlist/tree/default_style/default"; } inherit: "genlist_arrow"; } -ODD("elm/genlist/tree_odd/default_style/default", "elm/genlist/tree/default_style/default") +//ODD("elm/genlist/tree_odd/default_style/default", "elm/genlist/tree/default_style/default") COMPRESS("elm/genlist/tree_compress/default_style/default", "elm/genlist/tree/default_style/default") -COMPRESS_ODD("elm/genlist/tree_compress_odd/default_style/default", "elm/genlist/tree/default_style/default") +COMPRESS("elm/genlist/tree_compress_odd/default_style/default", "elm/genlist/tree/default_style/default") group { "elm/genlist/tree/one_icon/default"; inherit: "elm/genlist/item/one_icon/default"; + alias: "elm/genlist/tree_odd/one_icon/default"; parts { swallow { "elm.swallow.icon"; desc { "default"; @@ -1590,12 +1599,13 @@ group { "elm/genlist/tree/one_icon/default"; } inherit: "genlist_arrow"; } -ODD("elm/genlist/tree_odd/one_icon/default", "elm/genlist/tree/one_icon/default") +//ODD("elm/genlist/tree_odd/one_icon/default", "elm/genlist/tree/one_icon/default") COMPRESS("elm/genlist/tree_compress/one_icon/default", "elm/genlist/tree/one_icon/default") -COMPRESS_ODD("elm/genlist/tree_compress_odd/one_icon/default", "elm/genlist/tree/one_icon/default") +COMPRESS("elm/genlist/tree_compress_odd/one_icon/default", "elm/genlist/tree/one_icon/default") group { "elm/genlist/tree/end_icon/default"; inherit: "elm/genlist/item/end_icon/default"; + alias: "elm/genlist/tree_odd/end_icon/default"; parts { text { "elm.text"; desc { "default"; @@ -1618,12 +1628,13 @@ group { "elm/genlist/tree/end_icon/default"; } inherit: "genlist_arrow"; } -ODD("elm/genlist/tree_odd/end_icon/default", "elm/genlist/tree/end_icon/default") +//ODD("elm/genlist/tree_odd/end_icon/default", "elm/genlist/tree/end_icon/default") COMPRESS("elm/genlist/tree_compress/end_icon/default", "elm/genlist/tree/end_icon/default") -COMPRESS_ODD("elm/genlist/tree_compress_odd/end_icon/default", "elm/genlist/tree/end_icon/default") +COMPRESS("elm/genlist/tree_compress_odd/end_icon/default", "elm/genlist/tree/end_icon/default") group { "elm/genlist/tree/no_icon/default"; inherit: "elm/genlist/item/no_icon/default"; + alias: "elm/genlist/tree_odd/no_icon/default"; parts { text { "elm.text"; desc { "default"; @@ -1646,12 +1657,13 @@ group { "elm/genlist/tree/no_icon/default"; } inherit: "genlist_arrow"; } -ODD("elm/genlist/tree_odd/no_icon/default", "elm/genlist/tree/no_icon/default") +//ODD("elm/genlist/tree_odd/no_icon/default", "elm/genlist/tree/no_icon/default") COMPRESS("elm/genlist/tree_compress/no_icon/default", "elm/genlist/tree/no_icon/default") -COMPRESS_ODD("elm/genlist/tree_compress_odd/no_icon/default", "elm/genlist/tree/no_icon/default") +COMPRESS("elm/genlist/tree_compress_odd/no_icon/default", "elm/genlist/tree/no_icon/default") group { "elm/genlist/tree/full/default"; inherit: "elm/genlist/item/full/default"; + alias: "elm/genlist/tree_odd/full/default"; parts { swallow { "elm.swallow.content"; desc { "default"; @@ -1674,7 +1686,7 @@ group { "elm/genlist/tree/full/default"; } inherit: "genlist_arrow"; } -ODD("elm/genlist/tree_odd/full/default", "elm/genlist/tree/full/default") +//ODD("elm/genlist/tree_odd/full/default", "elm/genlist/tree/full/default") group { "elm/genlist/tree_compress/full/default"; inherit: "elm/genlist/tree/full/default"; } @@ -1793,6 +1805,7 @@ group { "elm/genlist/item/icon_top_text_bottom/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; + alias: "elm/genlist/item_odd/icon_top_text_bottom/default"; parts { //##// @@ -1979,12 +1992,13 @@ group { "elm/genlist/item/icon_top_text_bottom/default"; nomouse; } inherit: "genlist_top"; } -ODD("elm/genlist/item_odd/icon_top_text_bottom/default", "elm/genlist/item/icon_top_text_bottom/default") +//ODD("elm/genlist/item_odd/icon_top_text_bottom/default", "elm/genlist/item/icon_top_text_bottom/default") COMPRESS("elm/genlist/item_compress/icon_top_text_bottom/default", "elm/genlist/item/icon_top_text_bottom/default") -COMPRESS_ODD("elm/genlist/item_compress_odd/icon_top_text_bottom/default", "elm/genlist/item/icon_top_text_bottom/default") +COMPRESS("elm/genlist/item_compress_odd/icon_top_text_bottom/default", "elm/genlist/item/icon_top_text_bottom/default") group { "elm/genlist/tree/icon_top_text_bottom/default"; inherit: "elm/genlist/item/icon_top_text_bottom/default"; + alias: "elm/genlist/tree_odd/icon_top_text_bottom/default"; parts { image { "sizer.content"; desc { "default"; @@ -2005,9 +2019,9 @@ group { "elm/genlist/tree/icon_top_text_bottom/default"; } inherit: "genlist_arrow"; } -ODD("elm/genlist/tree_odd/icon_top_text_bottom/default", "elm/genlist/tree/icon_top_text_bottom/default") +//ODD("elm/genlist/tree_odd/icon_top_text_bottom/default", "elm/genlist/tree/icon_top_text_bottom/default") COMPRESS("elm/genlist/tree_compress/icon_top_text_bottom/default", "elm/genlist/tree/icon_top_text_bottom/default") -COMPRESS_ODD("elm/genlist/tree_compress_odd/icon_top_text_bottom/default", "elm/genlist/tree/icon_top_text_bottom/default") +COMPRESS("elm/genlist/tree_compress_odd/icon_top_text_bottom/default", "elm/genlist/tree/icon_top_text_bottom/default") #define COMPRESS_SUB(_NAME, _SRC) \ group { name: _NAME; \ @@ -2204,6 +2218,7 @@ group { "elm/genlist/item/double_label/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; + alias: "elm/genlist/item_odd/double_label/default"; parts { //##// @@ -2486,12 +2501,13 @@ group { "elm/genlist/item/double_label/default"; nomouse; } inherit: "genlist_top"; } -ODD("elm/genlist/item_odd/double_label/default", "elm/genlist/item/double_label/default") +//ODD("elm/genlist/item_odd/double_label/default", "elm/genlist/item/double_label/default") COMPRESS_SUB("elm/genlist/item_compress/double_label/default", "elm/genlist/item/double_label/default") -COMPRESS_SUB_ODD("elm/genlist/item_compress_odd/double_label/default", "elm/genlist/item/double_label/default") +COMPRESS_SUB("elm/genlist/item_compress_odd/double_label/default", "elm/genlist/item/double_label/default") group { "elm/genlist/tree/double_label/default"; inherit: "elm/genlist/item/double_label/default"; + alias: "elm/genlist/tree_odd/double_label/default"; parts { swallow { "elm.swallow.icon"; desc { "default"; @@ -2510,9 +2526,9 @@ group { "elm/genlist/tree/double_label/default"; } inherit: "genlist_arrow"; } -ODD("elm/genlist/tree_odd/double_label/default", "elm/genlist/tree/double_label/default") +//ODD("elm/genlist/tree_odd/double_label/default", "elm/genlist/tree/double_label/default") COMPRESS_SUB("elm/genlist/tree_compress/double_label/default", "elm/genlist/tree/double_label/default") -COMPRESS_SUB_ODD("elm/genlist/tree_compress_odd/double_label/default", "elm/genlist/tree/double_label/default") +COMPRESS_SUB("elm/genlist/tree_compress_odd/double_label/default", "elm/genlist/tree/double_label/default") #define COMPRESS_T1T2(_NAME, _SRC) \ group { name: _NAME; \ @@ -2792,6 +2808,7 @@ group { "elm/genlist/item/message/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; + alias: "elm/genlist/item_odd/message/default"; parts { //##// @@ -3131,9 +3148,9 @@ group { "elm/genlist/item/message/default"; nomouse; } inherit: "genlist_top"; } -ODD("elm/genlist/item_odd/message/default", "elm/genlist/item/message/default") +//ODD("elm/genlist/item_odd/message/default", "elm/genlist/item/message/default") COMPRESS_T1T2("elm/genlist/item_compress/message/default", "elm/genlist/item/message/default") -COMPRESS_T1T2_ODD("elm/genlist/item_compress_odd/message/default", "elm/genlist/item/message/default") +COMPRESS_T1T2("elm/genlist/item_compress_odd/message/default", "elm/genlist/item/message/default") group { "elm/genlist/item/media/default"; nomouse; data.item: "selectraise" "on"; @@ -3142,6 +3159,7 @@ group { "elm/genlist/item/media/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; + alias: "elm/genlist/item_odd/media/default"; parts { //##// @@ -3573,9 +3591,9 @@ group { "elm/genlist/item/media/default"; nomouse; } \ } \ } -ODD("elm/genlist/item_odd/media/default", "elm/genlist/item/media/default") +//ODD("elm/genlist/item_odd/media/default", "elm/genlist/item/media/default") COMPRESS_MEDIA("elm/genlist/item_compress/media/default", "elm/genlist/item/media/default") -COMPRESS_MEDIA_ODD("elm/genlist/item_compress_odd/media/default", "elm/genlist/item/media/default") +COMPRESS_MEDIA("elm/genlist/item_compress_odd/media/default", "elm/genlist/item/media/default") group { "elm/genlist/item/media-album/default"; nomouse; data.item: "selectraise" "on"; @@ -3584,6 +3602,7 @@ group { "elm/genlist/item/media-album/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; + alias: "elm/genlist/item_odd/media-album/default"; parts { //##// @@ -3946,7 +3965,7 @@ group { "elm/genlist/item/media-album/default"; nomouse; } inherit: "genlist_top"; } -ODD("elm/genlist/item_odd/media-album/default", "elm/genlist/item/media-album/default") +//ODD("elm/genlist/item_odd/media-album/default", "elm/genlist/item/media-album/default") group { "elm/genlist/item_compress/media-album/default"; inherit: "elm/genlist/item/media-album/default"; parts { @@ -4134,6 +4153,7 @@ group { "elm/genlist/item/media-preview/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; + alias: "elm/genlist/item_odd/media-preview/default"; parts { //##// @@ -4398,7 +4418,7 @@ group { "elm/genlist/item/media-preview/default"; nomouse; } inherit: "genlist_top"; } -ODD("elm/genlist/item_odd/media-preview/default", "elm/genlist/item/media-preview/default") +//ODD("elm/genlist/item_odd/media-preview/default", "elm/genlist/item/media-preview/default") group { "elm/genlist/item_compress/media-preview/default"; inherit: "elm/genlist/item/media-preview/default"; parts { @@ -4688,6 +4708,7 @@ group { "elm/genlist/item/mode/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.mode.flip"; inherit: "genlist_base"; + alias: "elm/genlist/item_odd/mode/default"; parts { //##// @@ -4942,12 +4963,13 @@ group { "elm/genlist/item/mode/default"; nomouse; } inherit: "genlist_top"; } -ODD("elm/genlist/item_odd/mode/default", "elm/genlist/item/mode/default") +//ODD("elm/genlist/item_odd/mode/default", "elm/genlist/item/mode/default") COMPRESS_MODE("elm/genlist/item_compress/mode/default", "elm/genlist/item/mode/default") -COMPRESS_MODE_ODD("elm/genlist/item_compress_odd/mode/default", "elm/genlist/item/mode/default") +COMPRESS_MODE("elm/genlist/item_compress_odd/mode/default", "elm/genlist/item/mode/default") group { "elm/genlist/tree/mode/default"; inherit: "elm/genlist/item/mode/default"; + alias: "elm/genlist/tree_odd/mode/default"; parts { text { "elm.text.mode"; desc { "default"; @@ -4962,9 +4984,9 @@ group { "elm/genlist/tree/mode/default"; } inherit: "genlist_arrow"; } -ODD("elm/genlist/tree_odd/mode/default", "elm/genlist/tree/mode/default") +//ODD("elm/genlist/tree_odd/mode/default", "elm/genlist/tree/mode/default") COMPRESS_MODE("elm/genlist/tree_compress/mode/default", "elm/genlist/tree/mode/default") -COMPRESS_MODE_ODD("elm/genlist/tree_compress_odd/mode/default", "elm/genlist/tree/mode/default") +COMPRESS_MODE("elm/genlist/tree_compress_odd/mode/default", "elm/genlist/tree/mode/default") @@ -5009,22 +5031,23 @@ group { "elm/genlist/item/edit/default"; nomouse; images.image: "bevel_horiz_out.png" COMP; images.image: "shadow_horiz.png" COMP; program_source: "elm"; + alias: "elm/genlist/item_odd/edit/default"; parts { rect { "base"; desc { "default"; color: 64 64 64 255; color_class: "list_item_base"; } - desc { "odd"; - color: 56 56 56 255; - color_class: "list_item_base_odd"; - } - } - program { - signal: "elm,state,odd"; - action: STATE_SET "odd" 1.0; - target: "base"; +// desc { "odd"; +// color: 56 56 56 255; +// color_class: "list_item_base_odd"; +// } } +// program { +// signal: "elm,state,odd"; +// action: STATE_SET "odd" 1.0; +// target: "base"; +// } program { signal: "elm,state,even"; action: STATE_SET "default"; @@ -5177,14 +5200,15 @@ group { "elm/genlist/item/edit/default"; nomouse; } } } -ODD("elm/genlist/item_odd/edit/default", "elm/genlist/item/edit/default") +//ODD("elm/genlist/item_odd/edit/default", "elm/genlist/item/edit/default") COMPRESS_EDIT("elm/genlist/item_compress/edit/default", "elm/genlist/item/edit/default") -COMPRESS_EDIT_ODD("elm/genlist/item_compress_odd/edit/default", "elm/genlist/item/edit/default") +COMPRESS_EDIT("elm/genlist/item_compress_odd/edit/default", "elm/genlist/item/edit/default") group { "elm/genlist/tree/edit/default"; inherit: "elm/genlist/item/edit/default"; + alias: "elm/genlist/tree/edit/default"; } -ODD("elm/genlist/tree_odd/edit/default", "elm/genlist/tree/edit/default") +//ODD("elm/genlist/tree_odd/edit/default", "elm/genlist/tree/edit/default") COMPRESS_EDIT("elm/genlist/tree_compress/edit/default", "elm/genlist/tree/edit/default") COMPRESS_EDIT_ODD("elm/genlist/tree_compress_odd/edit/default", "elm/genlist/tree/edit/default") --
