forked from enlightenment/efl
Add illume conformant widget and test app.
SVN revision: 44982
This commit is contained in:
parent
61c86da960
commit
914243deb8
|
@ -22168,4 +22168,35 @@ group
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
group
|
||||||
|
{
|
||||||
|
name: "elm/conformant/base/default";
|
||||||
|
parts
|
||||||
|
{
|
||||||
|
part
|
||||||
|
{
|
||||||
|
name: "elm.swallow.shelf";
|
||||||
|
type: SWALLOW;
|
||||||
|
description
|
||||||
|
{
|
||||||
|
state: "default" 0.0;
|
||||||
|
align: 0.0 0.0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
part
|
||||||
|
{
|
||||||
|
name: "elm.swallow.content";
|
||||||
|
type: SWALLOW;
|
||||||
|
description
|
||||||
|
{
|
||||||
|
state: "default" 0.0;
|
||||||
|
align: 0.0 0.0;
|
||||||
|
rel1.relative: 0.0 1.0;
|
||||||
|
rel1.to_y: "elm.swallow.shelf";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,7 +69,8 @@ test_panel.c \
|
||||||
test_map.c \
|
test_map.c \
|
||||||
test_weather.c \
|
test_weather.c \
|
||||||
test_flip.c \
|
test_flip.c \
|
||||||
test_label.c
|
test_label.c \
|
||||||
|
test_conform.c
|
||||||
|
|
||||||
elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
|
elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
|
||||||
elementary_test_LDFLAGS =
|
elementary_test_LDFLAGS =
|
||||||
|
|
|
@ -57,6 +57,7 @@ void test_map(void *data, Evas_Object *obj, void *event_info);
|
||||||
void test_weather(void *data, Evas_Object *obj, void *event_info);
|
void test_weather(void *data, Evas_Object *obj, void *event_info);
|
||||||
void test_flip(void *data, Evas_Object *obj, void *event_info);
|
void test_flip(void *data, Evas_Object *obj, void *event_info);
|
||||||
void test_label(void *data, Evas_Object *obj, void *event_info);
|
void test_label(void *data, Evas_Object *obj, void *event_info);
|
||||||
|
void test_conformant(void *data, Evas_Object *obj, void *event_info);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
my_win_del(void *data, Evas_Object *obj, void *event_info)
|
my_win_del(void *data, Evas_Object *obj, void *event_info)
|
||||||
|
@ -196,6 +197,7 @@ my_win_main(void)
|
||||||
elm_list_item_append(li, "Weather", NULL, NULL, test_weather, NULL);
|
elm_list_item_append(li, "Weather", NULL, NULL, test_weather, NULL);
|
||||||
elm_list_item_append(li, "Flip", NULL, NULL, test_flip, NULL);
|
elm_list_item_append(li, "Flip", NULL, NULL, test_flip, NULL);
|
||||||
elm_list_item_append(li, "Label", NULL, NULL, test_label, NULL);
|
elm_list_item_append(li, "Label", NULL, NULL, test_label, NULL);
|
||||||
|
elm_list_item_append(li, "Conformant", NULL, NULL, test_conformant, NULL);
|
||||||
|
|
||||||
elm_list_go(li);
|
elm_list_go(li);
|
||||||
|
|
||||||
|
|
|
@ -1247,6 +1247,9 @@ extern "C" {
|
||||||
EAPI Eina_Bool elm_scrolled_entry_context_menu_disabled_get(Evas_Object *obj);
|
EAPI Eina_Bool elm_scrolled_entry_context_menu_disabled_get(Evas_Object *obj);
|
||||||
EAPI void elm_scrolled_entry_scrollbar_policy_set(Evas_Object *obj, Elm_Scroller_Policy h, Elm_Scroller_Policy v);
|
EAPI void elm_scrolled_entry_scrollbar_policy_set(Evas_Object *obj, Elm_Scroller_Policy h, Elm_Scroller_Policy v);
|
||||||
|
|
||||||
|
EAPI Evas_Object *elm_conformant_add(Evas_Object *parent);
|
||||||
|
EAPI void elm_conformant_content_set(Evas_Object *obj, Evas_Object *content);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -68,6 +68,7 @@ elm_menu.c \
|
||||||
elm_panel.c \
|
elm_panel.c \
|
||||||
elm_map.c \
|
elm_map.c \
|
||||||
elm_flip.c \
|
elm_flip.c \
|
||||||
|
elm_conform.c \
|
||||||
\
|
\
|
||||||
elc_notepad.c \
|
elc_notepad.c \
|
||||||
elc_anchorview.c \
|
elc_anchorview.c \
|
||||||
|
|
Loading…
Reference in New Issue