summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-06-09 16:25:24 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-06-09 16:25:24 +0900
commitc8b1d151a3eecfcd3eb85110fcd8b0756e17824d (patch)
tree3d529f246f86782bead27cd29777f29eb42e1514
parent52c85b3e1b51c0bc1ba95e10c11a038367aa98aa (diff)
elm list - theme - make compress moder work again
someone.. somewhere along the way.. likely a long time ago.. broke compress mode. likely the addition of the ellipsis value as an ellipsis position or something related to that broke compatibility, as this used to work. be that as it may... finding out just where is virtually impossible, so fix it the simpler way - add elipsis values
-rw-r--r--data/themes/edc/elm/list.edc18
-rw-r--r--src/lib/elm_list.c5
2 files changed, 23 insertions, 0 deletions
diff --git a/data/themes/edc/elm/list.edc b/data/themes/edc/elm/list.edc
index aa836d436..06419383b 100644
--- a/data/themes/edc/elm/list.edc
+++ b/data/themes/edc/elm/list.edc
@@ -17,34 +17,43 @@
17 part { name: "elm.text"; \ 17 part { name: "elm.text"; \
18 description { state: "default" 0.0; \ 18 description { state: "default" 0.0; \
19 text.min: 0 1; \ 19 text.min: 0 1; \
20 text.ellipsis: 0.0; \
20 } \ 21 } \
21 description { state: "selected" 0.0; \ 22 description { state: "selected" 0.0; \
22 text.min: 0 1; \ 23 text.min: 0 1; \
24 text.ellipsis: 0.0; \
23 } \ 25 } \
24 description { state: "disabled" 0.0; \ 26 description { state: "disabled" 0.0; \
25 text.min: 0 1; \ 27 text.min: 0 1; \
28 text.ellipsis: 0.0; \
26 } \ 29 } \
27 } \ 30 } \
28 part { name: "label2"; \ 31 part { name: "label2"; \
29 description { state: "default" 0.0; \ 32 description { state: "default" 0.0; \
30 text.min: 0 1; \ 33 text.min: 0 1; \
34 text.ellipsis: 0.0; \
31 } \ 35 } \
32 description { state: "selected" 0.0; \ 36 description { state: "selected" 0.0; \
33 text.min: 0 1; \ 37 text.min: 0 1; \
38 text.ellipsis: 0.0; \
34 } \ 39 } \
35 description { state: "disabled" 0.0; \ 40 description { state: "disabled" 0.0; \
36 text.min: 0 1; \ 41 text.min: 0 1; \
42 text.ellipsis: 0.0; \
37 } \ 43 } \
38 } \ 44 } \
39 part { name: "label3"; \ 45 part { name: "label3"; \
40 description { state: "default" 0.0; \ 46 description { state: "default" 0.0; \
41 text.min: 0 1; \ 47 text.min: 0 1; \
48 text.ellipsis: 0.0; \
42 } \ 49 } \
43 description { state: "selected" 0.0; \ 50 description { state: "selected" 0.0; \
44 text.min: 0 1; \ 51 text.min: 0 1; \
52 text.ellipsis: 0.0; \
45 } \ 53 } \
46 description { state: "disabled" 0.0; \ 54 description { state: "disabled" 0.0; \
47 text.min: 0 1; \ 55 text.min: 0 1; \
56 text.ellipsis: 0.0; \
48 } \ 57 } \
49 } \ 58 } \
50 } \ 59 } \
@@ -56,34 +65,43 @@
56 part { name: "elm.text"; \ 65 part { name: "elm.text"; \
57 description { state: "default" 0.0; \ 66 description { state: "default" 0.0; \
58 text.min: 0 1; \ 67 text.min: 0 1; \
68 text.ellipsis: 0.0; \
59 } \ 69 } \
60 description { state: "selected" 0.0; \ 70 description { state: "selected" 0.0; \
61 text.min: 0 1; \ 71 text.min: 0 1; \
72 text.ellipsis: 0.0; \
62 } \ 73 } \
63 description { state: "disabled" 0.0; \ 74 description { state: "disabled" 0.0; \
64 text.min: 0 1; \ 75 text.min: 0 1; \
76 text.ellipsis: 0.0; \
65 } \ 77 } \
66 } \ 78 } \
67 part { name: "label2"; \ 79 part { name: "label2"; \
68 description { state: "default" 0.0; \ 80 description { state: "default" 0.0; \
69 text.min: 0 1; \ 81 text.min: 0 1; \
82 text.ellipsis: 0.0; \
70 } \ 83 } \
71 description { state: "selected" 0.0; \ 84 description { state: "selected" 0.0; \
72 text.min: 0 1; \ 85 text.min: 0 1; \
86 text.ellipsis: 0.0; \
73 } \ 87 } \
74 description { state: "disabled" 0.0; \ 88 description { state: "disabled" 0.0; \
75 text.min: 0 1; \ 89 text.min: 0 1; \
90 text.ellipsis: 0.0; \
76 } \ 91 } \
77 } \ 92 } \
78 part { name: "label3"; \ 93 part { name: "label3"; \
79 description { state: "default" 0.0; \ 94 description { state: "default" 0.0; \
80 text.min: 0 1; \ 95 text.min: 0 1; \
96 text.ellipsis: 0.0; \
81 } \ 97 } \
82 description { state: "selected" 0.0; \ 98 description { state: "selected" 0.0; \
83 text.min: 0 1; \ 99 text.min: 0 1; \
100 text.ellipsis: 0.0; \
84 } \ 101 } \
85 description { state: "disabled" 0.0; \ 102 description { state: "disabled" 0.0; \
86 text.min: 0 1; \ 103 text.min: 0 1; \
104 text.ellipsis: 0.0; \
87 } \ 105 } \
88 } \ 106 } \
89 part { name: "base"; \ 107 part { name: "base"; \
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 54a86048d..e5ba4d4e2 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -820,6 +820,8 @@ _items_fix(Evas_Object *obj)
820 820
821 ELM_LIST_DATA_GET(obj, sd); 821 ELM_LIST_DATA_GET(obj, sd);
822 822
823 printf("fix....\n");
824
823 style = elm_widget_style_get(obj); 825 style = elm_widget_style_get(obj);
824 it_plain = sd->h_mode ? "h_item" : "item"; 826 it_plain = sd->h_mode ? "h_item" : "item";
825 it_odd = sd->h_mode ? "h_item_odd" : "item_odd"; 827 it_odd = sd->h_mode ? "h_item_odd" : "item_odd";
@@ -864,6 +866,7 @@ _items_fix(Evas_Object *obj)
864 redo = 1; 866 redo = 1;
865 } 867 }
866 868
869 printf("walk items\n");
867 i = 0; 870 i = 0;
868 EINA_LIST_FOREACH(sd->items, l, eo_it) 871 EINA_LIST_FOREACH(sd->items, l, eo_it)
869 { 872 {
@@ -883,6 +886,7 @@ _items_fix(Evas_Object *obj)
883 "vertical" : "horizontal", style); 886 "vertical" : "horizontal", style);
884 else if (sd->mode == ELM_LIST_COMPRESS) 887 else if (sd->mode == ELM_LIST_COMPRESS)
885 { 888 {
889 printf("fix item to %s\n", it_compress);
886 if (it->even) 890 if (it->even)
887 elm_widget_theme_object_set 891 elm_widget_theme_object_set
888 (obj, VIEW(it), "list", it_compress, style); 892 (obj, VIEW(it), "list", it_compress, style);
@@ -2643,6 +2647,7 @@ _elm_list_mode_set(Eo *obj, Elm_List_Data *sd, Elm_List_Mode mode)
2643 sd->mode = mode; 2647 sd->mode = mode;
2644 2648
2645 _elm_list_mode_set_internal(obj); 2649 _elm_list_mode_set_internal(obj);
2650 _items_fix(obj);
2646} 2651}
2647 2652
2648EOLIAN static Elm_List_Mode 2653EOLIAN static Elm_List_Mode