dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eolian: Integration of Frame

This commit is contained in:
Daniel Zaoui 2014-03-18 09:01:28 +02:00
parent 6ef8dc7502
commit c3fecd2782
5 changed files with 140 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
legacy/elementary/src/lib/Makefile.am
View File

@ -533,19 +533,23 @@ BUILT_SOURCES = \
elm_interface_scrollable.eo.c \
elm_interface_scrollable.eo.h \
elm_pan.eo.c \
elm_pan.eo.h
elm_pan.eo.h \
elm_frame.eo.c \
elm_frame.eo.h
EXTRA_DIST += \
elm_widget.eo \
elm_container.eo \
elm_layout.eo \
elm_interface_scrollable.eo \
elm_pan.eo
elm_pan.eo \
elm_frame.eo
nodist_includesunstable_HEADERS = \
elm_widget.eo.h \
elm_container.eo.h \
elm_layout.eo.h \
elm_interface_scrollable.eo.h \
elm_pan.eo.h
elm_pan.eo.h \
elm_frame.eo.h

200
legacy/elementary/src/lib/elm_frame.c
View File

@ -7,8 +7,6 @@
#include "elm_widget_frame.h"
#include "elm_widget_layout.h"
EAPI Eo_Op ELM_OBJ_FRAME_BASE_ID = EO_NOOP;
#define MY_CLASS ELM_OBJ_FRAME_CLASS
#define MY_CLASS_NAME "Elm_Frame"
@ -37,7 +35,7 @@ static const Elm_Layout_Part_Alias_Description _text_aliases[] =
static void
_sizing_eval(Evas_Object *obj,
Elm_Frame_Smart_Data *sd EINA_UNUSED)
Elm_Frame_Data *sd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Evas_Coord minw = -1, minh = -1;
@ -51,63 +49,49 @@ _sizing_eval(Evas_Object *obj,
evas_object_size_hint_max_set(obj, -1, -1);
}
static void
_elm_frame_smart_focus_next_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
EOLIAN static Eina_Bool
_elm_frame_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd EINA_UNUSED)
{
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
*ret = EINA_TRUE;
return EINA_TRUE;
}
static void
_elm_frame_smart_focus_next(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
EOLIAN static Eina_Bool
_elm_frame_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd EINA_UNUSED, Elm_Focus_Direction dir, Evas_Object **next)
{
Elm_Focus_Direction dir = va_arg(*list, Elm_Focus_Direction);
Evas_Object **next = va_arg(*list, Evas_Object **);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
Eina_Bool int_ret;
Evas_Object *content;
content = elm_layout_content_get(obj, NULL);
if (!content) int_ret = EINA_FALSE;
if (!content) return EINA_FALSE;
else
{
/* attempt to follow focus cycle into sub-object */
int_ret = elm_widget_focus_next_get(content, dir, next);
return elm_widget_focus_next_get(content, dir, next);
}
if (ret) *ret = int_ret;
}
static void
_elm_frame_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
EOLIAN static Eina_Bool
_elm_frame_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd EINA_UNUSED)
{
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
*ret = EINA_TRUE;
return EINA_TRUE;
}
static void
_elm_frame_smart_focus_direction(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
EOLIAN static Eina_Bool
_elm_frame_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd EINA_UNUSED, const Evas_Object *base, double degree, Evas_Object **direction, double *weight)
{
const Evas_Object *base = va_arg(*list, const Evas_Object *);
double degree = va_arg(*list, double);
Evas_Object **direction = va_arg(*list, Evas_Object **);
double *weight = va_arg(*list, double *);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
Eina_Bool int_ret;
Evas_Object *content;
content = elm_layout_content_get(obj, NULL);
if (!content) int_ret = EINA_FALSE;
if (!content) return EINA_FALSE;
else
{
/* Try to cycle focus on content */
int_ret = elm_widget_focus_direction_get
return elm_widget_focus_direction_get
(content, base, degree, direction, weight);
}
if (ret) *ret = int_ret;
}
static void
@ -157,10 +141,9 @@ _on_frame_clicked(void *data,
}
/* using deferred sizing evaluation, just like the parent */
static void
_elm_frame_smart_calculate(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
EOLIAN static void
_elm_frame_evas_smart_calculate(Eo *obj, Elm_Frame_Data *sd)
{
Elm_Frame_Smart_Data *sd = _pd;
ELM_LAYOUT_DATA_GET(obj, ld);
if (ld->needs_size_calc)
@ -171,8 +154,8 @@ _elm_frame_smart_calculate(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
}
}
static void
_elm_frame_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
EOLIAN static void
_elm_frame_evas_smart_add(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@ -194,18 +177,16 @@ _elm_frame_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
elm_layout_sizing_eval(obj);
}
static void
_elm_frame_smart_content_aliases_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
EOLIAN static const Elm_Layout_Part_Alias_Description*
_elm_frame_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd EINA_UNUSED)
{
const Elm_Layout_Part_Alias_Description **aliases = va_arg(*list, const Elm_Layout_Part_Alias_Description **);
*aliases = _content_aliases;
return _content_aliases;
}
static void
_elm_frame_smart_text_aliases_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
EOLIAN static const Elm_Layout_Part_Alias_Description*
_elm_frame_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd EINA_UNUSED)
{
const Elm_Layout_Part_Alias_Description **aliases = va_arg(*list, const Elm_Layout_Part_Alias_Description **);
*aliases = _text_aliases;
return _text_aliases;
}
EAPI Evas_Object *
@ -217,8 +198,8 @@ elm_frame_add(Evas_Object *parent)
return obj;
}
static void
_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
EOLIAN static void
_elm_frame_constructor(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
{
eo_do_super(obj, MY_CLASS, eo_constructor());
eo_do(obj,
@ -226,54 +207,22 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
}
EAPI void
elm_frame_autocollapse_set(Evas_Object *obj,
Eina_Bool autocollapse)
EOLIAN static void
_elm_frame_autocollapse_set(Eo *obj EINA_UNUSED, Elm_Frame_Data *sd, Eina_Bool autocollapse)
{
ELM_FRAME_CHECK(obj);
eo_do(obj, elm_obj_frame_autocollapse_set(autocollapse));
}
static void
_autocollapse_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
{
Eina_Bool autocollapse = va_arg(*list, int);
Elm_Frame_Smart_Data *sd = _pd;
sd->collapsible = !!autocollapse;
}
EAPI Eina_Bool
elm_frame_autocollapse_get(const Evas_Object *obj)
EOLIAN static Eina_Bool
_elm_frame_autocollapse_get(Eo *obj EINA_UNUSED, Elm_Frame_Data *sd)
{
ELM_FRAME_CHECK(obj) EINA_FALSE;
Eina_Bool ret = EINA_FALSE;
eo_do((Eo *) obj, elm_obj_frame_autocollapse_get(&ret));
return ret;
return sd->collapsible;
}
static void
_autocollapse_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
EOLIAN static void
_elm_frame_collapse_set(Eo *obj, Elm_Frame_Data *sd, Eina_Bool collapse)
{
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
Elm_Frame_Smart_Data *sd = _pd;
*ret = sd->collapsible;
}
EAPI void
elm_frame_collapse_set(Evas_Object *obj,
Eina_Bool collapse)
{
ELM_FRAME_CHECK(obj);
eo_do(obj, elm_obj_frame_collapse_set(collapse));
}
static void
_collapse_set(Eo *obj, void *_pd, va_list *list)
{
Eina_Bool collapse = va_arg(*list, int);
Elm_Frame_Smart_Data *sd = _pd;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
collapse = !!collapse;
@ -287,19 +236,9 @@ _collapse_set(Eo *obj, void *_pd, va_list *list)
_sizing_eval(obj, sd);
}
EAPI void
elm_frame_collapse_go(Evas_Object *obj,
Eina_Bool collapse)
EOLIAN static void
_elm_frame_collapse_go(Eo *obj, Elm_Frame_Data *sd, Eina_Bool collapse)
{
ELM_FRAME_CHECK(obj);
eo_do(obj, elm_obj_frame_collapse_go(collapse));
}
static void
_collapse_go(Eo *obj, void *_pd, va_list *list)
{
Eina_Bool collapse = va_arg(*list, int);
Elm_Frame_Smart_Data *sd = _pd;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
collapse = !!collapse;
@ -312,71 +251,16 @@ _collapse_go(Eo *obj, void *_pd, va_list *list)
sd->anim = EINA_TRUE;
}
EAPI Eina_Bool
elm_frame_collapse_get(const Evas_Object *obj)
EOLIAN static Eina_Bool
_elm_frame_collapse_get(Eo *obj EINA_UNUSED, Elm_Frame_Data *sd)
{
ELM_FRAME_CHECK(obj) EINA_FALSE;
Eina_Bool ret = EINA_FALSE;
eo_do((Eo *) obj, elm_obj_frame_collapse_get(&ret));
return ret;
return sd->collapsed;
}
static void
_collapse_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
EOLIAN static void
_elm_frame_class_constructor(Eo_Class *klass)
{
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
Elm_Frame_Smart_Data *sd = _pd;
*ret = sd->collapsed;
}
static void
_class_constructor(Eo_Class *klass)
{
const Eo_Op_Func_Description func_desc[] = {
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_frame_smart_add),
EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CALCULATE), _elm_frame_smart_calculate),
EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_frame_smart_focus_next_manager_is),
EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_frame_smart_focus_next),
EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_frame_smart_focus_direction_manager_is),
EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_frame_smart_focus_direction),
EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_CONTENT_ALIASES_GET), _elm_frame_smart_content_aliases_get),
EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_TEXT_ALIASES_GET), _elm_frame_smart_text_aliases_get),
EO_OP_FUNC(ELM_OBJ_FRAME_ID(ELM_OBJ_FRAME_SUB_ID_AUTOCOLLAPSE_SET), _autocollapse_set),
EO_OP_FUNC(ELM_OBJ_FRAME_ID(ELM_OBJ_FRAME_SUB_ID_AUTOCOLLAPSE_GET), _autocollapse_get),
EO_OP_FUNC(ELM_OBJ_FRAME_ID(ELM_OBJ_FRAME_SUB_ID_COLLAPSE_SET), _collapse_set),
EO_OP_FUNC(ELM_OBJ_FRAME_ID(ELM_OBJ_FRAME_SUB_ID_COLLAPSE_GO), _collapse_go),
EO_OP_FUNC(ELM_OBJ_FRAME_ID(ELM_OBJ_FRAME_SUB_ID_COLLAPSE_GET), _collapse_get),
EO_OP_FUNC_SENTINEL
};
eo_class_funcs_set(klass, func_desc);
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
}
static const Eo_Op_Description op_desc[] = {
EO_OP_DESCRIPTION(ELM_OBJ_FRAME_SUB_ID_AUTOCOLLAPSE_SET, "Toggle autocollapsing of a frame."),
EO_OP_DESCRIPTION(ELM_OBJ_FRAME_SUB_ID_AUTOCOLLAPSE_GET, "Determine autocollapsing of a frame."),
EO_OP_DESCRIPTION(ELM_OBJ_FRAME_SUB_ID_COLLAPSE_SET, "Manually collapse a frame without animations."),
EO_OP_DESCRIPTION(ELM_OBJ_FRAME_SUB_ID_COLLAPSE_GO, "Manually collapse a frame with animations."),
EO_OP_DESCRIPTION(ELM_OBJ_FRAME_SUB_ID_COLLAPSE_GET, "Determine the collapse state of a frame."),
EO_OP_DESCRIPTION_SENTINEL
};
static const Eo_Class_Description class_desc = {
EO_VERSION,
MY_CLASS_NAME,
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&ELM_OBJ_FRAME_BASE_ID, op_desc, ELM_OBJ_FRAME_SUB_ID_LAST),
NULL,
sizeof(Elm_Frame_Smart_Data),
_class_constructor,
NULL
};
EO_DEFINE_CLASS(elm_obj_frame_class_get, &class_desc, ELM_OBJ_LAYOUT_CLASS, EVAS_SMART_CLICKABLE_INTERFACE, NULL);
#include "elm_frame.eo.c"

