hermet pushed a commit to branch master.
commit 2aca940f040df01364301fe7b024be1f6d89a9d6
Author: ChunEon Park <[email protected]>
Date: Fri May 24 18:25:16 2013 +0900
elementary/widget - removed elm_widgetdisplay_mode_get().
since INHERIT_MODE is removed and it' doesn't need to care here anymore.
---
src/lib/elm_widget.c | 53 ++++------------------------------------------------
src/lib/elm_widget.h | 13 -------------
2 files changed, 4 insertions(+), 62 deletions(-)
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index ce22e94..2141e33 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -4697,46 +4697,6 @@ elm_widget_activate(Evas_Object *obj, Elm_Activate act)
/**
* @internal
*
- * Returns the widget's Evas_Display_Mode
- *
- * @param obj The widget.
- * @return Evas_Display_Mode of the object.
- *
- * @see elm_widget_display_mode_set().
- * @ingroup Widget
- **/
-EAPI Evas_Display_Mode
-elm_widget_display_mode_get(const Evas_Object *obj)
-{
- ELM_WIDGET_CHECK(obj) EVAS_DISPLAY_MODE_NONE;
- Evas_Display_Mode ret = EVAS_DISPLAY_MODE_NONE;
- eo_do((Eo *) obj, elm_wdg_display_mode_get(&ret));
- return ret;
-}
-
-static void
-_elm_widget_display_mode_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
-{
- Evas_Display_Mode *ret = va_arg(*list, Evas_Display_Mode *);
- *ret = EVAS_DISPLAY_MODE_NONE;
-
- Evas_Display_Mode new_mode;
- Evas_Object *parent;
-
- new_mode = evas_object_size_hint_display_mode_get(obj);
- parent = elm_widget_parent_get(obj);
-
- if ((new_mode == EVAS_DISPLAY_MODE_INHERIT) && parent)
- {
- *ret = elm_widget_display_mode_get(parent);
- return;
- }
- *ret = new_mode;
-}
-
-/**
- * @internal
- *
* Sets the widget and child widget's Evas_Display_Mode.
*
* @param obj The widget.
@@ -4760,25 +4720,21 @@ _elm_widget_display_mode_set(Eo *obj, void *_pd,
va_list *list)
{
Evas_Display_Mode dispmode = va_arg(*list, Evas_Display_Mode);
- Evas_Display_Mode child_mode;
Evas_Object *child;
Eina_List *l;
Elm_Widget_Smart_Data *sd = _pd;
- if (elm_widget_display_mode_get(obj) == dispmode) return;
+ if (evas_object_size_hint_display_mode_get(obj) == dispmode) return;
evas_object_size_hint_display_mode_set(obj, dispmode);
//TODO: Need to deal with EVAS_DISPLAY_MODE_INHERIT efficiently.
EINA_LIST_FOREACH (sd->subobjs, l, child)
{
- child_mode = evas_object_size_hint_display_mode_get(child);
- if (child_mode != EVAS_DISPLAY_MODE_DONT_CHANGE)
- {
- elm_widget_display_mode_set(child, dispmode);
- }
+ if (evas_object_size_hint_display_mode_get(child)
+ != EVAS_DISPLAY_MODE_DONT_CHANGE)
+ elm_widget_display_mode_set(child, dispmode);
}
-
}
EAPI void
@@ -6086,7 +6042,6 @@ _class_constructor(Eo_Class *klass)
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_OBJECT_SET),
_elm_widget_focus_next_object_set),
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_HIGHLIGHT_SET),
_elm_widget_parent_highlight_set),
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISPLAY_MODE_SET),
_elm_widget_display_mode_set),
- EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISPLAY_MODE_GET),
_elm_widget_display_mode_get),
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TREE_UNFOCUSABLE_SET),
_elm_widget_tree_unfocusable_set),
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TREE_UNFOCUSABLE_GET),
_elm_widget_tree_unfocusable_get),
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 9a1accb..da2504d 100644
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -641,7 +641,6 @@ EAPI Evas_Object *elm_widget_parent2_get(const
Evas_Object *obj);
EAPI void elm_widget_parent2_set(Evas_Object *obj, Evas_Object
*parent);
EAPI void elm_widget_focus_steal(Evas_Object *obj);
EAPI Evas_Object *elm_widget_newest_focus_order_get(const Evas_Object
*obj, unsigned int *newest_focus_order, Eina_Bool can_focus_only);
-EAPI Evas_Display_Mode elm_widget_display_mode_get(const Evas_Object *obj);
EAPI void elm_widget_display_mode_set(Evas_Object *obj,
Evas_Display_Mode dispmode);
EAPI const Elm_Widget_Smart_Class *elm_widget_smart_class_get(void);
@@ -2418,18 +2417,6 @@ typedef void * (*list_data_get_func_type)(const
Eina_List * l);
#define elm_wdg_display_mode_set(dispmode)
ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISPLAY_MODE_SET),
EO_TYPECHECK(Evas_Display_Mode, dispmode)
/**
- * @def elm_wdg_display_mode_get
- * @since 1.8
- *
- * No description supplied by the EAPI.
- *
- * @param[out] ret
- *
- */
-#define elm_wdg_display_mode_get(ret)
ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISPLAY_MODE_GET),
EO_TYPECHECK(Evas_Display_Mode *, ret)
-
-
-/**
* @def elm_wdg_tree_unfocusable_set
* @since 1.8
*
--
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
