diff options
author | Stefan Schmidt <stefan@osg.samsung.com> | 2016-08-11 11:27:25 +0200 |
---|---|---|
committer | Stefan Schmidt <stefan@osg.samsung.com> | 2016-08-11 12:14:07 +0200 |
commit | 961a1ada0f091f4276dcfb8f9ed054a2c4d5c66f (patch) | |
tree | 1d20732195514d0d70535bd4561f40d278ef8936 /data/elementary/objects | |
parent | 27fc8a0467b1641d3f05d47b3bb6c637274adefa (diff) |
Manual revert of: commit 07404215a91d7e2ef7d7fa9ebbdd5e0c0312384a
combobox: add Multiple selection feature
This exposes problems with name clashes and behaviour change for the legacy API.
Revert for now and we can revisit for 1.19.
Git revert got to confused as this was committed before we merged elm in. I did
the revert manually.
Diffstat (limited to 'data/elementary/objects')
-rw-r--r-- | data/elementary/objects/Makefile.am | 1 | ||||
-rw-r--r-- | data/elementary/objects/combobox_multiple.edc | 61 |
2 files changed, 0 insertions, 62 deletions
diff --git a/data/elementary/objects/Makefile.am b/data/elementary/objects/Makefile.am index be9769ecfe..186bc65439 100644 --- a/data/elementary/objects/Makefile.am +++ b/data/elementary/objects/Makefile.am | |||
@@ -7,7 +7,6 @@ elementary/objects/test_prefs.edc \ | |||
7 | elementary/objects/test_prefs.epc \ | 7 | elementary/objects/test_prefs.epc \ |
8 | elementary/objects/multip.edc \ | 8 | elementary/objects/multip.edc \ |
9 | elementary/objects/cursors.edc \ | 9 | elementary/objects/cursors.edc \ |
10 | elementary/objects/combobox_multiple.edc \ | ||
11 | elementary/objects/font_preview.edc \ | 10 | elementary/objects/font_preview.edc \ |
12 | elementary/objects/postit_ent.edc \ | 11 | elementary/objects/postit_ent.edc \ |
13 | elementary/objects/multibuttonentry.edc \ | 12 | elementary/objects/multibuttonentry.edc \ |
diff --git a/data/elementary/objects/combobox_multiple.edc b/data/elementary/objects/combobox_multiple.edc deleted file mode 100644 index 96543833ed..0000000000 --- a/data/elementary/objects/combobox_multiple.edc +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | collections { | ||
2 | group { | ||
3 | name: "combobox_multiple_test"; | ||
4 | parts{ | ||
5 | part { | ||
6 | name: "bg"; | ||
7 | type: RECT; | ||
8 | mouse_events: 1; | ||
9 | scale:1; | ||
10 | description { | ||
11 | state: "default" 0.0; | ||
12 | color: 0 0 0 0; | ||
13 | rel1.relative: 0.0 0.0; | ||
14 | rel2.relative: 1.0 1.0; | ||
15 | } | ||
16 | } | ||
17 | part{ | ||
18 | name: "top.left"; | ||
19 | type: RECT; | ||
20 | scale: 1; | ||
21 | description { | ||
22 | state: "default" 0.0; | ||
23 | min : 0 0; | ||
24 | fixed: 1 1; | ||
25 | rel1 { relative: 0.0 0.0; to: bg; } | ||
26 | rel2 { relative: 0.0 0.0; to: bg; } | ||
27 | align: 0.0 0.0; | ||
28 | color: 0 0 0 0; | ||
29 | } | ||
30 | } | ||
31 | part{ | ||
32 | name: "bottom.right"; | ||
33 | type: RECT; | ||
34 | scale: 1; | ||
35 | description { | ||
36 | state: "default" 0.0; | ||
37 | min : 0 0; | ||
38 | fixed: 1 1; | ||
39 | rel1 { relative: 1.0 1.0; to: bg; } | ||
40 | rel2 { relative: 1.0 1.0; to: bg; } | ||
41 | align: 1.0 1.0; | ||
42 | color: 0 0 0 0; | ||
43 | } | ||
44 | } | ||
45 | part { | ||
46 | name: "combobox"; | ||
47 | type: SWALLOW; | ||
48 | mouse_events: 1; | ||
49 | scale:1; | ||
50 | description { | ||
51 | state: "default" 0.0; | ||
52 | min : 0 0; | ||
53 | max : -1 300; | ||
54 | rel1 { relative: 0.0 1.0; to: top.left; } | ||
55 | rel2 { relative: 0.0 0.0; to: bottom.right; } | ||
56 | align: 0.0 0.0; | ||
57 | } | ||
58 | } | ||
59 | } | ||
60 | } | ||
61 | } | ||