summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authordivyesh purohit <div.purohit@samsung.com>2016-03-10 14:24:50 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-03-10 14:50:59 -0800
commit015db15c626b9b06116fcc8f7ec61bbae3c6cc30 (patch)
tree59e8f97c580a7eb21865e0e613dc88593d6c8940 /data
parent633d2557c8a79ceeb02f6064a47e205093685b2e (diff)
downloadelementary-015db15c626b9b06116fcc8f7ec61bbae3c6cc30.tar.gz
combobox: add Multiple selection feature
Summary: This patch focuses on Combobox widget customization, Multibuttonentry widget is used instead of entry for taking user input. The idea is to make the widget look like {F28112} {F28115} when the multiple_selection is set. To-DO: 1) Need to add scrollable interface to combobox when MBE is used (need some suggestions on it). 2) focus cycle is still buggy as genlist requires focus otherwise selected item will return NULL (sometimes) Signed-off-by: divyesh purohit <div.purohit@samsung.com> @feature Test Plan: Please run combobox multiple selection example from elementart_test. Reviewers: raster, shilpasingh, cedric Subscribers: govi, rajeshps Projects: #elementary Differential Revision: https://phab.enlightenment.org/D3570
Diffstat (limited to 'data')
-rw-r--r--data/objects/Makefile.am8
-rw-r--r--data/objects/combobox_multiple.edc61
2 files changed, 68 insertions, 1 deletions
diff --git a/data/objects/Makefile.am b/data/objects/Makefile.am
index f8f37784c..86593ca8a 100644
--- a/data/objects/Makefile.am
+++ b/data/objects/Makefile.am
@@ -7,7 +7,7 @@ EDJE_CC_FLAGS += -id $(top_srcdir)/data/objects -fd $(top_srcdir)/data/objects
filesdir = $(datadir)/elementary/objects
-files_DATA = test.edj test_external.edj multip.edj cursors.edj font_preview.edj postit_ent.edj multibuttonentry.edj test_prefs.edj test_prefs.epb test_focus_style.edj
+files_DATA = test.edj test_external.edj multip.edj cursors.edj combobox_multiple.edj font_preview.edj postit_ent.edj multibuttonentry.edj test_prefs.edj test_prefs.epb test_focus_style.edj
EXTRA_DIST = \
test.edc \
@@ -16,6 +16,7 @@ test_prefs.edc \
test_prefs.epc \
multip.edc \
cursors.edc \
+combobox_multiple.edc \
font_preview.edc \
postit_ent.edc \
multibuttonentry.edc \
@@ -57,6 +58,11 @@ cursors.edj: Makefile $(EXTRA_DIST)
$(top_srcdir)/data/objects/cursors.edc \
$(top_builddir)/data/objects/cursors.edj
+combobox_multiple.edj: Makefile combobox_multiple.edc
+ $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
+ $(top_srcdir)/data/objects/combobox_multiple.edc \
+ $(top_builddir)/data/objects/combobox_multiple.edj
+
font_preview.edj: Makefile $(EXTRA_DIST)
$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
$(top_srcdir)/data/objects/font_preview.edc \
diff --git a/data/objects/combobox_multiple.edc b/data/objects/combobox_multiple.edc
new file mode 100644
index 000000000..96543833e
--- /dev/null
+++ b/data/objects/combobox_multiple.edc
@@ -0,0 +1,61 @@
+collections {
+group {
+ name: "combobox_multiple_test";
+ parts{
+ part {
+ name: "bg";
+ type: RECT;
+ mouse_events: 1;
+ scale:1;
+ description {
+ state: "default" 0.0;
+ color: 0 0 0 0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 1.0;
+ }
+ }
+ part{
+ name: "top.left";
+ type: RECT;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ min : 0 0;
+ fixed: 1 1;
+ rel1 { relative: 0.0 0.0; to: bg; }
+ rel2 { relative: 0.0 0.0; to: bg; }
+ align: 0.0 0.0;
+ color: 0 0 0 0;
+ }
+ }
+ part{
+ name: "bottom.right";
+ type: RECT;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ min : 0 0;
+ fixed: 1 1;
+ rel1 { relative: 1.0 1.0; to: bg; }
+ rel2 { relative: 1.0 1.0; to: bg; }
+ align: 1.0 1.0;
+ color: 0 0 0 0;
+ }
+ }
+ part {
+ name: "combobox";
+ type: SWALLOW;
+ mouse_events: 1;
+ scale:1;
+ description {
+ state: "default" 0.0;
+ min : 0 0;
+ max : -1 300;
+ rel1 { relative: 0.0 1.0; to: top.left; }
+ rel2 { relative: 0.0 0.0; to: bottom.right; }
+ align: 0.0 0.0;
+ }
+ }
+ }
+}
+}