diff options
author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2021-02-23 16:41:49 +0000 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2021-02-23 16:41:49 +0000 |
commit | 8852214816433700c969a45f1bdfe75e7b75294e (patch) | |
tree | 7969a8b8c9a8db9523999700cdc84b5a85228e13 /data | |
parent | 8df0efa524e3b40548d3ff382f3e73dd91f0b100 (diff) |
TH - frame
Diffstat (limited to 'data')
-rw-r--r-- | data/elementary/themes/edc/efl/frame.edc | 133 | ||||
-rw-r--r-- | data/elementary/themes/edc/elm/frame.edc | 22 |
2 files changed, 67 insertions, 88 deletions
diff --git a/data/elementary/themes/edc/efl/frame.edc b/data/elementary/themes/edc/efl/frame.edc index 1844d25f22..7e967c48db 100644 --- a/data/elementary/themes/edc/efl/frame.edc +++ b/data/elementary/themes/edc/efl/frame.edc | |||
@@ -1,113 +1,85 @@ | |||
1 | group { name: "efl/frame"; data.item: "version" "123"; | 1 | group { name: "efl/frame"; |
2 | images.image: "shadow_square_tiny.png" COMP; | 2 | data.item: "version" "123"; |
3 | images.image: "vgrad_med_curved.png" COMP; | 3 | images.image: "win_shad_flat.png" COMP; |
4 | images.image: "bevel_out.png" COMP; | ||
5 | images.image: "holes_tiny_vert.png" COMP; | ||
6 | parts { | 4 | parts { |
7 | part { name: "shadow"; mouse_events: 0; | 5 | part { name: "shadow"; type: RECT; |
8 | description { state: "default" 0.0; | 6 | description { state: "default" 0.0; |
9 | rel1.offset: -1 0; | 7 | rel.to: "_sh1"; |
10 | rel2.offset: 0 1; | ||
11 | image.normal: "shadow_square_tiny.png"; | ||
12 | image.border: 6 6 6 6; | ||
13 | fill.smooth: 0; | ||
14 | } | 8 | } |
15 | } | 9 | description { state: "hidden" 0.0; |
16 | part { name: "base"; type: RECT; | 10 | inherit; |
17 | description { state: "default" 0.0; | 11 | visible: 0; |
18 | rel1.relative: 0.0 1.0; | ||
19 | rel1.offset: 2 0; | ||
20 | rel1.to_y: "top"; | ||
21 | rel2.offset: -3 -3; | ||
22 | color: 64 64 64 255; | ||
23 | } | 12 | } |
24 | } | 13 | } |
25 | part { name: "top"; | 14 | WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25); |
26 | description { state: "default" 0.0; | 15 | part { name: "base"; type: RECT; |
27 | image.normal: "vgrad_med_curved.png"; | 16 | scale: 1; |
28 | rel1.offset: 2 2; | ||
29 | rel2.to_y: "efl.text"; | ||
30 | rel2.offset: -3 -1; | ||
31 | fill.smooth: 0; | ||
32 | TILED_HORIZ(120) | ||
33 | } | ||
34 | } | ||
35 | part { name: "edge1"; | ||
36 | description { state: "default" 0.0; | 17 | description { state: "default" 0.0; |
37 | image.normal: "holes_tiny_vert.png"; | 18 | rel1.offset: 6 6; |
38 | rel1.offset: 4 0; | 19 | rel2.offset: -7 -7; |
39 | rel1.to_y: "efl.text"; | 20 | color: 80 80 80 255; |
40 | rel2.offset: 4 -1; | 21 | offscale; |
41 | rel2.relative: 0.0 1.0; | ||
42 | rel2.to_y: "efl.text"; | ||
43 | align: 0.0 0.5; | ||
44 | FIXED_SIZE(3, 11) | ||
45 | } | 22 | } |
46 | } | 23 | } |
47 | part { name: "edge2"; | 24 | part { name: "top"; type: SPACER; |
25 | scale: 1; | ||
48 | description { state: "default" 0.0; | 26 | description { state: "default" 0.0; |
49 | image.normal: "holes_tiny_vert.png"; | 27 | rel1.to: "base"; |
50 | rel1.offset: -5 0; | 28 | rel2.to_x: "base"; |
51 | rel1.to_y: "efl.text"; | ||
52 | rel1.relative: 1.0 0.0; | ||
53 | rel2.offset: -5 -1; | ||
54 | rel2.relative: 1.0 1.0; | ||
55 | rel2.to_y: "efl.text"; | 29 | rel2.to_y: "efl.text"; |
56 | align: 1.0 0.5; | 30 | rel2.offset: -1 3; |
57 | FIXED_SIZE(3, 11) | 31 | offscale; |
58 | } | 32 | } |
59 | } | 33 | } |
60 | part { name: "efl.text"; type: TEXT; | 34 | part { name: "efl.text"; type: TEXT; |
61 | scale: 1; | 35 | scale: 1; |
62 | effect: SHADOW BOTTOM; | ||
63 | description { state: "default" 0.0; | 36 | description { state: "default" 0.0; |
64 | color_class: "frame"; | 37 | rel1.offset: 4 4; |
65 | rel1.relative: 1.0 0.0; | 38 | rel1.to: "base"; |
66 | rel1.offset: 1 2; | 39 | rel2.relative: 1.0 0.0; |
67 | rel1.to_x: "edge1"; | 40 | rel2.offset: -5 4; |
68 | rel2.relative: 0.0 0.0; | 41 | rel2.to: "base"; |
69 | rel2.offset: -3 1; | ||
70 | rel2.to_x: "edge2"; | ||
71 | align: 0.0 0.0; | 42 | align: 0.0 0.0; |
72 | color: FN_COL_DISABLE; | 43 | color: 255 255 255 255; |
73 | text { font: FNBD; size: 10; | 44 | text { font: FNBD; size: 10; |
74 | text_class: "frame"; | ||
75 | align: 0.0 0.0; | 45 | align: 0.0 0.0; |
76 | min: 0 1; | 46 | min: 0 1; |
77 | } | 47 | } |
78 | fixed: 0 1; | 48 | fixed: 0 1; |
49 | offscale; | ||
79 | } | 50 | } |
80 | } | 51 | } |
81 | part { name: "clip"; type: RECT; | 52 | part { name: "bg"; type: RECT; |
53 | scale: 1; | ||
82 | description { state: "default" 0.0; | 54 | description { state: "default" 0.0; |
55 | rel1.to_x: "base"; | ||
56 | rel1.to_y: "top"; | ||
83 | rel1.relative: 0.0 1.0; | 57 | rel1.relative: 0.0 1.0; |
84 | rel1.offset: 5 0; | 58 | rel2.to: "base"; |
85 | rel1.to_y: "efl.text"; | 59 | color: 64 64 64 255; |
86 | rel2.offset: -7 -7; | 60 | } |
61 | } | ||
62 | part { name: "clip"; type: RECT; | ||
63 | description { state: "default" 0.0; | ||
64 | rel1.to: "bg"; | ||
65 | rel2.to: "bg"; | ||
87 | } | 66 | } |
88 | } | 67 | } |
89 | part { name: "efl.content"; type: SWALLOW; | 68 | part { name: "efl.content"; type: SWALLOW; |
90 | clip_to: "clip"; | 69 | clip_to: "clip"; |
70 | scale: 1; | ||
91 | description { state: "default" 0.0; | 71 | description { state: "default" 0.0; |
92 | align: 0.0 1.0; | 72 | align: 0.0 1.0; |
93 | rel1.relative: 0.0 1.0; | 73 | rel.to: "bg"; |
94 | rel1.offset: 5 0; | 74 | rel1.offset: 4 4; |
95 | rel1.to_y: "efl.text"; | 75 | rel2.offset: -5 -5; |
96 | rel2.offset: -7 -7; | 76 | offscale; |
97 | } | 77 | } |
98 | description { state: "collapsed" 0.0; | 78 | description { state: "collapsed" 0.0; |
99 | inherit: "default" 0.0; | 79 | inherit: "default" 0.0; |
100 | minmul: 1.0 0.0; | 80 | minmul: 1.0 0.0; |
101 | } | 81 | rel1.offset: 4 0; |
102 | } | 82 | rel2.offset: -5 -1; |
103 | part { name: "bevel"; mouse_events: 0; | ||
104 | description { state: "default" 0.0; | ||
105 | rel1.offset: 2 2; | ||
106 | rel2.offset: -3 -3; | ||
107 | image.normal: "bevel_out.png"; | ||
108 | image.border: 1 1 1 1; | ||
109 | image.middle: 0; | ||
110 | fill.smooth: 0; | ||
111 | } | 83 | } |
112 | } | 84 | } |
113 | part { name: "event"; type: RECT; ignore_flags: ON_HOLD; | 85 | part { name: "event"; type: RECT; ignore_flags: ON_HOLD; |
@@ -119,6 +91,7 @@ group { name: "efl/frame"; data.item: "version" "123"; | |||
119 | } | 91 | } |
120 | } | 92 | } |
121 | programs { | 93 | programs { |
94 | EFL_UI_CLICKABLE_PART_BIND("event") | ||
122 | program { name: "collapse"; | 95 | program { name: "collapse"; |
123 | action: STATE_SET "collapsed" 0.0; | 96 | action: STATE_SET "collapsed" 0.0; |
124 | target: "efl.content"; | 97 | target: "efl.content"; |
@@ -131,9 +104,10 @@ group { name: "efl/frame"; data.item: "version" "123"; | |||
131 | transition: DECELERATE 0.3; | 104 | transition: DECELERATE 0.3; |
132 | after: "signal"; | 105 | after: "signal"; |
133 | } | 106 | } |
134 | EFL_UI_CLICKABLE_PART_BIND("event") | 107 | program { signal: "mouse,up,1"; source: "event"; |
135 | program { | 108 | action: SIGNAL_EMIT "efl,action,click" "efl"; |
136 | signal: "efl,action,toggle"; source: "efl"; | 109 | } |
110 | program { signal: "efl,action,toggle"; source: "efl"; | ||
137 | script { | 111 | script { |
138 | new st[31]; | 112 | new st[31]; |
139 | new Float:vl; | 113 | new Float:vl; |
@@ -144,8 +118,7 @@ group { name: "efl/frame"; data.item: "version" "123"; | |||
144 | run_program(PROGRAM:"expand"); | 118 | run_program(PROGRAM:"expand"); |
145 | } | 119 | } |
146 | } | 120 | } |
147 | program { | 121 | program { signal: "efl,action,switch"; source: "efl"; |
148 | signal: "efl,action,switch"; source: "efl"; | ||
149 | script { | 122 | script { |
150 | new st[31]; | 123 | new st[31]; |
151 | new Float:vl; | 124 | new Float:vl; |
diff --git a/data/elementary/themes/edc/elm/frame.edc b/data/elementary/themes/edc/elm/frame.edc index 9b4e082d53..23394651fd 100644 --- a/data/elementary/themes/edc/elm/frame.edc +++ b/data/elementary/themes/edc/elm/frame.edc | |||
@@ -69,9 +69,8 @@ group { name: "elm/frame/base/default"; | |||
69 | scale: 1; | 69 | scale: 1; |
70 | description { state: "default" 0.0; | 70 | description { state: "default" 0.0; |
71 | align: 0.0 1.0; | 71 | align: 0.0 1.0; |
72 | rel1.to: "bg"; | 72 | rel.to: "bg"; |
73 | rel1.offset: 4 4; | 73 | rel1.offset: 4 4; |
74 | rel2.to: "bg"; | ||
75 | rel2.offset: -5 -5; | 74 | rel2.offset: -5 -5; |
76 | offscale; | 75 | offscale; |
77 | } | 76 | } |
@@ -103,12 +102,10 @@ group { name: "elm/frame/base/default"; | |||
103 | transition: DECELERATE 0.3; | 102 | transition: DECELERATE 0.3; |
104 | after: "signal"; | 103 | after: "signal"; |
105 | } | 104 | } |
106 | program { | 105 | program { signal: "mouse,up,1"; source: "event"; |
107 | signal: "mouse,up,1"; source: "event"; | ||
108 | action: SIGNAL_EMIT "elm,action,click" "elm"; | 106 | action: SIGNAL_EMIT "elm,action,click" "elm"; |
109 | } | 107 | } |
110 | program { | 108 | program { signal: "elm,action,toggle"; source: "elm"; |
111 | signal: "elm,action,toggle"; source: "elm"; | ||
112 | script { | 109 | script { |
113 | new st[31]; | 110 | new st[31]; |
114 | new Float:vl; | 111 | new Float:vl; |
@@ -119,8 +116,7 @@ group { name: "elm/frame/base/default"; | |||
119 | run_program(PROGRAM:"expand"); | 116 | run_program(PROGRAM:"expand"); |
120 | } | 117 | } |
121 | } | 118 | } |
122 | program { | 119 | program { signal: "elm,action,switch"; source: "elm"; |
123 | signal: "elm,action,switch"; source: "elm"; | ||
124 | script { | 120 | script { |
125 | new st[31]; | 121 | new st[31]; |
126 | new Float:vl; | 122 | new Float:vl; |
@@ -168,11 +164,13 @@ group { name: "elm/frame/base/pad_medium"; | |||
168 | inherit: "elm/frame/base/pad_small"; | 164 | inherit: "elm/frame/base/pad_small"; |
169 | parts { | 165 | parts { |
170 | part { name: "b0"; | 166 | part { name: "b0"; |
167 | scale: 1; | ||
171 | description { state: "default" 0.0; | 168 | description { state: "default" 0.0; |
172 | min: 6 6; max: 6 6; | 169 | min: 6 6; max: 6 6; |
173 | } | 170 | } |
174 | } | 171 | } |
175 | part { name: "b1"; | 172 | part { name: "b1"; |
173 | scale: 1; | ||
176 | description { state: "default" 0.0; | 174 | description { state: "default" 0.0; |
177 | min: 6 6; max: 6 6; | 175 | min: 6 6; max: 6 6; |
178 | } | 176 | } |
@@ -184,11 +182,13 @@ group { name: "elm/frame/base/pad_large"; | |||
184 | inherit: "elm/frame/base/pad_small"; | 182 | inherit: "elm/frame/base/pad_small"; |
185 | parts { | 183 | parts { |
186 | part { name: "b0"; | 184 | part { name: "b0"; |
185 | scale: 1; | ||
187 | description { state: "default" 0.0; | 186 | description { state: "default" 0.0; |
188 | min: 12 12; max: 12 12; | 187 | min: 12 12; max: 12 12; |
189 | } | 188 | } |
190 | } | 189 | } |
191 | part { name: "b1"; | 190 | part { name: "b1"; |
191 | scale: 1; | ||
192 | description { state: "default" 0.0; | 192 | description { state: "default" 0.0; |
193 | min: 12 12; max: 12 12; | 193 | min: 12 12; max: 12 12; |
194 | } | 194 | } |
@@ -200,11 +200,13 @@ group { name: "elm/frame/base/pad_huge"; | |||
200 | inherit: "elm/frame/base/pad_small"; | 200 | inherit: "elm/frame/base/pad_small"; |
201 | parts { | 201 | parts { |
202 | part { name: "b0"; | 202 | part { name: "b0"; |
203 | scale: 1; | ||
203 | description { state: "default" 0.0; | 204 | description { state: "default" 0.0; |
204 | min: 24 24; max: 24 24; | 205 | min: 24 24; max: 24 24; |
205 | } | 206 | } |
206 | } | 207 | } |
207 | part { name: "b1"; | 208 | part { name: "b1"; |
209 | scale: 1; | ||
208 | description { state: "default" 0.0; | 210 | description { state: "default" 0.0; |
209 | min: 24 24; max: 24 24; | 211 | min: 24 24; max: 24 24; |
210 | } | 212 | } |
@@ -215,6 +217,7 @@ group { name: "elm/frame/base/pad_huge"; | |||
215 | group { name: "elm/frame/base/outdent_top"; | 217 | group { name: "elm/frame/base/outdent_top"; |
216 | parts { | 218 | parts { |
217 | part { name: "elm.swallow.content"; type: SWALLOW; | 219 | part { name: "elm.swallow.content"; type: SWALLOW; |
220 | scale: 1; | ||
218 | description { state: "default" 0.0; | 221 | description { state: "default" 0.0; |
219 | rel1.to_y: "base"; | 222 | rel1.to_y: "base"; |
220 | rel1.relative: 0.0 1.0; | 223 | rel1.relative: 0.0 1.0; |
@@ -223,6 +226,7 @@ group { name: "elm/frame/base/outdent_top"; | |||
223 | } | 226 | } |
224 | } | 227 | } |
225 | part { name: "base"; type: RECT; | 228 | part { name: "base"; type: RECT; |
229 | scale: 1; | ||
226 | description { state: "default" 0.0; | 230 | description { state: "default" 0.0; |
227 | fixed: 0 1; | 231 | fixed: 0 1; |
228 | rel1.offset: 4 2; | 232 | rel1.offset: 4 2; |
@@ -237,6 +241,7 @@ group { name: "elm/frame/base/outdent_top"; | |||
237 | group { name: "elm/frame/base/outdent_bottom"; | 241 | group { name: "elm/frame/base/outdent_bottom"; |
238 | parts { | 242 | parts { |
239 | part { name: "elm.swallow.content"; type: SWALLOW; | 243 | part { name: "elm.swallow.content"; type: SWALLOW; |
244 | scale: 1; | ||
240 | description { state: "default" 0.0; | 245 | description { state: "default" 0.0; |
241 | rel1.offset: 4 4; | 246 | rel1.offset: 4 4; |
242 | rel2.to_y: "base"; | 247 | rel2.to_y: "base"; |
@@ -245,6 +250,7 @@ group { name: "elm/frame/base/outdent_bottom"; | |||
245 | } | 250 | } |
246 | } | 251 | } |
247 | part { name: "base"; type: RECT; | 252 | part { name: "base"; type: RECT; |
253 | scale: 1; | ||
248 | description { state: "default" 0.0; | 254 | description { state: "default" 0.0; |
249 | fixed: 0 1; | 255 | fixed: 0 1; |
250 | rel1.offset: 4 -3; | 256 | rel1.offset: 4 -3; |