From: Daniel Juyung Seo <juyung.seo@samsung.com>
Date: Mon, 7 Jun 2010 10:11:54 +0000 (+0900)
Subject: Merge with EFL svn repo
X-Git-Tag: beat-winset-test_0.1.1-40~275
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=80e4674d53a01f38ae51725d675e1b6791ae522a;p=framework%2Fuifw%2Felementary.git

Merge with EFL svn repo

Merge branch 'svn_merge'

Conflicts:
	src/lib/elm_index.c
---

80e4674d53a01f38ae51725d675e1b6791ae522a
diff --cc configure.ac
index a8a6e24,6cdcf0a..cb1a11c
mode 100755,100644..100755
--- a/configure.ac
+++ b/configure.ac
diff --cc src/lib/Elementary.h.in
index d255f02,5cff583..6304155
mode 100755,100644..100755
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
diff --cc src/lib/Makefile.am
index e562d0b,b8a515d..21d3d9e
mode 100755,100644..100755
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
diff --cc src/lib/elc_scrolled_entry.c
index 85c0ff4,664cce7..d2312e3
mode 100755,100644..100755
--- a/src/lib/elc_scrolled_entry.c
+++ b/src/lib/elc_scrolled_entry.c
diff --cc src/lib/elm_entry.c
index afccadc,063cbb7..f2f6421
mode 100755,100644..100755
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
diff --cc src/lib/elm_index.c
index 72a07df,48c547f..8d2f502
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@@ -8,12 -8,7 +8,11 @@@
   * by letter.
   */
  
 +#define MIN_GRP_SIZE 2 //for symmetry it is 2, otherwise it can be 1 and zero have no meaning.
 +#define MIN_PIXEL_VALUE 1 //Min pixel value is highly dependent on touch sensitivity support.
 +#define MIN_OBJ_HEIGHT 24 //should be taken from .edc file.
  typedef struct _Widget_Data Widget_Data;
- typedef struct _Item Item;
 +typedef struct _PlacementPart PlacementPart;
  
  struct _Widget_Data
  {
@@@ -28,17 -23,9 +27,17 @@@
     Eina_Bool horizontal : 1;
     Eina_Bool active : 1;
     Eina_Bool down : 1;
 +   int max_supp_items_count;
 +   int tot_items_count[2];
 +   Evas_Coord pwidth, pheight;
 +   int min_obj_height, max_grp_size;
 +   int items_count;
 +   double scale_factor;
 +   const char *special_char;
 +   int min_1st_level_obj_height;
  };
  
- struct _Item
+ struct _Elm_Index_Item
  {
     Evas_Object *obj;
     const char *letter;
@@@ -61,8 -41,7 +60,8 @@@ static void _theme_hook(Evas_Object *ob
  static void _sizing_eval(Evas_Object *obj);
  static void _index_box_auto_fill(Evas_Object *obj, Evas_Object *box, int level);
  static void _index_box_clear(Evas_Object *obj, Evas_Object *box, int level);
- static void _item_free(Item *it);
+ static void _item_free(Elm_Index_Item *it);
 +static void _index_process(Evas_Object *obj);
  
  static void
  _del_hook(Evas_Object *obj)
@@@ -162,26 -141,14 +161,26 @@@ static Elm_Index_Item 
  _item_new(Evas_Object *obj, const char *letter, const void *item)
  {
     Widget_Data *wd = elm_widget_data_get(obj);
-    Item *it;
+    Elm_Index_Item *it;
     if (!wd) return NULL;
-    it = calloc(1, sizeof(Item));
+    it = calloc(1, sizeof(Elm_Index_Item));
     if (!it) return NULL;
     it->obj = obj;
 -   it->letter = eina_stringshare_add(letter);
     it->data = item;
     it->level = wd->level;
 +   if(wd->level == 0)
 +   it->size =  wd->min_obj_height;
 +   else
 +	   it->size =  wd->min_1st_level_obj_height;
 +   if(letter)
 +   {
 +		it->letter = eina_stringshare_add(letter);
 +		it->vis_letter = eina_stringshare_add(letter);
 +   }
 +   else
 +   {
 +   	return NULL;
 +   }
     return it;
  }
  
@@@ -310,11 -267,8 +309,11 @@@ _sel_eval(Evas_Object *obj, Evas_Coord 
     Eina_List *l;
     Evas_Coord x, y, w, h, bx, by, bw, bh, xx, yy;
     double cdv = 0.5;
 +   double cdvv = 0.0;
 +   double dmax = 0.0;
 +   double dmin = 0.0;
     Evas_Coord dist;
-    Eina_Bool change = 0;
+    Eina_Bool change = EINA_FALSE;
     char *label = NULL, *last = NULL;
     int i;
     if (!wd) return;
diff --cc src/lib/els_scroller.c
index fc9afed,b565456..802320f
mode 100755,100644..100755
--- a/src/lib/els_scroller.c
+++ b/src/lib/els_scroller.c