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

elementary/colorselector - removed unnecesary layout 

SVN revision: 69830
This commit is contained in:
ChunEon Park 2012-04-02 00:50:57 +00:00
parent 440ef74427
commit b8274af55b
4 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/elementary/data/objects/Makefile.am
View File

@ -9,17 +9,15 @@ EDJE_FLAGS = $(EDJE_FLAGS_$(V)) -id $(top_srcdir)/data/objects -fd $(top_srcdir)
filesdir = $(datadir)/elementary/objects
files_DATA = test.edj multip.edj colorpreview.edj cursors.edj font_preview.edj postit_ent.edj multibuttonentry.edj
files_DATA = test.edj multip.edj cursors.edj font_preview.edj postit_ent.edj multibuttonentry.edj
EXTRA_DIST = \
test.edc \
multip.edc \
colorpreview.edc \
cursors.edc \
font_preview.edc \
postit_ent.edc \
multibuttonentry.edc \
grid_bg.png \
over.png \
under.png \
sky.jpg \

22
legacy/elementary/data/objects/colorpreview.edc
View File

@ -1,22 +0,0 @@
images {
image: "grid_bg.png" COMP;
}
collections {
group { name: "main";
parts {
part { name: "Grid";
type: IMAGE;
description { state: "default" 0;
image.normal: "grid_bg.png";
}
}
part { name: "ColorPreview";
type: SWALLOW;
mouse_events: 0;
description { state: "default" 0;
}
}
}
}
}

BIN
legacy/elementary/data/objects/grid_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

13
legacy/elementary/src/bin/test_colorselector.c
View File

@ -42,8 +42,7 @@ _colorpalette_longpressed_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
void
test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Evas_Object *win, *bg, *bx, *cs, *fr, *ly, *re;
char buf[PATH_MAX];
Evas_Object *win, *bg, *bx, *cs, *fr, *re;
int r, g, b, a;
win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC);
@ -68,17 +67,9 @@ test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
elm_box_pack_end(bx, fr);
evas_object_show(fr);
ly = elm_layout_add(win);
snprintf(buf, sizeof(buf), "%s/objects/colorpreview.edj", elm_app_data_dir_get());
elm_layout_file_set(ly, buf, "main");
evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_content_set(fr, ly);
evas_object_show(ly);
re = evas_object_rectangle_add(evas_object_evas_get(win));
evas_object_show(re);
elm_object_part_content_set(ly, "ColorPreview", re);
elm_object_content_set(fr, re);
fr = elm_frame_add(win);
evas_object_size_hint_weight_set(fr, 1.0, 0);