Elementary migration revision 70492

Merge remote-tracking branch 'remotes/origin/upstream'

diff --cc configure.ac
index 8eef396,c4d87a7..1576d6d
mode 100755,100644..100755
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac

diff --cc src/lib/elm_config.c
index 5f4d2fa,f8665ff..5006546
--- 1/src/lib/elm_config.c
--- 2/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@@ -1393,16 -1391,14 +1393,16 @@@ _env_get(void
  
          _elm_config->thumbscroll_sensitivity_friction = friction;
       }
 +   s = getenv("ELM_SCROLL_SMOOTH_TIME_INTERVAL");
 +   if (s) _elm_config->scroll_smooth_time_interval = atof(s);
     s = getenv("ELM_SCROLL_SMOOTH_AMOUNT");
-    if (s) _elm_config->scroll_smooth_amount = atof(s);
+    if (s) _elm_config->scroll_smooth_amount = _elm_atof(s);
     s = getenv("ELM_SCROLL_SMOOTH_HISTORY_WEIGHT");
-    if (s) _elm_config->scroll_smooth_history_weight = atof(s);
+    if (s) _elm_config->scroll_smooth_history_weight = _elm_atof(s);
     s = getenv("ELM_SCROLL_SMOOTH_FUTURE_TIME");
-    if (s) _elm_config->scroll_smooth_future_time = atof(s);
+    if (s) _elm_config->scroll_smooth_future_time = _elm_atof(s);
     s = getenv("ELM_SCROLL_SMOOTH_TIME_WINDOW");
-    if (s) _elm_config->scroll_smooth_time_window = atof(s);
+    if (s) _elm_config->scroll_smooth_time_window = _elm_atof(s);
     s = getenv("ELM_THEME");
     if (s) eina_stringshare_replace(&_elm_config->theme, s);
  

diff --cc src/lib/elm_diskselector.c
Simple merge

diff --cc src/lib/elm_entry.c
index e3cf43a,6351331..398ff8e
--- 1/src/lib/elm_entry.c
--- 2/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@@ -4542,40 -3938,9 +4555,39 @@@ _entry_hover_anchor_clicked(void *data
           !elm_object_part_content_get(wd->anchor_hover.hover, "bottom"))
       {
          evas_object_del(wd->anchor_hover.hover);
+         wd->anchor_hover.hover = NULL;
       }
     else
-      {
-         evas_object_show(wd->anchor_hover.hover);
-      }
+      evas_object_show(wd->anchor_hover.hover);
  }
  /* END - ANCHOR HOVER */
 +
 +EAPI void
 +elm_entry_magnifier_disabled_set(Evas_Object *obj, Eina_Bool disabled)
 +{
 +   ELM_CHECK_WIDTYPE(obj, widtype);
 +   Widget_Data *wd = elm_widget_data_get(obj);
 +   if (!wd) return;
 +   if (wd->magnifier_enabled == !disabled) return;
 +   wd->magnifier_enabled = !disabled;
 +}
 +
 +EAPI Eina_Bool
 +elm_entry_magnifier_disabled_get(const Evas_Object *obj)
 +{
 +   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
 +   Widget_Data *wd = elm_widget_data_get(obj);
 +   if (!wd) return EINA_FALSE;
 +   return !wd->magnifier_enabled;
 +}
 +
 +EAPI void
 +elm_entry_magnifier_type_set(Evas_Object *obj, int type)
 +{
 +   ELM_CHECK_WIDTYPE(obj, widtype);
 +   Widget_Data *wd = elm_widget_data_get(obj);
 +   if (!wd) return;
 +
 +   wd->mgf_type = type;
 +   _magnifier_create(obj);
 +}

diff --cc src/lib/elm_entry.h
Simple merge

diff --cc src/lib/elm_genlist.c
index 66fcdd0,131f2fc..3b081b8
--- 1/src/lib/elm_genlist.c
--- 2/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@@ -1942,27 -1819,12 +1941,27 @@@ _elm_genlist_item_state_update(Elm_Gen_
       }
  }
  
 -static Eina_List*
 +static void
 +_content_focused(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 +{
 +   Elm_Gen_Item *it = data;
 +   if (it) it->defer_unrealize = EINA_TRUE;
 +}
 +
 +static void
 +_content_unfocused(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 +{
 +   Elm_Gen_Item *it = data;
 +   if (it) it->defer_unrealize = EINA_FALSE;
 +}
 +
 +
 +static Eina_List *
  _item_mode_content_realize(Elm_Gen_Item *it,
-                            Evas_Object *target,
-                            Eina_List **source,
-                            const char *parts,
-                            Eina_List **contents_list)
+                            Evas_Object  *target,
+                            Eina_List   **source,
+                            const char   *parts,
+                            Eina_List   **contents_list)
  {
     Eina_List *res = *contents_list;
  
@@@ -5272,43 -4894,14 +5271,43 @@@ elm_genlist_item_expanded_depth_get(con
     return ((Elm_Gen_Item *)it)->item->expanded_depth;
  }
  
 +EINA_DEPRECATED EAPI void
 +elm_genlist_item_display_only_set(Elm_Object_Item  *it,
 +                                  Eina_Bool         display_only)
 +{
 +   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
 +   display_only = !!display_only;
 +
 +   if (display_only)
 +     elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 +   else
 +     {
 +        Elm_Object_Select_Mode oldmode = elm_genlist_item_select_mode_get(it);
 +        if (oldmode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY)
 +          elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DEFAULT);
 +     }
 +}
 +
 +EINA_DEPRECATED EAPI Eina_Bool
 +elm_genlist_item_display_only_get(const Elm_Object_Item *it)
 +{
 +   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
 +   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
 +   if (_it->generation < _it->wd->generation) return EINA_FALSE;
 +   Elm_Object_Select_Mode oldmode = elm_genlist_item_select_mode_get(it);
 +   if (oldmode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY)
 +     return EINA_TRUE;
 +   return EINA_FALSE;
 +}
 +
  static Eina_Bool
- _elm_genlist_item_compute_coordinates(Elm_Object_Item *it,
+ _elm_genlist_item_compute_coordinates(Elm_Object_Item               *it,
                                        Elm_Genlist_Item_Scrollto_Type type,
-                                       Eina_Bool bring_in,
-                                       Evas_Coord *x,
-                                       Evas_Coord *y,
-                                       Evas_Coord *w,
-                                       Evas_Coord *h)
+                                       Eina_Bool                      bring_in,
+                                       Evas_Coord                    *x,
+                                       Evas_Coord                    *y,
+                                       Evas_Coord                    *w,
+                                       Evas_Coord                    *h)
  {
     Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
     Evas_Coord gith = 0;

diff --cc src/lib/elm_map.c
Simple merge

diff --cc src/lib/elm_priv.h
Simple merge

diff --cc src/lib/elm_win.c
Simple merge