#include <Elementary.h>
-<<<<<<< HEAD
-=======
#include "test.h"
->>>>>>> remotes/origin/upstream
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
#ifndef ELM_LIB_QUICKLAUNCH
-<<<<<<< HEAD
-void
-test_box_vert(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- Evas_Object *win, *bg, *bx, *ic;
- char buf[PATH_MAX];
-=======
#define ICON_MAX 24
typedef enum
Evas_Object *win, *bg, *bx, *ic, *bxx, *bt;
char buf[PATH_MAX];
api_data *api = calloc(1, sizeof(api_data));
->>>>>>> remotes/origin/upstream
win = elm_win_add(NULL, "box-vert", ELM_WIN_BASIC);
elm_win_title_set(win, "Box Vert");
elm_win_autodel_set(win, EINA_TRUE);
-<<<<<<< HEAD
-=======
evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
->>>>>>> remotes/origin/upstream
bg = elm_bg_add(win);
elm_win_resize_object_add(win, bg);
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(bg);
-<<<<<<< HEAD
- bx = elm_box_add(win);
- elm_win_resize_object_add(win, bx);
- evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bx);
-
- ic = elm_icon_add(win);
- snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
- elm_icon_file_set(ic, buf, NULL);
- elm_icon_scale_set(ic, 0, 0);
-=======
bxx = elm_box_add(win);
elm_win_resize_object_add(win, bxx);
evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
snprintf(buf, sizeof(buf), "%s/images/icon_01.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_resizable_set(ic, 0, 0);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_align_set(ic, 0.5, 0.5);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
ic = elm_icon_add(win);
-<<<<<<< HEAD
- snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
- elm_icon_file_set(ic, buf, NULL);
- elm_icon_scale_set(ic, 0, 0);
-=======
snprintf(buf, sizeof(buf), "%s/images/icon_02.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_resizable_set(ic, 0, 0);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_align_set(ic, 0.0, 0.5);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
ic = elm_icon_add(win);
-<<<<<<< HEAD
- snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
- elm_icon_file_set(ic, buf, NULL);
- elm_icon_scale_set(ic, 0, 0);
-=======
snprintf(buf, sizeof(buf), "%s/images/icon_03.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_resizable_set(ic, 0, 0);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_align_set(ic, EVAS_HINT_EXPAND, 0.5);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
void
test_box_horiz(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- Evas_Object *win, *bg, *bx, *ic;
- char buf[PATH_MAX];
-=======
Evas_Object *win, *bg, *bx, *ic, *bxx, *bt;
char buf[PATH_MAX];
api_data *api = calloc(1, sizeof(api_data));
->>>>>>> remotes/origin/upstream
win = elm_win_add(NULL, "box-horiz", ELM_WIN_BASIC);
elm_win_title_set(win, "Box Horiz");
elm_win_autodel_set(win, EINA_TRUE);
-<<<<<<< HEAD
-
-=======
evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
->>>>>>> remotes/origin/upstream
bg = elm_bg_add(win);
elm_win_resize_object_add(win, bg);
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(bg);
-<<<<<<< HEAD
- bx = elm_box_add(win);
- elm_box_horizontal_set(bx, EINA_TRUE);
- elm_win_resize_object_add(win, bx);
- evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bx);
-
- ic = elm_icon_add(win);
- snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
- elm_icon_file_set(ic, buf, NULL);
- elm_icon_scale_set(ic, 0, 0);
-=======
bxx = elm_box_add(win);
elm_win_resize_object_add(win, bxx);
evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
snprintf(buf, sizeof(buf), "%s/images/icon_01.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_resizable_set(ic, 0, 0);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_align_set(ic, 0.5, 0.5);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
ic = elm_icon_add(win);
-<<<<<<< HEAD
- snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
- elm_icon_file_set(ic, buf, NULL);
- elm_icon_scale_set(ic, 0, 0);
-=======
snprintf(buf, sizeof(buf), "%s/images/icon_02.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_resizable_set(ic, 0, 0);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_align_set(ic, 0.5, 0.0);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
ic = elm_icon_add(win);
-<<<<<<< HEAD
- snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
- elm_icon_file_set(ic, buf, NULL);
- elm_icon_scale_set(ic, 0, 0);
-=======
snprintf(buf, sizeof(buf), "%s/images/icon_03.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_resizable_set(ic, 0, 0);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_align_set(ic, 0.0, EVAS_HINT_EXPAND);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
evas_object_show(win);
}
-<<<<<<< HEAD
-=======
static Eina_Bool radio_index[ICON_MAX];
static int
evas_object_show(win);
}
->>>>>>> remotes/origin/upstream
typedef struct
{
Eina_List *transitions;
bx = elm_box_add(win);
elm_win_resize_object_add(win, bx);
evas_object_size_hint_weight_set(bx, 1.0, 1.0);
-<<<<<<< HEAD
-
-=======
->>>>>>> remotes/origin/upstream
evas_object_show(bx);
bt = elm_button_add(win);
#endif
#ifndef ELM_LIB_QUICKLAUNCH
-<<<<<<< HEAD
-=======
// XXX: show all type of cursors in the elementary_test. this needs to be the first test
->>>>>>> remotes/origin/upstream
typedef struct _Testitem
{
Elm_Object_Item *item;
glt_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
Elm_Object_Item *glit = event_info;
-<<<<<<< HEAD
- Evas_Object *gl = elm_genlist_item_genlist_get(glit);
- int val = (int) elm_object_item_data_get(glit);
- Elm_Object_Item *glit1, *glit2, *glit3;
-
- val *= 10;
- glit1 = elm_genlist_item_append(gl, &itct, (void *)(long)(val + 1), glit,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
- glit2 = elm_genlist_item_append(gl, &itct, (void *)(long)(val + 2), glit,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
- glit3 = elm_genlist_item_append(gl, &itct, (void *)(long)(val + 3), glit,
- ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
-=======
Evas_Object *gl = elm_object_item_widget_get(glit);
int val = (int)(long) elm_object_item_data_get(glit);
Elm_Object_Item *glit1, *glit2, *glit3;
ELM_GENLIST_ITEM_NONE, NULL, NULL);
glit3 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 3), glit,
ELM_GENLIST_ITEM_TREE, NULL, NULL);
->>>>>>> remotes/origin/upstream
elm_genlist_item_cursor_set(glit1, ELM_CURSOR_HAND2);
elm_genlist_item_cursor_set(glit2, ELM_CURSOR_HAND2);
itct.func.text_get = glt_text_get;
glit1 = elm_genlist_item_append(gl, &itct, (void *) 1, NULL,
-<<<<<<< HEAD
- ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
- glit2 = elm_genlist_item_append(gl, &itct, (void *) 2, NULL,
- ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
-=======
ELM_GENLIST_ITEM_TREE, NULL, NULL);
glit2 = elm_genlist_item_append(gl, &itct, (void *) 2, NULL,
ELM_GENLIST_ITEM_TREE, NULL, NULL);
->>>>>>> remotes/origin/upstream
glit3 = elm_genlist_item_append(gl, &itct, (void *) 3, NULL,
ELM_GENLIST_ITEM_NONE, NULL, NULL);
o = elm_button_add(win);
elm_object_cursor_set(o, ELM_CURSOR_HAND2);
-<<<<<<< HEAD
- elm_object_cursor_engine_only_set(o, EINA_FALSE);
-=======
elm_object_cursor_theme_search_enabled_set(o, EINA_FALSE);
->>>>>>> remotes/origin/upstream
elm_object_text_set(o, "hand2");
elm_box_pack_end(bx, o);
evas_object_show(o);
o = elm_button_add(win);
elm_object_cursor_set(o, "hand3");
-<<<<<<< HEAD
- elm_object_cursor_engine_only_set(o, EINA_FALSE);
-=======
elm_object_cursor_theme_search_enabled_set(o, EINA_FALSE);
->>>>>>> remotes/origin/upstream
elm_object_text_set(o, "hand3");
elm_box_pack_end(bx, o);
evas_object_show(o);
o = elm_button_add(win);
elm_object_cursor_set(o, "hand3");
-<<<<<<< HEAD
- elm_object_cursor_engine_only_set(o, EINA_FALSE);
-=======
elm_object_cursor_theme_search_enabled_set(o, EINA_FALSE);
->>>>>>> remotes/origin/upstream
elm_object_cursor_style_set(o, "transparent");
elm_object_text_set(o, "hand3 transparent");
elm_box_pack_end(bx, o);
o = elm_button_add(win);
elm_object_cursor_set(o, "hand3");
-<<<<<<< HEAD
- elm_object_cursor_engine_only_set(o, EINA_FALSE);
-=======
elm_object_cursor_theme_search_enabled_set(o, EINA_FALSE);
->>>>>>> remotes/origin/upstream
elm_object_cursor_unset(o);
elm_object_text_set(o, "unset");
elm_box_pack_end(bx, o);
elm_box_pack_end(bx, o);
evas_object_show(o);
-<<<<<<< HEAD
- elm_cursor_engine_only_set(0);
-=======
elm_config_cursor_engine_only_set(EINA_FALSE);
->>>>>>> remotes/origin/upstream
o = elm_button_add(win);
elm_object_cursor_set(o, "hand2");
elm_object_text_set(o, "hand 2 engine only config false");
elm_box_pack_end(bx, o);
evas_object_show(o);
-<<<<<<< HEAD
- elm_cursor_engine_only_set(1);
-=======
elm_config_cursor_engine_only_set(EINA_TRUE);
->>>>>>> remotes/origin/upstream
o = elm_button_add(win);
elm_object_cursor_set(o, "hand2");
elm_object_text_set(o, "hand 2 engine only config true");
evas_object_show(win);
}
-<<<<<<< HEAD
-=======
void
test_table7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
evas_object_show(win);
}
->>>>>>> remotes/origin/upstream
#endif
}
EAPI void
-<<<<<<< HEAD
-elm_box_layout_set(Evas_Object *obj, Evas_Object_Box_Layout cb, const void *data, void (*free_data)(void *data))
-=======
elm_box_layout_set(Evas_Object *obj, Evas_Object_Box_Layout cb, const void *data, Ecore_Cb free_data)
->>>>>>> remotes/origin/upstream
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
Evas_Object_Box_Layout start_layout, void *start_layout_data,
void(*start_layout_free_data)(void *data),
Evas_Object_Box_Layout end_layout, void *end_layout_data,
-<<<<<<< HEAD
- void(*end_layout_free_data)(void *data),
- void(*transition_end_cb)(void *data),
-=======
Ecore_Cb end_layout_free_data,
Ecore_Cb transition_end_cb,
->>>>>>> remotes/origin/upstream
void *transition_end_data)
{
Elm_Box_Transition *box_data;
free(data);
}
-<<<<<<< HEAD
-EAPI const Eina_List *
-=======
EAPI Eina_List *
->>>>>>> remotes/origin/upstream
elm_box_children_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
*
* @param obj The box object
*/
-<<<<<<< HEAD
-EAPI const Eina_List *elm_box_children_get(const Evas_Object *obj);
-=======
EAPI Eina_List *elm_box_children_get(const Evas_Object *obj);
->>>>>>> remotes/origin/upstream
/**
* Set the space (padding) between the box's elements.
EAPI void elm_box_padding_get(const Evas_Object *obj, Evas_Coord *horizontal, Evas_Coord *vertical);
/**
-<<<<<<< HEAD
- * Set the alignment of the whole bouding box of contents.
-=======
* Set the alignment of the whole bounding box of contents.
->>>>>>> remotes/origin/upstream
*
* Sets how the bounding box containing all the elements of the box, after
* their sizes and position has been calculated, will be aligned within
EAPI void elm_box_align_set(Evas_Object *obj, double horizontal, double vertical);
/**
-<<<<<<< HEAD
- * Get the alignment of the whole bouding box of contents.
-=======
* Get the alignment of the whole bounding box of contents.
->>>>>>> remotes/origin/upstream
*
* @param obj The box object
* @param horizontal The horizontal alignment of elements
*
* @see elm_box_layout_transition()
*/
-<<<<<<< HEAD
-EAPI void elm_box_layout_set(Evas_Object *obj, Evas_Object_Box_Layout cb, const void *data, void (*free_data)(void *data));
-=======
EAPI void elm_box_layout_set(Evas_Object *obj, Evas_Object_Box_Layout cb, const void *data, Ecore_Cb free_data);
->>>>>>> remotes/origin/upstream
/**
* Special layout function that animates the transition from one layout to another
* @see elm_box_transition_new
* @see elm_box_layout_transition
*/
-<<<<<<< HEAD
-EAPI Elm_Box_Transition *elm_box_transition_new(const double duration, Evas_Object_Box_Layout start_layout, void *start_layout_data, void (*start_layout_free_data)(void *data), Evas_Object_Box_Layout end_layout, void *end_layout_data, void (*end_layout_free_data)(void *data), void (*transition_end_cb)(void *data), void *transition_end_data);
-=======
EAPI Elm_Box_Transition *elm_box_transition_new(const double duration, Evas_Object_Box_Layout start_layout, void *start_layout_data, void (*start_layout_free_data)(void *data), Evas_Object_Box_Layout end_layout, void *end_layout_data, Ecore_Cb end_layout_free_data, Ecore_Cb transition_end_cb, void *transition_end_data);
->>>>>>> remotes/origin/upstream
/**
* Free a Elm_Box_Transition instance created with elm_box_transition_new().
* and Elementary provides functions to choose them (think of X11
* cursors, as an example).
*
-<<<<<<< HEAD
- * There's also the possibility of, besides using engine provided
- * cursors, also use ones coming from Edje theming files. Both
-=======
* By default, Elementary searches cursors only from engine.
* There's also the possibility of, besides using engine provided
* cursors, also use the ones coming from Edje theme files. Both
->>>>>>> remotes/origin/upstream
* globally and per widget, Elementary makes it possible for one to
* make the cursors lookup to be held on engines only or on
* Elementary's theme file, too. To set cursor's hot spot,
* Set if the cursor set should be searched on the theme or should use
* the provided by the engine, only.
*
-<<<<<<< HEAD
- * @note before you set if should look on theme you should define a cursor
- * with elm_object_cursor_set(). By default it will only look for cursors
- * provided by the engine.
- *
- * @param obj an object with cursor already set.
- * @param engine_only boolean to define it cursors should be looked only
-=======
* @note before you set engine_only you should define a cursor with
* elm_object_cursor_set(). By default it will only look for cursors
* provided by the engine.
*
* @param obj an object with cursor already set.
* @param engine_only boolean to define if cursors should be looked only
->>>>>>> remotes/origin/upstream
* between the provided by the engine or searched on widget's theme as well.
*
* @ingroup Cursors
*/
-<<<<<<< HEAD
-EAPI void elm_object_cursor_engine_only_set(Evas_Object *obj, Eina_Bool engine_only);
-=======
EAPI void elm_object_cursor_theme_search_enabled_set(Evas_Object *obj, Eina_Bool theme_search);
->>>>>>> remotes/origin/upstream
/**
* Get the cursor engine only usage for this object cursor.
*
* @ingroup Cursors
*/
-<<<<<<< HEAD
-EAPI Eina_Bool elm_object_cursor_engine_only_get(const Evas_Object *obj);
-
-/**
- * Get the configured cursor engine only usage
- *
- * This gets the globally configured exclusive usage of engine cursors.
- *
- * @return 1 if only engine cursors should be used
- * @ingroup Cursors
- */
-EAPI int elm_cursor_engine_only_get(void);
-
-/**
- * Set the configured cursor engine only usage
- *
- * This sets the globally configured exclusive usage of engine cursors.
- * It won't affect cursors set before changing this value.
- *
- * @param engine_only If 1 only engine cursors will be enabled, if 0 will
- * look for them on theme before.
- * @return EINA_TRUE if value is valid and setted (0 or 1)
- * @ingroup Cursors
- */
-EAPI Eina_Bool elm_cursor_engine_only_set(int engine_only);
-=======
EAPI Eina_Bool elm_object_cursor_theme_search_enabled_get(const Evas_Object *obj);
->>>>>>> remotes/origin/upstream
/**
* @}
* @defgroup Table Table
*
* A container widget to arrange other widgets in a table where items can
-<<<<<<< HEAD
- * also span multiple columns or rows - even overlap (and then be raised or
- * lowered accordingly to adjust stacking if they do overlap).
- *
- * For a Table widget the row/column count is not fixed.
- * The table widget adjusts itself when subobjects are added to it dynamically.
- *
- * The followin are examples of how to use a table:
-=======
* span multiple columns or rows - even overlap (and then be raised or
* lowered accordingly to adjust stacking if they do overlap).
*
* @endcode
*
* The following are examples of how to use a table:
->>>>>>> remotes/origin/upstream
* @li @ref tutorial_table_01
* @li @ref tutorial_table_02
*
_elm_cursor_set_hot_spots(cur);
}
-<<<<<<< HEAD
-EAPI void
-elm_object_cursor_engine_only_set(Evas_Object *obj, Eina_Bool engine_only)
-{
- ELM_CURSOR_GET_OR_RETURN(cur, obj);
- cur->engine_only = engine_only;
-=======
EINA_DEPRECATED EAPI void
elm_object_cursor_engine_only_set(Evas_Object *obj, Eina_Bool engine_only)
{
{
ELM_CURSOR_GET_OR_RETURN(cur, obj);
cur->engine_only = theme_search;
->>>>>>> remotes/origin/upstream
if (cur->obj)
{
evas_object_del(cur->obj);
_elm_cursor_cur_set(cur);
}
-<<<<<<< HEAD
-EAPI Eina_Bool
-elm_object_cursor_engine_only_get(const Evas_Object *obj)
-{
- ELM_CURSOR_GET_OR_RETURN(cur, obj, EINA_FALSE);
- return cur->engine_only;
-}
-
-EAPI int
-elm_cursor_engine_only_get(void)
-{
- return _elm_config->cursor_engine_only;
-}
-
-EAPI Eina_Bool
-elm_cursor_engine_only_set(int engine_only)
-{
- if ((engine_only < 0) || (engine_only > 1)) return EINA_FALSE;
- _elm_config->cursor_engine_only = engine_only;
- return EINA_TRUE;
-=======
EINA_DEPRECATED EAPI Eina_Bool
elm_object_cursor_engine_only_get(const Evas_Object *obj)
{
ELM_CURSOR_GET_OR_RETURN(cur, obj, EINA_FALSE);
return cur->engine_only;
->>>>>>> remotes/origin/upstream
}
projects / framework / uifw / elementary.git / commitdiff