More API Inconsistency fixes:

e_flowlayout_min_size/e_flowlayout_max_size_ changed to size_min/max
e_entry_min_size_* changed to e_entry_size_min_*
e_slider_min_size changed to e_slider_size_min_*




SVN revision: 42164
devs/princeamd/enlightenment-0.17-elive
Christopher Michael 14 years ago
parent 3e1c0d622a
commit dd1031c82e
  1. 2
      src/bin/e_entry.c
  2. 2
      src/bin/e_entry.h
  3. 4
      src/bin/e_flowlayout.c
  4. 4
      src/bin/e_flowlayout.h
  5. 2
      src/bin/e_slider.c
  6. 2
      src/bin/e_slider.h
  7. 2
      src/bin/e_test.c
  8. 2
      src/bin/e_widget_entry.c
  9. 2
      src/bin/e_widget_slider.c
  10. 6
      src/modules/syscon/e_syscon.c

@ -206,7 +206,7 @@ e_entry_password_set(Evas_Object *entry, int password_mode)
* @param minh the location where to store the minimun height of the entry
*/
EAPI void
e_entry_min_size_get(Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh)
e_entry_size_min_get(Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh)
{
E_Entry_Smart_Data *sd;

@ -13,7 +13,7 @@ EAPI void e_entry_clear (Evas_Object *entry);
EAPI Evas_Object *e_entry_editable_object_get (Evas_Object *entry);
EAPI void e_entry_password_set (Evas_Object *entry, int password_mode);
EAPI void e_entry_min_size_get (Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh);
EAPI void e_entry_size_min_get (Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh);
EAPI void e_entry_focus (Evas_Object *entry);
EAPI void e_entry_unfocus (Evas_Object *entry);
EAPI void e_entry_enable (Evas_Object *entry);

@ -346,7 +346,7 @@ e_flowlayout_unpack(Evas_Object *obj)
}
EAPI void
e_flowlayout_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
e_flowlayout_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
{
E_Smart_Data *sd;
@ -358,7 +358,7 @@ e_flowlayout_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
}
EAPI void
e_flowlayout_max_size_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
e_flowlayout_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
{
E_Smart_Data *sd;

@ -26,8 +26,8 @@ EAPI Evas_Object *e_flowlayout_pack_object_first (Evas_Object *obj);
EAPI Evas_Object *e_flowlayout_pack_object_last (Evas_Object *obj);
EAPI void e_flowlayout_pack_options_set (Evas_Object *obj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h);
EAPI void e_flowlayout_unpack (Evas_Object *obj);
EAPI void e_flowlayout_min_size_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
EAPI void e_flowlayout_max_size_get (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
EAPI void e_flowlayout_size_min_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
EAPI void e_flowlayout_size_max_get (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
EAPI void e_flowlayout_align_get (Evas_Object *obj, double *ax, double *ay);
EAPI void e_flowlayout_align_set (Evas_Object *obj, double ax, double ay);
/* This function only works if homogenous is set */

@ -202,7 +202,7 @@ e_slider_direction_get(Evas_Object *obj)
}
EAPI void
e_slider_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
e_slider_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
{
API_ENTRY return;
if (minw) *minw = sd->minw;

@ -21,7 +21,7 @@ EAPI void e_slider_value_format_display_set (Evas_Object *obj, const cha
EAPI const char *e_slider_value_format_display_get (Evas_Object *obj);
EAPI void e_slider_direction_set (Evas_Object *obj, int reversed);
EAPI int e_slider_direction_get (Evas_Object *obj);
EAPI void e_slider_min_size_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
EAPI void e_slider_size_min_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
EAPI Evas_Object *e_slider_edje_object_get (Evas_Object *obj);
#endif
#endif

@ -372,7 +372,7 @@ _e_test_internal(E_Container *con)
e_slider_value_set(o, 0.5);
e_slider_value_step_count_set(o, 4);
e_slider_value_format_display_set(o, "%1.2f V");
e_slider_min_size_get(o, &mw, &mh);
e_slider_size_min_get(o, &mw, &mh);
evas_object_smart_callback_add(o, "changed", _e_test_cb_e_smart_pan_changed_hook, NULL);
evas_object_show(o);

@ -63,7 +63,7 @@ EAPI Evas_Object
if ((text_location) && (*text_location))
e_entry_text_set(o, *text_location);
e_entry_min_size_get(o, &minw, &minh);
e_entry_size_min_get(o, &minw, &minh);
e_widget_size_min_set(obj, minw, minh);
wd->func = func;

@ -50,7 +50,7 @@ e_widget_slider_add(Evas *evas, int horiz, int rev, const char *fmt, double min,
if (dval) e_slider_value_set(o, *dval);
else if (ival) e_slider_value_set(o, *ival);
e_slider_min_size_get(o, &mw, &mh);
e_slider_size_min_get(o, &mw, &mh);
if (horiz)
e_widget_size_min_set(obj, mw + size, mh);
else

@ -243,13 +243,13 @@ e_syscon_show(E_Zone *zone, const char *defact)
evas_object_resize(o_bg, zw, zh);
edje_object_calc_force(o_bg);
e_flowlayout_min_size_get(o_flow_main, &mw, &mh);
e_flowlayout_size_min_get(o_flow_main, &mw, &mh);
edje_extern_object_min_size_set(o_flow_main, mw, mh);
edje_object_part_swallow(o_bg, "e.swallow.main", o_flow_main);
e_flowlayout_min_size_get(o_flow_secondary, &mw, &mh);
e_flowlayout_size_min_get(o_flow_secondary, &mw, &mh);
edje_extern_object_min_size_set(o_flow_secondary, mw, mh);
edje_object_part_swallow(o_bg, "e.swallow.secondary", o_flow_secondary);
e_flowlayout_min_size_get(o_flow_extra, &mw, &mh);
e_flowlayout_size_min_get(o_flow_extra, &mw, &mh);
edje_extern_object_min_size_set(o_flow_extra, mw, mh);
edje_object_part_swallow(o_bg, "e.swallow.extra", o_flow_extra);

Loading…
Cancel
Save