83
legacy/elementary/src/lib/elm_frame.eo Normal file
View File

@ -0,0 +1,83 @@
class Elm_Frame (Elm_Layout, Evas_Clickable_Interface)
{
eo_prefix: elm_obj_frame;
properties {
collapse {
set {
/*@
@brief Manually collapse a frame without animations
Use this to toggle the collapsed state of a frame, bypassing animations.
@ingroup Frame */
}
get {
/*@
@brief Determine the collapse state of a frame
@return true if collapsed, false otherwise
Use this to determine the collapse state of a frame.
@ingroup Frame */
}
values {
Eina_Bool collapse; /*@ true to collapse, false to expand */
}
}
autocollapse {
set {
/*@
@brief Toggle autocollapsing of a frame
When @p enable is EINA_TRUE, clicking a frame's label will collapse the frame
vertically, shrinking it to the height of the label.
By default, this is DISABLED.
@ingroup Frame */
}
get {
/*@
@brief Determine autocollapsing of a frame
@return Whether autocollapse is enabled
When this returns EINA_TRUE, clicking a frame's label will collapse the frame
vertically, shrinking it to the height of the label.
By default, this is DISABLED.
@ingroup Frame */
}
values {
Eina_Bool autocollapse; /*@ Whether to enable autocollapse */
}
}
}
methods {
collapse_go {
/*@
@brief Manually collapse a frame with animations
Use this to toggle the collapsed state of a frame, triggering animations.
@ingroup Frame */
params {
@in Eina_Bool collapse; /*@ true to collapse, false to expand */
}
}
}
implements {
Eo_Base::constructor;
class::constructor;
Evas_Smart::calculate;
Evas_Smart::add;
Elm_Widget::focus_direction;
Elm_Widget::focus_next_manager_is;
Elm_Widget::focus_next;
Elm_Widget::focus_direction_manager_is;
Elm_Layout::text_aliases::get;
Elm_Layout::content_aliases::get;
}
events {
clicked;
language,changed;
access,changed;
}
}

