raster pushed a commit to branch elementary-1.14.

http://git.enlightenment.org/core/elementary.git/commit/?id=59a489cbe58539ddae7dc5fb6a35d3d07e8cf1e8

commit 59a489cbe58539ddae7dc5fb6a35d3d07e8cf1e8
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Tue Jun 9 16:25:24 2015 +0900

    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
---
 data/themes/edc/elm/list.edc | 18 ++++++++++++++++++
 src/lib/elm_list.c           |  5 +++++
 2 files changed, 23 insertions(+)

diff --git a/data/themes/edc/elm/list.edc b/data/themes/edc/elm/list.edc
index aa836d4..0641938 100644
--- a/data/themes/edc/elm/list.edc
+++ b/data/themes/edc/elm/list.edc
@@ -17,34 +17,43 @@
          part { name: "elm.text"; \
             description { state: "default" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
             description { state: "selected" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
             description { state: "disabled" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
          } \
          part { name: "label2"; \
             description { state: "default" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
             description { state: "selected" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
             description { state: "disabled" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
          } \
          part { name: "label3"; \
             description { state: "default" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
             description { state: "selected" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
             description { state: "disabled" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
          } \
       } \
@@ -56,34 +65,43 @@
          part { name: "elm.text"; \
             description { state: "default" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
             description { state: "selected" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
             description { state: "disabled" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
          } \
          part { name: "label2"; \
             description { state: "default" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
             description { state: "selected" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
             description { state: "disabled" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
          } \
          part { name: "label3"; \
             description { state: "default" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
             description { state: "selected" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
             description { state: "disabled" 0.0; \
                text.min: 0 1; \
+               text.ellipsis: 0.0; \
             } \
          } \
          part { name: "base"; \
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index d7db7da..18d23e1 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -820,6 +820,8 @@ _items_fix(Evas_Object *obj)
 
    ELM_LIST_DATA_GET(obj, sd);
 
+   printf("fix....\n");
+
    style = elm_widget_style_get(obj);
    it_plain = sd->h_mode ? "h_item" : "item";
    it_odd = sd->h_mode ? "h_item_odd" : "item_odd";
@@ -864,6 +866,7 @@ _items_fix(Evas_Object *obj)
         redo = 1;
      }
 
+   printf("walk items\n");
    i = 0;
    EINA_LIST_FOREACH(sd->items, l, eo_it)
      {
@@ -883,6 +886,7 @@ _items_fix(Evas_Object *obj)
                      "vertical" : "horizontal", style);
              else if (sd->mode == ELM_LIST_COMPRESS)
                {
+                  printf("fix item to %s\n", it_compress);
                   if (it->even)
                     elm_widget_theme_object_set
                       (obj, VIEW(it), "list", it_compress, style);
@@ -2639,6 +2643,7 @@ _elm_list_mode_set(Eo *obj, Elm_List_Data *sd, 
Elm_List_Mode mode)
    sd->mode = mode;
 
    _elm_list_mode_set_internal(obj);
+   _items_fix(obj);
 }
 
 EOLIAN static Elm_List_Mode

-- 


Reply via email to