Merge lp:~unity-team/light-themes/light-themes.add_dialog_style_v3 into lp:~ubuntu-art-pkg/light-themes/trunk
- light-themes.add_dialog_style_v3
- Merge into trunk
Proposed by
Sam Spilsbury
Status: | Rejected |
---|---|
Rejected by: | Andrea Cimitan |
Proposed branch: | lp:~unity-team/light-themes/light-themes.add_dialog_style_v3 |
Merge into: | lp:~ubuntu-art-pkg/light-themes/trunk |
Diff against target: |
409 lines (+234/-16) 2 files modified
Ambiance/metacity-1/metacity-theme-1.xml (+122/-13) Radiance/metacity-1/metacity-theme-1.xml (+112/-3) |
To merge this branch: | bzr merge lp:~unity-team/light-themes/light-themes.add_dialog_style_v3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Artwork Packagers | Pending | ||
Review via email: mp+65949@code.launchpad.net |
Commit message
Description of the change
Adds the new dialog style
To post a comment you must log in.
- 91. By Sam Spilsbury
-
* Added gtk3 version of Radiance
* New snapshot with unico based gtk3 theme
* debian/control
- Added a depends on gtk3-engines-unico (>= 0.1.0+r69)
- Bumped standards version to 3.9.2
Unmerged revisions
- 91. By Sam Spilsbury
-
* Added gtk3 version of Radiance
* New snapshot with unico based gtk3 theme
* debian/control
- Added a depends on gtk3-engines-unico (>= 0.1.0+r69)
- Bumped standards version to 3.9.2
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'Ambiance/metacity-1/close_dialog.png' |
2 | Binary files Ambiance/metacity-1/close_dialog.png 1970-01-01 00:00:00 +0000 and Ambiance/metacity-1/close_dialog.png 2011-06-27 10:04:28 +0000 differ |
3 | === added file 'Ambiance/metacity-1/close_focused_normal_dialog.png' |
4 | Binary files Ambiance/metacity-1/close_focused_normal_dialog.png 1970-01-01 00:00:00 +0000 and Ambiance/metacity-1/close_focused_normal_dialog.png 2011-06-27 10:04:28 +0000 differ |
5 | === added file 'Ambiance/metacity-1/close_focused_prelight_dialog.png' |
6 | Binary files Ambiance/metacity-1/close_focused_prelight_dialog.png 1970-01-01 00:00:00 +0000 and Ambiance/metacity-1/close_focused_prelight_dialog.png 2011-06-27 10:04:28 +0000 differ |
7 | === added file 'Ambiance/metacity-1/close_focused_pressed_dialog.png' |
8 | Binary files Ambiance/metacity-1/close_focused_pressed_dialog.png 1970-01-01 00:00:00 +0000 and Ambiance/metacity-1/close_focused_pressed_dialog.png 2011-06-27 10:04:28 +0000 differ |
9 | === modified file 'Ambiance/metacity-1/metacity-theme-1.xml' |
10 | --- Ambiance/metacity-1/metacity-theme-1.xml 2011-04-11 15:40:01 +0000 |
11 | +++ Ambiance/metacity-1/metacity-theme-1.xml 2011-06-27 10:04:28 +0000 |
12 | @@ -5,7 +5,7 @@ |
13 | <name>Ambiance</name> |
14 | <author>Kenneth Wimer, James Schriver, Andrea Cimitan</author> |
15 | <copyright>Canonical Ltd.</copyright> |
16 | - <date>April, 2011</date> |
17 | + <date>June, 2011</date> |
18 | <description>Metacity theme</description> |
19 | </info> |
20 | |
21 | @@ -23,6 +23,19 @@ |
22 | <border name="button_border" left="0" right="0" top="1" bottom="1"/> |
23 | </frame_geometry> |
24 | |
25 | +<frame_geometry name="frame_geometry_dialog" title_scale="xx-large" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="true" rounded_bottom_right="true"> |
26 | + <distance name="left_width" value="22"/> |
27 | + <distance name="right_width" value="22"/> |
28 | + <distance name="bottom_height" value="22"/> |
29 | + <distance name="left_titlebar_edge" value="3"/> |
30 | + <distance name="right_titlebar_edge" value="3"/> |
31 | + <distance name="button_width" value="18"/> |
32 | + <distance name="button_height" value="20"/> |
33 | + <distance name="title_vertical_pad" value="0"/> |
34 | + <border name="title_border" left="0" right="0" top="29" bottom="0"/> |
35 | + <border name="button_border" left="0" right="0" top="0" bottom="31"/> |
36 | +</frame_geometry> |
37 | + |
38 | <frame_geometry name="frame_geometry_abnormal" title_scale="medium" rounded_top_left="false" rounded_top_right="false"> |
39 | <distance name="left_width" value="0"/> |
40 | <distance name="right_width" value="0"/> |
41 | @@ -195,19 +208,61 @@ |
42 | <include name="draw_title_maximized_unfocused" /> |
43 | </draw_ops> |
44 | |
45 | +<draw_ops name="draw_title_text_normal_dialog"> |
46 | + <title color="#4a4a4a" |
47 | + x="10" |
48 | + y="(((height - title_height) / 2) `max` 0)"/> |
49 | + |
50 | +</draw_ops> |
51 | + |
52 | +<draw_ops name="draw_title_text_inactive_dialog"> |
53 | + <title color="#4a4a4a" |
54 | + x="10" |
55 | + y="(((height - title_height) / 2) `max` 0)"/> |
56 | +</draw_ops> |
57 | + |
58 | +<draw_ops name="draw_title_dialog"> |
59 | + <!-- Background gradient --> |
60 | + <gradient type="vertical" x="0" y="0" width="width" height="top_height"> |
61 | + <color value="#f2f1f0" /> |
62 | + <color value="#f2f1f0" /> |
63 | + <color value="#f2f1f0" /> |
64 | + </gradient> |
65 | +</draw_ops> |
66 | + |
67 | +<draw_ops name="draw_title_unfocused_dialog"> |
68 | + <!-- Background gradient --> |
69 | + <gradient type="vertical" x="0" y="0" width="width+9" height="height"> |
70 | + <color value="#f2f1f0" /> |
71 | + <color value="#f2f1f0" /> |
72 | + <color value="#f2f1f0" /> |
73 | + </gradient> |
74 | +</draw_ops> |
75 | + |
76 | +<draw_ops name="draw_title_inactive_dialog"> |
77 | + <include name="draw_title_unfocused" /> |
78 | +</draw_ops> |
79 | + |
80 | <!-- Window Frames --> |
81 | |
82 | <draw_ops name="draw_frame"> |
83 | - <rectangle color="shade/#3c3b37/0.7" x="0" y="0" width="width" height="height" filled="true"/> |
84 | + <rectangle color="shade/gtk:bg[NORMAL]/0.7" x="0" y="0" width="width" height="height" filled="true"/> |
85 | <gradient type="vertical" x="0" y="0" width="width" height="60"> |
86 | <color value="shade/#3c3b37/1.2" /> |
87 | - <color value="shade/#3c3b37/0.7" /> |
88 | + <color value="shade/gtk:bg[NORMAL]/0.7" /> |
89 | + </gradient> |
90 | +</draw_ops> |
91 | + |
92 | +<draw_ops name="draw_frame_dialog"> |
93 | + <gradient type="vertical" x="0" y="0" width="width" height="height"> |
94 | + <color value="#f2f1f0" /> |
95 | + <color value="#f2f1f0" /> |
96 | </gradient> |
97 | </draw_ops> |
98 | |
99 | <!-- bottom border --> |
100 | <draw_ops name="bottom_edge"> |
101 | - <line color="shade/#3c3b37/0.7" x1="0" x2="width" y1="height-1" y2="height-1"/> |
102 | + <line color="shade/gtk:bg[NORMAL]/0.7" x1="0" x2="width" y1="height-1" y2="height-1"/> |
103 | </draw_ops> |
104 | |
105 | <draw_ops name="border"> |
106 | @@ -385,6 +440,24 @@ |
107 | <draw_ops name="close_unfocused_pressed"> |
108 | <image filename="close.png" x="0" y="1" width="object_width" height="object_height"/> |
109 | </draw_ops> |
110 | + <draw_ops name="close_focused_normal_dialog"> |
111 | + <image filename="close_focused_normal_dialog.png" x="0" y="1" width="object_width" height="object_height"/> |
112 | + </draw_ops> |
113 | + <draw_ops name="close_focused_prelight_dialog"> |
114 | + <image filename="close_focused_prelight_dialog.png" x="0" y="1" width="object_width" height="object_height"/> |
115 | + </draw_ops> |
116 | + <draw_ops name="close_focused_pressed_dialog"> |
117 | + <image filename="close_focused_pressed_dialog.png" x="0" y="1" width="object_width" height="object_height"/> |
118 | + </draw_ops> |
119 | + <draw_ops name="close_unfocused_normal_dialog"> |
120 | + <image filename="close_focused_normal_dialog.png" x="0" y="1" width="object_width" height="object_height"/> |
121 | + </draw_ops> |
122 | + <draw_ops name="close_unfocused_prelight_dialog"> |
123 | + <image filename="close_focused_prelight_dialog.png" x="0" y="1" width="object_width" height="object_height"/> |
124 | + </draw_ops> |
125 | + <draw_ops name="close_unfocused_pressed_dialog"> |
126 | + <image filename="close_dialog.png" x="0" y="1" width="object_width" height="object_height"/> |
127 | + </draw_ops> |
128 | |
129 | <!-- FRAME STYLE --> |
130 | <frame_style name="normal_focused" geometry="frame_geometry_normal"> |
131 | @@ -464,7 +537,32 @@ |
132 | <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> |
133 | <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> |
134 | <shadow radius="8.0" opacity="0.5" color="#abde4f" x_offset="1" y_offset="4"/> |
135 | - <padding left="7" right="7" bottom="7"/> |
136 | + <padding left="5" right="5" bottom="5"/> |
137 | +</frame_style> |
138 | + |
139 | +<frame_style name="dialog_focused" geometry="frame_geometry_dialog" parent="normal_focused"> |
140 | + <piece position="title" draw_ops="draw_title_text_normal_dialog"/> |
141 | + <piece position="titlebar" draw_ops="draw_title_dialog"/> |
142 | + <piece position="left_edge" draw_ops="draw_frame_dialog"/> |
143 | + <piece position="right_edge" draw_ops="draw_frame_dialog"/> |
144 | + <piece position="bottom_edge" draw_ops="draw_frame_dialog"/> |
145 | + <button function="close" state="normal" draw_ops="close_focused_normal_dialog"/> |
146 | + <button function="close" state="prelight" draw_ops="close_focused_prelight_dialog"/> |
147 | + <button function="close" state="pressed" draw_ops="close_focused_pressed_dialog"/> |
148 | + <shadow radius="8.0" opacity="1.3" color="#abde4f" x_offset="1" y_offset="4"/> |
149 | + <padding left="0" right="0" bottom="0"/> |
150 | +</frame_style> |
151 | + |
152 | +<frame_style name="dialog_unfocused" geometry="frame_geometry_dialog" parent="normal_focused"> |
153 | + <piece position="title" draw_ops="draw_title_text_normal_dialog"/> |
154 | + <piece position="titlebar" draw_ops="draw_title_dialog"/> |
155 | + <piece position="left_edge" draw_ops="draw_frame_dialog"/> |
156 | + <piece position="right_edge" draw_ops="draw_frame_dialog"/> |
157 | + <piece position="bottom_edge" draw_ops="draw_frame_dialog"/> |
158 | + <button function="close" state="normal" draw_ops="close_unfocused_normal_dialog"/> |
159 | + <button function="close" state="prelight" draw_ops="close_unfocused_prelight_dialog"/> |
160 | + <shadow radius="8.0" opacity="1.3" color="#abde4f" x_offset="1" y_offset="4"/> |
161 | + <padding left="0" right="0" bottom="0"/> |
162 | </frame_style> |
163 | |
164 | <frame_style name="maximized_focused" geometry="geometry_maximized" parent="normal_focused"> |
165 | @@ -473,8 +571,8 @@ |
166 | <button function="maximize" state="normal" draw_ops="unmaximize_focused_normal"/> |
167 | <button function="maximize" state="prelight" draw_ops="unmaximize_focused_prelight"/> |
168 | <button function="maximize" state="pressed" draw_ops="unmaximize_focused_pressed"/> |
169 | - <shadow radius="8.0" opacity="0.3" color="#abde4f" x_offset="1" y_offset="1"/> |
170 | - <padding left="2" right="2" bottom="2"/> |
171 | + <shadow radius="0.0" opacity="0.0" color="#000000" x_offset="0" y_offset="0"/> |
172 | + <padding left="0" right="0" bottom="0"/> |
173 | </frame_style> |
174 | |
175 | <frame_style name="maximized_unfocused" geometry="geometry_maximized" parent="normal_unfocused"> |
176 | @@ -483,8 +581,8 @@ |
177 | <button function="maximize" state="normal" draw_ops="unmaximize_unfocused_normal"/> |
178 | <button function="maximize" state="prelight" draw_ops="unmaximize_unfocused_prelight"/> |
179 | <button function="maximize" state="pressed" draw_ops="unmaximize_unfocused_pressed"/> |
180 | - <!--shadow radius="8.0" opacity="0.3" color="#abde4f" x_offset="1" y_offset="1"/--> |
181 | - <!--padding left="2" right="2" bottom="2"/--> |
182 | + <shadow radius="0.0" opacity="0.0" color="#000000" x_offset="0" y_offset="0"/> |
183 | + <padding left="0" right="0" bottom="0"/> |
184 | </frame_style> |
185 | |
186 | <frame_style name="utility_focused" parent="normal_focused"> |
187 | @@ -496,8 +594,8 @@ |
188 | <button function="close" state="normal" draw_ops="close_focused_normal"/> |
189 | <button function="close" state="prelight" draw_ops="close_focused_prelight"/> |
190 | <button function="close" state="pressed" draw_ops="close_focused_pressed"/> |
191 | - <shadow radius="8.0" opacity="0.3" color="#abde4f" x_offset="1" y_offset="1"/> |
192 | - <padding left="2" right="2" bottom="2"/> |
193 | + <shadow radius="60.0" opacity="1.3" color="#abde4f" x_offset="1" y_offset="4"/> |
194 | + <padding left="7" right="7" bottom="7"/> |
195 | </frame_style> |
196 | |
197 | <frame_style name="utility_unfocused" parent="normal_unfocused"> |
198 | @@ -530,6 +628,17 @@ |
199 | <frame focus="no" state="maximized_and_shaded" style="maximized_unfocused"/><!-- todo --> |
200 | </frame_style_set> |
201 | |
202 | +<frame_style_set name="dialog"> |
203 | + <frame focus="yes" state="normal" resize="both" style="dialog_focused"/> |
204 | + <frame focus="no" state="normal" resize="both" style="dialog_unfocused"/> |
205 | + <frame focus="yes" state="maximized" style="maximized_focused"/> |
206 | + <frame focus="no" state="maximized" style="normal_focused"/> |
207 | + <frame focus="yes" state="shaded" style="dialog_focused"/><!-- todo --> |
208 | + <frame focus="no" state="shaded" style="dialog_unfocused"/><!-- todo --> |
209 | + <frame focus="yes" state="maximized_and_shaded" style="dialog_focused"/><!-- todo --> |
210 | + <frame focus="no" state="maximized_and_shaded" style="dialog_unfocused"/><!-- todo --> |
211 | +</frame_style_set> |
212 | + |
213 | <frame_style_set name="utility"> |
214 | <frame focus="yes" state="normal" resize="both" style="utility_focused"/> |
215 | <frame focus="no" state="normal" resize="both" style="utility_unfocused"/> |
216 | @@ -554,8 +663,8 @@ |
217 | |
218 | <!-- WINDOW --> |
219 | <window type="normal" style_set="normal"/> |
220 | -<window type="dialog" style_set="utility"/> |
221 | -<window type="modal_dialog" style_set="utility"/> |
222 | +<window type="dialog" style_set="normal"/> |
223 | +<window type="modal_dialog" style_set="dialog"/> |
224 | <window type="menu" style_set="utility"/> |
225 | <window type="utility" style_set="utility"/> |
226 | <window type="border" style_set="border"/> |
227 | |
228 | === added file 'Radiance/metacity-1/close_dialog.png' |
229 | Binary files Radiance/metacity-1/close_dialog.png 1970-01-01 00:00:00 +0000 and Radiance/metacity-1/close_dialog.png 2011-06-27 10:04:28 +0000 differ |
230 | === added file 'Radiance/metacity-1/close_focused_normal_dialog.png' |
231 | Binary files Radiance/metacity-1/close_focused_normal_dialog.png 1970-01-01 00:00:00 +0000 and Radiance/metacity-1/close_focused_normal_dialog.png 2011-06-27 10:04:28 +0000 differ |
232 | === added file 'Radiance/metacity-1/close_focused_prelight_dialog.png' |
233 | Binary files Radiance/metacity-1/close_focused_prelight_dialog.png 1970-01-01 00:00:00 +0000 and Radiance/metacity-1/close_focused_prelight_dialog.png 2011-06-27 10:04:28 +0000 differ |
234 | === added file 'Radiance/metacity-1/close_focused_pressed_dialog.png' |
235 | Binary files Radiance/metacity-1/close_focused_pressed_dialog.png 1970-01-01 00:00:00 +0000 and Radiance/metacity-1/close_focused_pressed_dialog.png 2011-06-27 10:04:28 +0000 differ |
236 | === modified file 'Radiance/metacity-1/metacity-theme-1.xml' |
237 | --- Radiance/metacity-1/metacity-theme-1.xml 2011-04-11 15:40:01 +0000 |
238 | +++ Radiance/metacity-1/metacity-theme-1.xml 2011-06-27 10:04:28 +0000 |
239 | @@ -5,7 +5,7 @@ |
240 | <name>Radiance</name> |
241 | <author>Kenneth Wimer, James Schriver, Andrea Cimitan</author> |
242 | <copyright>Canonical Ltd.</copyright> |
243 | - <date>March, 2011</date> |
244 | + <date>June, 2011</date> |
245 | <description>Metacity theme</description> |
246 | </info> |
247 | |
248 | @@ -36,6 +36,19 @@ |
249 | <border name="button_border" left="0" right="0" top="1" bottom="1"/> |
250 | </frame_geometry> |
251 | |
252 | +<frame_geometry name="frame_geometry_dialog" title_scale="xx-large" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="true" rounded_bottom_right="true"> |
253 | + <distance name="left_width" value="22"/> |
254 | + <distance name="right_width" value="22"/> |
255 | + <distance name="bottom_height" value="22"/> |
256 | + <distance name="left_titlebar_edge" value="3"/> |
257 | + <distance name="right_titlebar_edge" value="3"/> |
258 | + <distance name="button_width" value="18"/> |
259 | + <distance name="button_height" value="20"/> |
260 | + <distance name="title_vertical_pad" value="0"/> |
261 | + <border name="title_border" left="0" right="0" top="29" bottom="0"/> |
262 | + <border name="button_border" left="0" right="0" top="0" bottom="31"/> |
263 | +</frame_geometry> |
264 | + |
265 | <frame_geometry name="geometry_maximized" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false"> |
266 | <distance name="left_width" value="0"/> |
267 | <distance name="right_width" value="0"/> |
268 | @@ -163,6 +176,41 @@ |
269 | <include name="draw_title_unfocused" /> |
270 | </draw_ops> |
271 | |
272 | +<draw_ops name="draw_title_text_normal_dialog"> |
273 | + <title color="#4a4a4a" |
274 | + x="10" |
275 | + y="(((height - title_height) / 2) `max` 0)"/> |
276 | + |
277 | +</draw_ops> |
278 | + |
279 | +<draw_ops name="draw_title_text_inactive_dialog"> |
280 | + <title color="#4a4a4a" |
281 | + x="10" |
282 | + y="(((height - title_height) / 2) `max` 0)"/> |
283 | +</draw_ops> |
284 | + |
285 | +<draw_ops name="draw_title_dialog"> |
286 | + <!-- Background gradient --> |
287 | + <gradient type="vertical" x="0" y="0" width="width" height="top_height"> |
288 | + <color value="#f2f1f0" /> |
289 | + <color value="#f2f1f0" /> |
290 | + <color value="#f2f1f0" /> |
291 | + </gradient> |
292 | +</draw_ops> |
293 | + |
294 | +<draw_ops name="draw_title_unfocused_dialog"> |
295 | + <!-- Background gradient --> |
296 | + <gradient type="vertical" x="0" y="0" width="width+9" height="height"> |
297 | + <color value="#f2f1f0" /> |
298 | + <color value="#f2f1f0" /> |
299 | + <color value="#f2f1f0" /> |
300 | + </gradient> |
301 | +</draw_ops> |
302 | + |
303 | +<draw_ops name="draw_title_inactive_dialog"> |
304 | + <include name="draw_title_unfocused" /> |
305 | +</draw_ops> |
306 | + |
307 | <draw_ops name="draw_title_maximized"> |
308 | <!-- Background gradient --> |
309 | <gradient type="vertical" x="0" y="1" width="width" height="top_height-1"> |
310 | @@ -207,6 +255,13 @@ |
311 | </gradient> |
312 | </draw_ops> |
313 | |
314 | +<draw_ops name="draw_frame_dialog"> |
315 | + <gradient type="vertical" x="0" y="0" width="width" height="height"> |
316 | + <color value="#f2f1f0" /> |
317 | + <color value="#f2f1f0" /> |
318 | + </gradient> |
319 | +</draw_ops> |
320 | + |
321 | <!-- bottom border --> |
322 | <draw_ops name="bottom_edge"> |
323 | <line color="shade/gtk:bg[NORMAL]/0.9" x1="0" x2="width" y1="height-1" y2="height-1"/> |
324 | @@ -387,6 +442,24 @@ |
325 | <draw_ops name="close_unfocused_pressed"> |
326 | <image filename="close.png" x="0" y="1" width="object_width" height="object_height"/> |
327 | </draw_ops> |
328 | + <draw_ops name="close_focused_normal_dialog"> |
329 | + <image filename="close_focused_normal_dialog.png" x="0" y="1" width="object_width" height="object_height"/> |
330 | + </draw_ops> |
331 | + <draw_ops name="close_focused_prelight_dialog"> |
332 | + <image filename="close_focused_prelight_dialog.png" x="0" y="1" width="object_width" height="object_height"/> |
333 | + </draw_ops> |
334 | + <draw_ops name="close_focused_pressed_dialog"> |
335 | + <image filename="close_focused_pressed_dialog.png" x="0" y="1" width="object_width" height="object_height"/> |
336 | + </draw_ops> |
337 | + <draw_ops name="close_unfocused_normal_dialog"> |
338 | + <image filename="close_focused_normal_dialog.png" x="0" y="1" width="object_width" height="object_height"/> |
339 | + </draw_ops> |
340 | + <draw_ops name="close_unfocused_prelight_dialog"> |
341 | + <image filename="close_focused_prelight_dialog.png" x="0" y="1" width="object_width" height="object_height"/> |
342 | + </draw_ops> |
343 | + <draw_ops name="close_unfocused_pressed_dialog"> |
344 | + <image filename="close_dialog.png" x="0" y="1" width="object_width" height="object_height"/> |
345 | + </draw_ops> |
346 | |
347 | <!-- FRAME STYLE --> |
348 | <frame_style name="normal_focused" geometry="frame_geometry_normal"> |
349 | @@ -469,6 +542,31 @@ |
350 | <padding left="7" right="7" bottom="7"/> |
351 | </frame_style> |
352 | |
353 | +<frame_style name="dialog_focused" geometry="frame_geometry_dialog" parent="normal_focused"> |
354 | + <piece position="title" draw_ops="draw_title_text_normal_dialog"/> |
355 | + <piece position="titlebar" draw_ops="draw_title_dialog"/> |
356 | + <piece position="left_edge" draw_ops="draw_frame_dialog"/> |
357 | + <piece position="right_edge" draw_ops="draw_frame_dialog"/> |
358 | + <piece position="bottom_edge" draw_ops="draw_frame_dialog"/> |
359 | + <button function="close" state="normal" draw_ops="close_focused_normal_dialog"/> |
360 | + <button function="close" state="prelight" draw_ops="close_focused_prelight_dialog"/> |
361 | + <button function="close" state="pressed" draw_ops="close_focused_pressed_dialog"/> |
362 | + <shadow radius="8.0" opacity="1.3" color="#abde4f" x_offset="1" y_offset="4"/> |
363 | + <padding left="0" right="0" bottom="0"/> |
364 | +</frame_style> |
365 | + |
366 | +<frame_style name="dialog_unfocused" geometry="frame_geometry_dialog" parent="normal_focused"> |
367 | + <piece position="title" draw_ops="draw_title_text_normal_dialog"/> |
368 | + <piece position="titlebar" draw_ops="draw_title_dialog"/> |
369 | + <piece position="left_edge" draw_ops="draw_frame_dialog"/> |
370 | + <piece position="right_edge" draw_ops="draw_frame_dialog"/> |
371 | + <piece position="bottom_edge" draw_ops="draw_frame_dialog"/> |
372 | + <button function="close" state="normal" draw_ops="close_unfocused_normal_dialog"/> |
373 | + <button function="close" state="prelight" draw_ops="close_unfocused_prelight_dialog"/> |
374 | + <shadow radius="8.0" opacity="1.3" color="#abde4f" x_offset="1" y_offset="4"/> |
375 | + <padding left="0" right="0" bottom="0"/> |
376 | +</frame_style> |
377 | + |
378 | <frame_style name="maximized_focused" geometry="geometry_maximized" parent="normal_focused"> |
379 | <piece position="title" draw_ops="draw_title_text_normal"/> |
380 | <piece position="titlebar" draw_ops="draw_title_maximized"/> |
381 | @@ -532,6 +630,17 @@ |
382 | <frame focus="no" state="maximized_and_shaded" style="maximized_unfocused"/><!-- todo --> |
383 | </frame_style_set> |
384 | |
385 | +<frame_style_set name="dialog"> |
386 | + <frame focus="yes" state="normal" resize="both" style="dialog_focused"/> |
387 | + <frame focus="no" state="normal" resize="both" style="dialog_unfocused"/> |
388 | + <frame focus="yes" state="maximized" style="maximized_focused"/> |
389 | + <frame focus="no" state="maximized" style="normal_focused"/> |
390 | + <frame focus="yes" state="shaded" style="dialog_focused"/><!-- todo --> |
391 | + <frame focus="no" state="shaded" style="dialog_unfocused"/><!-- todo --> |
392 | + <frame focus="yes" state="maximized_and_shaded" style="dialog_focused"/><!-- todo --> |
393 | + <frame focus="no" state="maximized_and_shaded" style="dialog_unfocused"/><!-- todo --> |
394 | +</frame_style_set> |
395 | + |
396 | <frame_style_set name="utility"> |
397 | <frame focus="yes" state="normal" resize="both" style="utility_focused"/> |
398 | <frame focus="no" state="normal" resize="both" style="utility_unfocused"/> |
399 | @@ -556,8 +665,8 @@ |
400 | |
401 | <!-- WINDOW --> |
402 | <window type="normal" style_set="normal"/> |
403 | -<window type="dialog" style_set="utility"/> |
404 | -<window type="modal_dialog" style_set="utility"/> |
405 | +<window type="dialog" style_set="normal"/> |
406 | +<window type="modal_dialog" style_set="dialog"/> |
407 | <window type="menu" style_set="utility"/> |
408 | <window type="utility" style_set="utility"/> |
409 | <window type="border" style_set="border"/> |