5
legacy/elementary/src/lib/elm_frame_eo.h
View File

@ -1,3 +1,6 @@
#include "elm_frame.eo.h"
#if 0
#define ELM_OBJ_FRAME_CLASS elm_obj_frame_class_get()
const Eo_Class *elm_obj_frame_class_get(void) EINA_CONST;
@ -84,3 +87,5 @@ enum
* @ingroup Frame
*/
#define elm_obj_frame_collapse_get(ret) ELM_OBJ_FRAME_ID(ELM_OBJ_FRAME_SUB_ID_COLLAPSE_GET), EO_TYPECHECK(Eina_Bool *, ret)
#endif

6
legacy/elementary/src/lib/elm_widget_frame.h
View File

@ -17,8 +17,8 @@
/**
* Base layout smart data extended with frame instance data.
*/
typedef struct _Elm_Frame_Smart_Data Elm_Frame_Smart_Data;
struct _Elm_Frame_Smart_Data
typedef struct _Elm_Frame_Data Elm_Frame_Data;
struct _Elm_Frame_Data
{
Eina_Bool collapsed : 1;
Eina_Bool collapsible : 1;
@ -30,7 +30,7 @@ struct _Elm_Frame_Smart_Data
*/
#define ELM_FRAME_DATA_GET(o, sd) \
Elm_Frame_Smart_Data * sd = eo_data_scope_get(o, ELM_OBJ_FRAME_CLASS)
Elm_Frame_Data * sd = eo_data_scope_get(o, ELM_OBJ_FRAME_CLASS)
#define ELM_FRAME_DATA_GET_OR_RETURN(o, ptr) \
ELM_FRAME_DATA_GET(o, ptr); \