projects
/
framework
/
uifw
/
elementary.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/upstream'
[framework/uifw/elementary.git]
/
src
/
bin
/
test_bg.c
diff --git
a/src/bin/test_bg.c
b/src/bin/test_bg.c
index
cb216f3
..
0db78af
100644
(file)
--- a/
src/bin/test_bg.c
+++ b/
src/bin/test_bg.c
@@
-5,6
+5,8
@@
#ifndef ELM_LIB_QUICKLAUNCH
static void
#ifndef ELM_LIB_QUICKLAUNCH
static void
+<<<<<<< HEAD
+=======
_cb_size_radio_changed(void *data, Evas_Object *obj, void *event __UNUSED__)
{
Evas_Object *o_bg = data;
_cb_size_radio_changed(void *data, Evas_Object *obj, void *event __UNUSED__)
{
Evas_Object *o_bg = data;
@@
-14,6
+16,7
@@
_cb_size_radio_changed(void *data, Evas_Object *obj, void *event __UNUSED__)
}
static void
}
static void
+>>>>>>> remotes/origin/upstream
_cb_radio_changed(void *data, Evas_Object *obj, void *event __UNUSED__)
{
Evas_Object *o_bg = data;
_cb_radio_changed(void *data, Evas_Object *obj, void *event __UNUSED__)
{
Evas_Object *o_bg = data;
@@
-92,8
+95,11
@@
void
test_bg_image(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Evas_Object *win, *bg;
test_bg_image(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Evas_Object *win, *bg;
+<<<<<<< HEAD
+=======
Evas_Object *box, *hbox, *o_bg;
Evas_Object *rd, *rdg;
Evas_Object *box, *hbox, *o_bg;
Evas_Object *rd, *rdg;
+>>>>>>> remotes/origin/upstream
char buf[PATH_MAX];
win = elm_win_add(NULL, "bg-image", ELM_WIN_BASIC);
char buf[PATH_MAX];
win = elm_win_add(NULL, "bg-image", ELM_WIN_BASIC);
@@
-101,10
+107,17
@@
test_bg_image(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
elm_win_autodel_set(win, EINA_TRUE);
bg = elm_bg_add(win);
elm_win_autodel_set(win, EINA_TRUE);
bg = elm_bg_add(win);
+<<<<<<< HEAD
+ snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get());
+ elm_bg_file_set(bg, buf, NULL);
+=======
+>>>>>>> remotes/origin/upstream
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, bg);
evas_object_show(bg);
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, bg);
evas_object_show(bg);
+<<<<<<< HEAD
+=======
box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, box);
box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, box);
@@
-155,6
+168,7
@@
test_bg_image(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_show(hbox);
evas_object_show(o_bg);
evas_object_show(hbox);
evas_object_show(o_bg);
+>>>>>>> remotes/origin/upstream
evas_object_size_hint_min_set(bg, 160, 160);
evas_object_size_hint_max_set(bg, 640, 640);
evas_object_resize(win, 320, 320);
evas_object_size_hint_min_set(bg, 160, 160);
evas_object_size_hint_max_set(bg, 640, 640);
evas_object_resize(win, 320, 320);