diff options
author | Stefan Schmidt <s.schmidt@samsung.com> | 2019-01-25 09:41:24 +0100 |
---|---|---|
committer | Stefan Schmidt <s.schmidt@samsung.com> | 2019-01-25 09:49:49 +0100 |
commit | 41977fd19e2abeebb90f885af599d9ece2fb4406 (patch) | |
tree | 32a8b1aaf03a18062fc6c02228801ac7d1bb8f38 /data/elementary/objects | |
parent | a686b7d9fee99c631756eca2ce3e2dad1e296f0d (diff) |
Revert "Revert "efl_ui_pager: add tests for efl_ui_pager""
This reverts commit a686b7d9fee99c631756eca2ce3e2dad1e296f0d.
Turns out in my eagerness to un-break the build I did not check the
patch queue before reverting. If I would have done this I would have
seen the fix for the break alreay being submitted by Junsu Choi.
This is my bad, the two reverts could have been avoid. Sorry.
Note to self: give yourself a moment, and check the patch queue, before
rushing out a revert. :/
Diffstat (limited to 'data/elementary/objects')
-rw-r--r-- | data/elementary/objects/Makefile.am | 1 | ||||
-rw-r--r-- | data/elementary/objects/meson.build | 1 | ||||
-rw-r--r-- | data/elementary/objects/test_pager.edc | 96 |
3 files changed, 98 insertions, 0 deletions
diff --git a/data/elementary/objects/Makefile.am b/data/elementary/objects/Makefile.am index ac8391f79a..c1325b8865 100644 --- a/data/elementary/objects/Makefile.am +++ b/data/elementary/objects/Makefile.am | |||
@@ -4,6 +4,7 @@ EXTRA_DIST += \ | |||
4 | elementary/objects/test.edc \ | 4 | elementary/objects/test.edc \ |
5 | elementary/objects/test_external.edc \ | 5 | elementary/objects/test_external.edc \ |
6 | elementary/objects/test_masking.edc \ | 6 | elementary/objects/test_masking.edc \ |
7 | elementary/objects/test_pager.edc \ | ||
7 | elementary/objects/test_prefs.edc \ | 8 | elementary/objects/test_prefs.edc \ |
8 | elementary/objects/test_prefs.epc \ | 9 | elementary/objects/test_prefs.epc \ |
9 | elementary/objects/test_tab_pager.edc \ | 10 | elementary/objects/test_tab_pager.edc \ |
diff --git a/data/elementary/objects/meson.build b/data/elementary/objects/meson.build index 18352eb409..6d9ead2463 100644 --- a/data/elementary/objects/meson.build +++ b/data/elementary/objects/meson.build | |||
@@ -5,6 +5,7 @@ edc_files = [ | |||
5 | 'test_masking.edc', | 5 | 'test_masking.edc', |
6 | 'test_tab_pager.edc', | 6 | 'test_tab_pager.edc', |
7 | 'test_tooltip.edc', | 7 | 'test_tooltip.edc', |
8 | 'test_pager.edc', | ||
8 | 'test_prefs.edc', | 9 | 'test_prefs.edc', |
9 | 'cursors.edc', | 10 | 'cursors.edc', |
10 | 'font_preview.edc', | 11 | 'font_preview.edc', |
diff --git a/data/elementary/objects/test_pager.edc b/data/elementary/objects/test_pager.edc new file mode 100644 index 0000000000..44f31c6648 --- /dev/null +++ b/data/elementary/objects/test_pager.edc | |||
@@ -0,0 +1,96 @@ | |||
1 | collections { | ||
2 | group { | ||
3 | name: "pager"; | ||
4 | parts { | ||
5 | rect { "bg"; | ||
6 | desc { "default"; | ||
7 | color: 0 0 0 0; | ||
8 | } | ||
9 | } | ||
10 | swallow { "pager"; | ||
11 | desc { "default"; | ||
12 | } | ||
13 | } | ||
14 | swallow { "prev_btn"; | ||
15 | desc { "default"; | ||
16 | rel1.relative: 0.0 0.5; | ||
17 | rel1.offset: 10 0; | ||
18 | rel2.relative: 0.0 0.5; | ||
19 | rel2.offset: 10 0; | ||
20 | align: 0.0 0.5; | ||
21 | min: 30 30; | ||
22 | } | ||
23 | } | ||
24 | swallow { "next_btn"; | ||
25 | desc { "default"; | ||
26 | rel1.relative: 1.0 0.5; | ||
27 | rel1.offset: -10 0; | ||
28 | rel2.relative: 1.0 0.5; | ||
29 | rel2.offset: -10 0; | ||
30 | align: 1.0 0.5; | ||
31 | min: 30 30; | ||
32 | } | ||
33 | } | ||
34 | } | ||
35 | } | ||
36 | group { | ||
37 | name: "page"; | ||
38 | parts { | ||
39 | rect { "bg"; | ||
40 | desc { "default"; | ||
41 | } | ||
42 | } | ||
43 | text { "tl"; | ||
44 | desc { "default"; | ||
45 | rel1.relative: 0 0; | ||
46 | rel2.relative: 0 0; | ||
47 | align: 0 0; | ||
48 | color: 0 0 0 255; | ||
49 | text { size: 10; | ||
50 | min: 1 1; | ||
51 | } | ||
52 | } | ||
53 | } | ||
54 | text { "tr"; | ||
55 | desc { "default"; | ||
56 | rel1.relative: 1 0; | ||
57 | rel2.relative: 1 0; | ||
58 | align: 1 0; | ||
59 | color: 0 0 0 255; | ||
60 | text { size: 10; | ||
61 | min: 1 1; | ||
62 | } | ||
63 | } | ||
64 | } | ||
65 | text { "bl"; | ||
66 | desc { "default"; | ||
67 | rel1.relative: 0 1; | ||
68 | rel2.relative: 0 1; | ||
69 | align: 0 1; | ||
70 | color: 0 0 0 255; | ||
71 | text { size: 10; | ||
72 | min: 1 1; | ||
73 | } | ||
74 | } | ||
75 | } | ||
76 | text { "br"; | ||
77 | desc { "default"; | ||
78 | rel1.relative: 1 1; | ||
79 | rel2.relative: 1 1; | ||
80 | align: 1 1; | ||
81 | color: 0 0 0 255; | ||
82 | text { size: 10; | ||
83 | min: 1 1; | ||
84 | } | ||
85 | } | ||
86 | } | ||
87 | text { "text"; | ||
88 | desc { "default"; | ||
89 | color: 0 0 0 255; | ||
90 | text { size: 20; | ||
91 | } | ||
92 | } | ||
93 | } | ||
94 | } | ||
95 | } | ||
96 | } | ||