Merge lp:~christhehorton/salience/update_window_controls into lp:salience

Proposed by Christopher Kyle Horton
Status: Merged
Approved by: Christopher Kyle Horton
Approved revision: 113
Merged at revision: 141
Proposed branch: lp:~christhehorton/salience/update_window_controls
Merge into: lp:salience
Diff against target: 572 lines (+134/-154)
2 files modified
metacity-1/metacity-theme-2.xml (+67/-77)
metacity-1/metacity-theme-3.xml (+67/-77)
To merge this branch: bzr merge lp:~christhehorton/salience/update_window_controls
Reviewer Review Type Date Requested Status
Frank Approve
Review via email: mp+129581@code.launchpad.net

Description of the change

Update the window controls for Salience to something that better matches the current style. These buttons are partially based off of a mockup by Frank Souza and are:

* smaller
* square (instead of round)
* lack a trough
* use new symbols
* use the same symbol for maximize/unmaximize
* eliminate the external orange highlighting on mouse hover (this is a design feature only used for keyboard focus)
* less noticeable, since they use colors closer to that of the surrounding titlebar
* more compact (align better with the top of the standard-sized Unity launcher)

To post a comment you must log in.
Revision history for this message
Christopher Kyle Horton (christhehorton) wrote :

Frank, I picked you to do the review because of your level of influence on the design of these, and I just want to make sure the unmaximize symbol has been tweaked satisfactorily ;)

112. By Christopher Kyle Horton

Adjust the minimize symbol to be more consistent.

113. By Christopher Kyle Horton

Reduce stroke width for symbols and increase glow radius (thanks Frank Souza for source modifications).

Revision history for this message
Frank (franksouza183) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'metacity-1/close.png'
2Binary files metacity-1/close.png 2012-07-23 05:03:37 +0000 and metacity-1/close.png 2012-10-14 13:23:19 +0000 differ
3=== modified file 'metacity-1/close_focused_prelight.png'
4Binary files metacity-1/close_focused_prelight.png 2012-07-23 05:03:37 +0000 and metacity-1/close_focused_prelight.png 2012-10-14 13:23:19 +0000 differ
5=== modified file 'metacity-1/close_focused_pressed.png'
6Binary files metacity-1/close_focused_pressed.png 2012-07-23 05:03:37 +0000 and metacity-1/close_focused_pressed.png 2012-10-14 13:23:19 +0000 differ
7=== modified file 'metacity-1/close_unfocused.png'
8Binary files metacity-1/close_unfocused.png 2012-06-25 05:36:11 +0000 and metacity-1/close_unfocused.png 2012-10-14 13:23:19 +0000 differ
9=== modified file 'metacity-1/close_unfocused_prelight.png'
10Binary files metacity-1/close_unfocused_prelight.png 2012-06-25 05:36:11 +0000 and metacity-1/close_unfocused_prelight.png 2012-10-14 13:23:19 +0000 differ
11=== modified file 'metacity-1/close_unfocused_pressed.png'
12Binary files metacity-1/close_unfocused_pressed.png 2012-06-25 05:36:11 +0000 and metacity-1/close_unfocused_pressed.png 2012-10-14 13:23:19 +0000 differ
13=== added symlink 'metacity-1/maximize.png'
14=== target is u'unmaximize.png'
15=== removed file 'metacity-1/maximize.png'
16Binary files metacity-1/maximize.png 2012-06-25 05:36:11 +0000 and metacity-1/maximize.png 1970-01-01 00:00:00 +0000 differ
17=== added symlink 'metacity-1/maximize_focused_prelight.png'
18=== target is u'unmaximize_focused_prelight.png'
19=== removed file 'metacity-1/maximize_focused_prelight.png'
20Binary files metacity-1/maximize_focused_prelight.png 2012-06-25 05:36:11 +0000 and metacity-1/maximize_focused_prelight.png 1970-01-01 00:00:00 +0000 differ
21=== added symlink 'metacity-1/maximize_focused_pressed.png'
22=== target is u'unmaximize_focused_pressed.png'
23=== removed file 'metacity-1/maximize_focused_pressed.png'
24Binary files metacity-1/maximize_focused_pressed.png 2012-06-25 05:36:11 +0000 and metacity-1/maximize_focused_pressed.png 1970-01-01 00:00:00 +0000 differ
25=== added symlink 'metacity-1/maximize_unfocused.png'
26=== target is u'unmaximize_unfocused.png'
27=== removed file 'metacity-1/maximize_unfocused.png'
28Binary files metacity-1/maximize_unfocused.png 2012-06-25 05:36:11 +0000 and metacity-1/maximize_unfocused.png 1970-01-01 00:00:00 +0000 differ
29=== added symlink 'metacity-1/maximize_unfocused_prelight.png'
30=== target is u'unmaximize_unfocused_prelight.png'
31=== removed file 'metacity-1/maximize_unfocused_prelight.png'
32Binary files metacity-1/maximize_unfocused_prelight.png 2012-06-25 05:36:11 +0000 and metacity-1/maximize_unfocused_prelight.png 1970-01-01 00:00:00 +0000 differ
33=== added symlink 'metacity-1/maximize_unfocused_pressed.png'
34=== target is u'unmaximize_unfocused_pressed.png'
35=== removed file 'metacity-1/maximize_unfocused_pressed.png'
36Binary files metacity-1/maximize_unfocused_pressed.png 2012-06-25 05:36:11 +0000 and metacity-1/maximize_unfocused_pressed.png 1970-01-01 00:00:00 +0000 differ
37=== modified file 'metacity-1/metacity-theme-2.xml'
38--- metacity-1/metacity-theme-2.xml 2012-09-06 05:49:08 +0000
39+++ metacity-1/metacity-theme-2.xml 2012-10-14 13:23:19 +0000
40@@ -4,7 +4,7 @@
41 <name>Salience</name>
42 <author>Christopher Kyle Horton</author>
43 <copyright>GPL</copyright>
44- <date>June 25, 2012</date>
45+ <date>October 3, 2012</date>
46 <description>An Ambiance-like theme meant to be used with FS Icons Ubuntu.</description>
47 </info>
48
49@@ -19,6 +19,7 @@
50 <constant name="C_title_focused_hilight_dark" value="shade/gtk:bg[NORMAL]/0.53" />
51 <constant name="C_title_unfocused" value="gtk:fg[INSENSITIVE])" />
52 <constant name="D_button_vertical_padding" value="2" />
53+<constant name="D_button_horizontal_padding" value="4" />
54
55 <!-- geometries -->
56
57@@ -26,30 +27,30 @@
58 <distance name="left_width" value="0" />
59 <distance name="right_width" value="0" />
60 <distance name="bottom_height" value="0" />
61- <distance name="left_titlebar_edge" value="D_button_vertical_padding"/>
62- <distance name="right_titlebar_edge" value="D_button_vertical_padding"/>
63+ <distance name="left_titlebar_edge" value="D_button_horizontal_padding"/>
64+ <distance name="right_titlebar_edge" value="D_button_horizontal_padding"/>
65 <distance name="title_vertical_pad" value="9"/>
66- <distance name="button_width" value="24" />
67+ <distance name="button_width" value="19" />
68 <distance name="button_height" value="24" />
69- <border name="title_border" left="D_button_vertical_padding" right="D_button_vertical_padding" top="0" bottom="0"/>
70+ <border name="title_border" left="D_button_horizontal_padding" right="D_button_horizontal_padding" top="0" bottom="0"/>
71 <border name="button_border" left="0" right="0" top="0" bottom="1"/>
72 </frame_geometry>
73
74 <frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
75- <distance name="left_titlebar_edge" value="D_button_vertical_padding"/>
76- <distance name="right_titlebar_edge" value="D_button_vertical_padding"/>
77+ <distance name="left_titlebar_edge" value="D_button_horizontal_padding"/>
78+ <distance name="right_titlebar_edge" value="D_button_horizontal_padding"/>
79 </frame_geometry>
80
81 <frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
82 <distance name="left_width" value="0" />
83 <distance name="right_width" value="0" />
84- <distance name="left_titlebar_edge" value="D_button_vertical_padding"/>
85- <distance name="right_titlebar_edge" value="D_button_vertical_padding"/>
86+ <distance name="left_titlebar_edge" value="D_button_horizontal_padding"/>
87+ <distance name="right_titlebar_edge" value="D_button_horizontal_padding"/>
88 <distance name="title_vertical_pad" value="8"/> <!--
89 This needs to be 1 less then the
90 title_vertical_pad on normal state
91 or you'll have bigger buttons -->
92- <border name="title_border" left="D_button_vertical_padding" right="D_button_vertical_padding" top="1" bottom="0"/>
93+ <border name="title_border" left="D_button_horizontal_padding" right="D_button_horizontal_padding" top="1" bottom="0"/>
94 <border name="button_border" left="0" right="0" top="0" bottom="1"/>
95 <distance name="bottom_height" value="0" />
96 </frame_geometry>
97@@ -64,7 +65,7 @@
98
99 <frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
100 <distance name="title_vertical_pad" value="7"/>
101- <border name="title_border" left="D_button_vertical_padding" right="D_button_vertical_padding" top="0" bottom="0"/>
102+ <border name="title_border" left="D_button_horizontal_padding" right="D_button_horizontal_padding" top="0" bottom="0"/>
103 <border name="button_border" left="0" right="0" top="0" bottom="1"/>
104 </frame_geometry>
105
106@@ -80,7 +81,7 @@
107 <distance name="left_width" value="0" />
108 <distance name="right_width" value="0" />
109 <distance name="bottom_height" value="0" />
110- <border name="title_border" left="D_button_vertical_padding" right="D_button_vertical_padding" top="0" bottom="0" />
111+ <border name="title_border" left="D_button_horizontal_padding" right="D_button_horizontal_padding" top="0" bottom="0" />
112 <border name="button_border" left="0" right="0" top="0" bottom="0"/>
113 <distance name="title_vertical_pad" value="0" />
114 </frame_geometry>
115@@ -333,17 +334,6 @@
116 <image filename="unmaximize_unfocused_pressed.png" x="0" y="D_button_vertical_padding" width="object_width" height="object_height" />
117 </draw_ops>
118
119-<!-- button trough images -->
120-<draw_ops name="left_left_background">
121- <image filename="trough_left.png" x="0" y="D_button_vertical_padding" width="object_width" height="object_height" />
122-</draw_ops>
123-<draw_ops name="left_middle_background">
124- <image filename="trough_center.png" x="0" y="D_button_vertical_padding" width="object_width" height="object_height" />
125-</draw_ops>
126-<draw_ops name="left_right_background">
127- <image filename="trough_right.png" x="0" y="D_button_vertical_padding" width="object_width" height="object_height" />
128-</draw_ops>
129-
130 <!-- frame styles -->
131
132 <frame_style name="normal_focused" geometry="normal">
133@@ -367,15 +357,15 @@
134 <button function="unshade" state="normal"><draw_ops></draw_ops></button>
135 <button function="unshade" state="pressed"><draw_ops></draw_ops></button>
136
137- <button function="left_left_background" state="normal" draw_ops="left_left_background" />
138- <button function="left_left_background" state="prelight" draw_ops="left_left_background" />
139- <button function="left_left_background" state="pressed" draw_ops="left_left_background" />
140- <button function="left_middle_background" state="normal" draw_ops="left_middle_background" />
141- <button function="left_middle_background" state="prelight" draw_ops="left_middle_background" />
142- <button function="left_middle_background" state="pressed" draw_ops="left_middle_background" />
143- <button function="left_right_background" state="normal" draw_ops="left_right_background" />
144- <button function="left_right_background" state="prelight" draw_ops="left_right_background" />
145- <button function="left_right_background" state="pressed" draw_ops="left_right_background" />
146+ <button function="left_left_background" state="normal"><draw_ops></draw_ops></button>
147+ <button function="left_left_background" state="prelight"><draw_ops></draw_ops></button>
148+ <button function="left_left_background" state="pressed"><draw_ops></draw_ops></button>
149+ <button function="left_middle_background" state="normal"><draw_ops></draw_ops></button>
150+ <button function="left_middle_background" state="prelight"><draw_ops></draw_ops></button>
151+ <button function="left_middle_background" state="pressed"><draw_ops></draw_ops></button>
152+ <button function="left_right_background" state="normal"><draw_ops></draw_ops></button>
153+ <button function="left_right_background" state="prelight"><draw_ops></draw_ops></button>
154+ <button function="left_right_background" state="pressed"><draw_ops></draw_ops></button>
155
156 <button function="right_middle_background" state="normal"><draw_ops></draw_ops></button>
157 <button function="right_middle_background" state="prelight"><draw_ops></draw_ops></button>
158@@ -415,15 +405,15 @@
159 <button function="unshade" state="normal"><draw_ops></draw_ops></button>
160 <button function="unshade" state="pressed"><draw_ops></draw_ops></button>
161
162- <button function="left_left_background" state="normal" draw_ops="left_left_background" />
163- <button function="left_left_background" state="prelight" draw_ops="left_left_background" />
164- <button function="left_left_background" state="pressed" draw_ops="left_left_background" />
165- <button function="left_middle_background" state="normal" draw_ops="left_middle_background" />
166- <button function="left_middle_background" state="prelight" draw_ops="left_middle_background" />
167- <button function="left_middle_background" state="pressed" draw_ops="left_middle_background" />
168- <button function="left_right_background" state="normal" draw_ops="left_right_background" />
169- <button function="left_right_background" state="prelight" draw_ops="left_right_background" />
170- <button function="left_right_background" state="pressed" draw_ops="left_right_background" />
171+ <button function="left_left_background" state="normal"><draw_ops></draw_ops></button>
172+ <button function="left_left_background" state="prelight"><draw_ops></draw_ops></button>
173+ <button function="left_left_background" state="pressed"><draw_ops></draw_ops></button>
174+ <button function="left_middle_background" state="normal"><draw_ops></draw_ops></button>
175+ <button function="left_middle_background" state="prelight"><draw_ops></draw_ops></button>
176+ <button function="left_middle_background" state="pressed"><draw_ops></draw_ops></button>
177+ <button function="left_right_background" state="normal"><draw_ops></draw_ops></button>
178+ <button function="left_right_background" state="prelight"><draw_ops></draw_ops></button>
179+ <button function="left_right_background" state="pressed"><draw_ops></draw_ops></button>
180
181 <button function="above" state="normal"><draw_ops></draw_ops></button>
182 <button function="above" state="pressed"><draw_ops></draw_ops></button>
183@@ -455,15 +445,15 @@
184 <button function="unshade" state="normal"><draw_ops></draw_ops></button>
185 <button function="unshade" state="pressed"><draw_ops></draw_ops></button>
186
187- <button function="left_left_background" state="normal" draw_ops="left_left_background" />
188- <button function="left_left_background" state="prelight" draw_ops="left_left_background" />
189- <button function="left_left_background" state="pressed" draw_ops="left_left_background" />
190- <button function="left_middle_background" state="normal" draw_ops="left_middle_background" />
191- <button function="left_middle_background" state="prelight" draw_ops="left_middle_background" />
192- <button function="left_middle_background" state="pressed" draw_ops="left_middle_background" />
193- <button function="left_right_background" state="normal" draw_ops="left_right_background" />
194- <button function="left_right_background" state="prelight" draw_ops="left_right_background" />
195- <button function="left_right_background" state="pressed" draw_ops="left_right_background" />
196+ <button function="left_left_background" state="normal"><draw_ops></draw_ops></button>
197+ <button function="left_left_background" state="prelight"><draw_ops></draw_ops></button>
198+ <button function="left_left_background" state="pressed"><draw_ops></draw_ops></button>
199+ <button function="left_middle_background" state="normal"><draw_ops></draw_ops></button>
200+ <button function="left_middle_background" state="prelight"><draw_ops></draw_ops></button>
201+ <button function="left_middle_background" state="pressed"><draw_ops></draw_ops></button>
202+ <button function="left_right_background" state="normal"><draw_ops></draw_ops></button>
203+ <button function="left_right_background" state="prelight"><draw_ops></draw_ops></button>
204+ <button function="left_right_background" state="pressed"><draw_ops></draw_ops></button>
205
206 <button function="above" state="normal"><draw_ops></draw_ops></button>
207 <button function="above" state="pressed"><draw_ops></draw_ops></button>
208@@ -495,15 +485,15 @@
209 <button function="unshade" state="normal"><draw_ops></draw_ops></button>
210 <button function="unshade" state="pressed"><draw_ops></draw_ops></button>
211
212- <button function="left_left_background" state="normal" draw_ops="left_left_background" />
213- <button function="left_left_background" state="prelight" draw_ops="left_left_background" />
214- <button function="left_left_background" state="pressed" draw_ops="left_left_background" />
215- <button function="left_middle_background" state="normal" draw_ops="left_middle_background" />
216- <button function="left_middle_background" state="prelight" draw_ops="left_middle_background" />
217- <button function="left_middle_background" state="pressed" draw_ops="left_middle_background" />
218- <button function="left_right_background" state="normal" draw_ops="left_right_background" />
219- <button function="left_right_background" state="prelight" draw_ops="left_right_background" />
220- <button function="left_right_background" state="pressed" draw_ops="left_right_background" />
221+ <button function="left_left_background" state="normal"><draw_ops></draw_ops></button>
222+ <button function="left_left_background" state="prelight"><draw_ops></draw_ops></button>
223+ <button function="left_left_background" state="pressed"><draw_ops></draw_ops></button>
224+ <button function="left_middle_background" state="normal"><draw_ops></draw_ops></button>
225+ <button function="left_middle_background" state="prelight"><draw_ops></draw_ops></button>
226+ <button function="left_middle_background" state="pressed"><draw_ops></draw_ops></button>
227+ <button function="left_right_background" state="normal"><draw_ops></draw_ops></button>
228+ <button function="left_right_background" state="prelight"><draw_ops></draw_ops></button>
229+ <button function="left_right_background" state="pressed"><draw_ops></draw_ops></button>
230
231 <button function="above" state="normal"><draw_ops></draw_ops></button>
232 <button function="above" state="pressed"><draw_ops></draw_ops></button>
233@@ -536,15 +526,15 @@
234 <button function="unshade" state="normal"><draw_ops></draw_ops></button>
235 <button function="unshade" state="pressed"><draw_ops></draw_ops></button>
236
237- <button function="left_left_background" state="normal" draw_ops="left_left_background" />
238- <button function="left_left_background" state="prelight" draw_ops="left_left_background" />
239- <button function="left_left_background" state="pressed" draw_ops="left_left_background" />
240- <button function="left_middle_background" state="normal" draw_ops="left_middle_background" />
241- <button function="left_middle_background" state="prelight" draw_ops="left_middle_background" />
242- <button function="left_middle_background" state="pressed" draw_ops="left_middle_background" />
243- <button function="left_right_background" state="normal" draw_ops="left_right_background" />
244- <button function="left_right_background" state="prelight" draw_ops="left_right_background" />
245- <button function="left_right_background" state="pressed" draw_ops="left_right_background" />
246+ <button function="left_left_background" state="normal"><draw_ops></draw_ops></button>
247+ <button function="left_left_background" state="prelight"><draw_ops></draw_ops></button>
248+ <button function="left_left_background" state="pressed"><draw_ops></draw_ops></button>
249+ <button function="left_middle_background" state="normal"><draw_ops></draw_ops></button>
250+ <button function="left_middle_background" state="prelight"><draw_ops></draw_ops></button>
251+ <button function="left_middle_background" state="pressed"><draw_ops></draw_ops></button>
252+ <button function="left_right_background" state="normal"><draw_ops></draw_ops></button>
253+ <button function="left_right_background" state="prelight"><draw_ops></draw_ops></button>
254+ <button function="left_right_background" state="pressed"><draw_ops></draw_ops></button>
255
256 <button function="above" state="normal"><draw_ops></draw_ops></button>
257 <button function="above" state="pressed"><draw_ops></draw_ops></button>
258@@ -577,15 +567,15 @@
259 <button function="unshade" state="normal"><draw_ops></draw_ops></button>
260 <button function="unshade" state="pressed"><draw_ops></draw_ops></button>
261
262- <button function="left_left_background" state="normal" draw_ops="left_left_background" />
263- <button function="left_left_background" state="prelight" draw_ops="left_left_background" />
264- <button function="left_left_background" state="pressed" draw_ops="left_left_background" />
265- <button function="left_middle_background" state="normal" draw_ops="left_middle_background" />
266- <button function="left_middle_background" state="prelight" draw_ops="left_middle_background" />
267- <button function="left_middle_background" state="pressed" draw_ops="left_middle_background" />
268- <button function="left_right_background" state="normal" draw_ops="left_right_background" />
269- <button function="left_right_background" state="prelight" draw_ops="left_right_background" />
270- <button function="left_right_background" state="pressed" draw_ops="left_right_background" />
271+ <button function="left_left_background" state="normal"><draw_ops></draw_ops></button>
272+ <button function="left_left_background" state="prelight"><draw_ops></draw_ops></button>
273+ <button function="left_left_background" state="pressed"><draw_ops></draw_ops></button>
274+ <button function="left_middle_background" state="normal"><draw_ops></draw_ops></button>
275+ <button function="left_middle_background" state="prelight"><draw_ops></draw_ops></button>
276+ <button function="left_middle_background" state="pressed"><draw_ops></draw_ops></button>
277+ <button function="left_right_background" state="normal"><draw_ops></draw_ops></button>
278+ <button function="left_right_background" state="prelight"><draw_ops></draw_ops></button>
279+ <button function="left_right_background" state="pressed"><draw_ops></draw_ops></button>
280
281 <button function="above" state="normal"><draw_ops></draw_ops></button>
282 <button function="above" state="pressed"><draw_ops></draw_ops></button>
283
284=== modified file 'metacity-1/metacity-theme-3.xml'
285--- metacity-1/metacity-theme-3.xml 2012-09-06 05:49:08 +0000
286+++ metacity-1/metacity-theme-3.xml 2012-10-14 13:23:19 +0000
287@@ -4,7 +4,7 @@
288 <name>Salience</name>
289 <author>Christopher Kyle Horton</author>
290 <copyright>GPL</copyright>
291- <date>June 25, 2012</date>
292+ <date>October 3, 2012</date>
293 <description>An Ambiance-like theme meant to be used with FS Icons Ubuntu.</description>
294 </info>
295
296@@ -19,6 +19,7 @@
297 <constant name="C_title_focused_hilight_dark" value="gtk:custom(wm_title_highlight_dark,gtk:bg[NORMAL])" />
298 <constant name="C_title_unfocused" value="gtk:fg[INSENSITIVE])" />
299 <constant name="D_button_vertical_padding" value="2" />
300+<constant name="D_button_horizontal_padding" value="4" />
301
302 <!-- geometries -->
303
304@@ -26,30 +27,30 @@
305 <distance name="left_width" value="0" />
306 <distance name="right_width" value="0" />
307 <distance name="bottom_height" value="0" />
308- <distance name="left_titlebar_edge" value="D_button_vertical_padding"/>
309- <distance name="right_titlebar_edge" value="D_button_vertical_padding"/>
310+ <distance name="left_titlebar_edge" value="D_button_horizontal_padding"/>
311+ <distance name="right_titlebar_edge" value="D_button_horizontal_padding"/>
312 <distance name="title_vertical_pad" value="9"/>
313- <distance name="button_width" value="24" />
314+ <distance name="button_width" value="19" />
315 <distance name="button_height" value="24" />
316- <border name="title_border" left="D_button_vertical_padding" right="D_button_vertical_padding" top="0" bottom="0"/>
317+ <border name="title_border" left="D_button_horizontal_padding" right="D_button_horizontal_padding" top="0" bottom="0"/>
318 <border name="button_border" left="0" right="0" top="0" bottom="1"/>
319 </frame_geometry>
320
321 <frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
322- <distance name="left_titlebar_edge" value="D_button_vertical_padding"/>
323- <distance name="right_titlebar_edge" value="D_button_vertical_padding"/>
324+ <distance name="left_titlebar_edge" value="D_button_horizontal_padding"/>
325+ <distance name="right_titlebar_edge" value="D_button_horizontal_padding"/>
326 </frame_geometry>
327
328 <frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
329 <distance name="left_width" value="0" />
330 <distance name="right_width" value="0" />
331- <distance name="left_titlebar_edge" value="D_button_vertical_padding"/>
332- <distance name="right_titlebar_edge" value="D_button_vertical_padding"/>
333+ <distance name="left_titlebar_edge" value="D_button_horizontal_padding"/>
334+ <distance name="right_titlebar_edge" value="D_button_horizontal_padding"/>
335 <distance name="title_vertical_pad" value="8"/> <!--
336 This needs to be 1 less then the
337 title_vertical_pad on normal state
338 or you'll have bigger buttons -->
339- <border name="title_border" left="D_button_vertical_padding" right="D_button_vertical_padding" top="1" bottom="0"/>
340+ <border name="title_border" left="D_button_horizontal_padding" right="D_button_horizontal_padding" top="1" bottom="0"/>
341 <border name="button_border" left="0" right="0" top="0" bottom="1"/>
342 <distance name="bottom_height" value="0" />
343 </frame_geometry>
344@@ -64,7 +65,7 @@
345
346 <frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
347 <distance name="title_vertical_pad" value="7"/>
348- <border name="title_border" left="D_button_vertical_padding" right="D_button_vertical_padding" top="0" bottom="0"/>
349+ <border name="title_border" left="D_button_horizontal_padding" right="D_button_horizontal_padding" top="0" bottom="0"/>
350 <border name="button_border" left="0" right="0" top="0" bottom="1"/>
351 </frame_geometry>
352
353@@ -80,7 +81,7 @@
354 <distance name="left_width" value="0" />
355 <distance name="right_width" value="0" />
356 <distance name="bottom_height" value="0" />
357- <border name="title_border" left="D_button_vertical_padding" right="D_button_vertical_padding" top="0" bottom="0" />
358+ <border name="title_border" left="D_button_horizontal_padding" right="D_button_horizontal_padding" top="0" bottom="0" />
359 <border name="button_border" left="0" right="0" top="0" bottom="0"/>
360 <distance name="title_vertical_pad" value="1" />
361 </frame_geometry>
362@@ -404,17 +405,6 @@
363 <image filename="unmaximize_unfocused_pressed.png" x="0" y="D_button_vertical_padding" width="object_width" height="object_height" />
364 </draw_ops>
365
366-<!-- button trough images -->
367-<draw_ops name="left_left_background">
368- <image filename="trough_left.png" x="0" y="D_button_vertical_padding" width="object_width" height="object_height" />
369-</draw_ops>
370-<draw_ops name="left_middle_background">
371- <image filename="trough_center.png" x="0" y="D_button_vertical_padding" width="object_width" height="object_height" />
372-</draw_ops>
373-<draw_ops name="left_right_background">
374- <image filename="trough_right.png" x="0" y="D_button_vertical_padding" width="object_width" height="object_height" />
375-</draw_ops>
376-
377 <!-- frame styles -->
378
379 <frame_style name="normal_focused" geometry="normal">
380@@ -438,15 +428,15 @@
381 <button function="unshade" state="normal"><draw_ops></draw_ops></button>
382 <button function="unshade" state="pressed"><draw_ops></draw_ops></button>
383
384- <button function="left_left_background" state="normal" draw_ops="left_left_background" />
385- <button function="left_left_background" state="prelight" draw_ops="left_left_background" />
386- <button function="left_left_background" state="pressed" draw_ops="left_left_background" />
387- <button function="left_middle_background" state="normal" draw_ops="left_middle_background" />
388- <button function="left_middle_background" state="prelight" draw_ops="left_middle_background" />
389- <button function="left_middle_background" state="pressed" draw_ops="left_middle_background" />
390- <button function="left_right_background" state="normal" draw_ops="left_right_background" />
391- <button function="left_right_background" state="prelight" draw_ops="left_right_background" />
392- <button function="left_right_background" state="pressed" draw_ops="left_right_background" />
393+ <button function="left_left_background" state="normal"><draw_ops></draw_ops></button>
394+ <button function="left_left_background" state="prelight"><draw_ops></draw_ops></button>
395+ <button function="left_left_background" state="pressed"><draw_ops></draw_ops></button>
396+ <button function="left_middle_background" state="normal"><draw_ops></draw_ops></button>
397+ <button function="left_middle_background" state="prelight"><draw_ops></draw_ops></button>
398+ <button function="left_middle_background" state="pressed"><draw_ops></draw_ops></button>
399+ <button function="left_right_background" state="normal"><draw_ops></draw_ops></button>
400+ <button function="left_right_background" state="prelight"><draw_ops></draw_ops></button>
401+ <button function="left_right_background" state="pressed"><draw_ops></draw_ops></button>
402
403 <button function="right_middle_background" state="normal"><draw_ops></draw_ops></button>
404 <button function="right_middle_background" state="prelight"><draw_ops></draw_ops></button>
405@@ -496,15 +486,15 @@
406 <button function="unshade" state="prelight"><draw_ops></draw_ops></button>
407 <button function="unshade" state="pressed"><draw_ops></draw_ops></button>
408
409- <button function="left_left_background" state="normal" draw_ops="left_left_background" />
410- <button function="left_left_background" state="prelight" draw_ops="left_left_background" />
411- <button function="left_left_background" state="pressed" draw_ops="left_left_background" />
412- <button function="left_middle_background" state="normal" draw_ops="left_middle_background" />
413- <button function="left_middle_background" state="prelight" draw_ops="left_middle_background" />
414- <button function="left_middle_background" state="pressed" draw_ops="left_middle_background" />
415- <button function="left_right_background" state="normal" draw_ops="left_right_background" />
416- <button function="left_right_background" state="prelight" draw_ops="left_right_background" />
417- <button function="left_right_background" state="pressed" draw_ops="left_right_background" />
418+ <button function="left_left_background" state="normal"><draw_ops></draw_ops></button>
419+ <button function="left_left_background" state="prelight"><draw_ops></draw_ops></button>
420+ <button function="left_left_background" state="pressed"><draw_ops></draw_ops></button>
421+ <button function="left_middle_background" state="normal"><draw_ops></draw_ops></button>
422+ <button function="left_middle_background" state="prelight"><draw_ops></draw_ops></button>
423+ <button function="left_middle_background" state="pressed"><draw_ops></draw_ops></button>
424+ <button function="left_right_background" state="normal"><draw_ops></draw_ops></button>
425+ <button function="left_right_background" state="prelight"><draw_ops></draw_ops></button>
426+ <button function="left_right_background" state="pressed"><draw_ops></draw_ops></button>
427
428 <button function="above" state="normal"><draw_ops></draw_ops></button>
429 <button function="above" state="pressed"><draw_ops></draw_ops></button>
430@@ -539,15 +529,15 @@
431 <button function="unshade" state="prelight"><draw_ops></draw_ops></button>
432 <button function="unshade" state="pressed"><draw_ops></draw_ops></button>
433
434- <button function="left_left_background" state="normal" draw_ops="left_left_background" />
435- <button function="left_left_background" state="prelight" draw_ops="left_left_background" />
436- <button function="left_left_background" state="pressed" draw_ops="left_left_background" />
437- <button function="left_middle_background" state="normal" draw_ops="left_middle_background" />
438- <button function="left_middle_background" state="prelight" draw_ops="left_middle_background" />
439- <button function="left_middle_background" state="pressed" draw_ops="left_middle_background" />
440- <button function="left_right_background" state="normal" draw_ops="left_right_background" />
441- <button function="left_right_background" state="prelight" draw_ops="left_right_background" />
442- <button function="left_right_background" state="pressed" draw_ops="left_right_background" />
443+ <button function="left_left_background" state="normal"><draw_ops></draw_ops></button>
444+ <button function="left_left_background" state="prelight"><draw_ops></draw_ops></button>
445+ <button function="left_left_background" state="pressed"><draw_ops></draw_ops></button>
446+ <button function="left_middle_background" state="normal"><draw_ops></draw_ops></button>
447+ <button function="left_middle_background" state="prelight"><draw_ops></draw_ops></button>
448+ <button function="left_middle_background" state="pressed"><draw_ops></draw_ops></button>
449+ <button function="left_right_background" state="normal"><draw_ops></draw_ops></button>
450+ <button function="left_right_background" state="prelight"><draw_ops></draw_ops></button>
451+ <button function="left_right_background" state="pressed"><draw_ops></draw_ops></button>
452
453 <button function="above" state="normal"><draw_ops></draw_ops></button>
454 <button function="above" state="pressed"><draw_ops></draw_ops></button>
455@@ -582,15 +572,15 @@
456 <button function="unshade" state="prelight"><draw_ops></draw_ops></button>
457 <button function="unshade" state="pressed"><draw_ops></draw_ops></button>
458
459- <button function="left_left_background" state="normal" draw_ops="left_left_background" />
460- <button function="left_left_background" state="prelight" draw_ops="left_left_background" />
461- <button function="left_left_background" state="pressed" draw_ops="left_left_background" />
462- <button function="left_middle_background" state="normal" draw_ops="left_middle_background" />
463- <button function="left_middle_background" state="prelight" draw_ops="left_middle_background" />
464- <button function="left_middle_background" state="pressed" draw_ops="left_middle_background" />
465- <button function="left_right_background" state="normal" draw_ops="left_right_background" />
466- <button function="left_right_background" state="prelight" draw_ops="left_right_background" />
467- <button function="left_right_background" state="pressed" draw_ops="left_right_background" />
468+ <button function="left_left_background" state="normal"><draw_ops></draw_ops></button>
469+ <button function="left_left_background" state="prelight"><draw_ops></draw_ops></button>
470+ <button function="left_left_background" state="pressed"><draw_ops></draw_ops></button>
471+ <button function="left_middle_background" state="normal"><draw_ops></draw_ops></button>
472+ <button function="left_middle_background" state="prelight"><draw_ops></draw_ops></button>
473+ <button function="left_middle_background" state="pressed"><draw_ops></draw_ops></button>
474+ <button function="left_right_background" state="normal"><draw_ops></draw_ops></button>
475+ <button function="left_right_background" state="prelight"><draw_ops></draw_ops></button>
476+ <button function="left_right_background" state="pressed"><draw_ops></draw_ops></button>
477
478 <button function="above" state="normal"><draw_ops></draw_ops></button>
479 <button function="above" state="pressed"><draw_ops></draw_ops></button>
480@@ -626,15 +616,15 @@
481 <button function="unshade" state="prelight"><draw_ops></draw_ops></button>
482 <button function="unshade" state="pressed"><draw_ops></draw_ops></button>
483
484- <button function="left_left_background" state="normal" draw_ops="left_left_background" />
485- <button function="left_left_background" state="prelight" draw_ops="left_left_background" />
486- <button function="left_left_background" state="pressed" draw_ops="left_left_background" />
487- <button function="left_middle_background" state="normal" draw_ops="left_middle_background" />
488- <button function="left_middle_background" state="prelight" draw_ops="left_middle_background" />
489- <button function="left_middle_background" state="pressed" draw_ops="left_middle_background" />
490- <button function="left_right_background" state="normal" draw_ops="left_right_background" />
491- <button function="left_right_background" state="prelight" draw_ops="left_right_background" />
492- <button function="left_right_background" state="pressed" draw_ops="left_right_background" />
493+ <button function="left_left_background" state="normal"><draw_ops></draw_ops></button>
494+ <button function="left_left_background" state="prelight"><draw_ops></draw_ops></button>
495+ <button function="left_left_background" state="pressed"><draw_ops></draw_ops></button>
496+ <button function="left_middle_background" state="normal"><draw_ops></draw_ops></button>
497+ <button function="left_middle_background" state="prelight"><draw_ops></draw_ops></button>
498+ <button function="left_middle_background" state="pressed"><draw_ops></draw_ops></button>
499+ <button function="left_right_background" state="normal"><draw_ops></draw_ops></button>
500+ <button function="left_right_background" state="prelight"><draw_ops></draw_ops></button>
501+ <button function="left_right_background" state="pressed"><draw_ops></draw_ops></button>
502
503 <button function="above" state="normal"><draw_ops></draw_ops></button>
504 <button function="above" state="pressed"><draw_ops></draw_ops></button>
505@@ -670,15 +660,15 @@
506 <button function="unshade" state="prelight"><draw_ops></draw_ops></button>
507 <button function="unshade" state="pressed"><draw_ops></draw_ops></button>
508
509- <button function="left_left_background" state="normal" draw_ops="left_left_background" />
510- <button function="left_left_background" state="prelight" draw_ops="left_left_background" />
511- <button function="left_left_background" state="pressed" draw_ops="left_left_background" />
512- <button function="left_middle_background" state="normal" draw_ops="left_middle_background" />
513- <button function="left_middle_background" state="prelight" draw_ops="left_middle_background" />
514- <button function="left_middle_background" state="pressed" draw_ops="left_middle_background" />
515- <button function="left_right_background" state="normal" draw_ops="left_right_background" />
516- <button function="left_right_background" state="prelight" draw_ops="left_right_background" />
517- <button function="left_right_background" state="pressed" draw_ops="left_right_background" />
518+ <button function="left_left_background" state="normal"><draw_ops></draw_ops></button>
519+ <button function="left_left_background" state="prelight"><draw_ops></draw_ops></button>
520+ <button function="left_left_background" state="pressed"><draw_ops></draw_ops></button>
521+ <button function="left_middle_background" state="normal"><draw_ops></draw_ops></button>
522+ <button function="left_middle_background" state="prelight"><draw_ops></draw_ops></button>
523+ <button function="left_middle_background" state="pressed"><draw_ops></draw_ops></button>
524+ <button function="left_right_background" state="normal"><draw_ops></draw_ops></button>
525+ <button function="left_right_background" state="prelight"><draw_ops></draw_ops></button>
526+ <button function="left_right_background" state="pressed"><draw_ops></draw_ops></button>
527
528 <button function="above" state="normal"><draw_ops></draw_ops></button>
529 <button function="above" state="pressed"><draw_ops></draw_ops></button>
530
531=== modified file 'metacity-1/minimize.png'
532Binary files metacity-1/minimize.png 2012-06-25 05:36:11 +0000 and metacity-1/minimize.png 2012-10-14 13:23:19 +0000 differ
533=== modified file 'metacity-1/minimize_focused_prelight.png'
534Binary files metacity-1/minimize_focused_prelight.png 2012-06-25 05:36:11 +0000 and metacity-1/minimize_focused_prelight.png 2012-10-14 13:23:19 +0000 differ
535=== modified file 'metacity-1/minimize_focused_pressed.png'
536Binary files metacity-1/minimize_focused_pressed.png 2012-06-25 05:36:11 +0000 and metacity-1/minimize_focused_pressed.png 2012-10-14 13:23:19 +0000 differ
537=== modified file 'metacity-1/minimize_unfocused.png'
538Binary files metacity-1/minimize_unfocused.png 2012-06-25 05:36:11 +0000 and metacity-1/minimize_unfocused.png 2012-10-14 13:23:19 +0000 differ
539=== modified file 'metacity-1/minimize_unfocused_prelight.png'
540Binary files metacity-1/minimize_unfocused_prelight.png 2012-06-25 05:36:11 +0000 and metacity-1/minimize_unfocused_prelight.png 2012-10-14 13:23:19 +0000 differ
541=== modified file 'metacity-1/minimize_unfocused_pressed.png'
542Binary files metacity-1/minimize_unfocused_pressed.png 2012-06-25 05:36:11 +0000 and metacity-1/minimize_unfocused_pressed.png 2012-10-14 13:23:19 +0000 differ
543=== modified file 'metacity-1/unmaximize.png'
544Binary files metacity-1/unmaximize.png 2012-06-25 05:36:11 +0000 and metacity-1/unmaximize.png 2012-10-14 13:23:19 +0000 differ
545=== modified file 'metacity-1/unmaximize_focused_prelight.png'
546Binary files metacity-1/unmaximize_focused_prelight.png 2012-06-25 05:36:11 +0000 and metacity-1/unmaximize_focused_prelight.png 2012-10-14 13:23:19 +0000 differ
547=== modified file 'metacity-1/unmaximize_focused_pressed.png'
548Binary files metacity-1/unmaximize_focused_pressed.png 2012-06-25 05:36:11 +0000 and metacity-1/unmaximize_focused_pressed.png 2012-10-14 13:23:19 +0000 differ
549=== modified file 'metacity-1/unmaximize_unfocused.png'
550Binary files metacity-1/unmaximize_unfocused.png 2012-06-25 05:36:11 +0000 and metacity-1/unmaximize_unfocused.png 2012-10-14 13:23:19 +0000 differ
551=== modified file 'metacity-1/unmaximize_unfocused_prelight.png'
552Binary files metacity-1/unmaximize_unfocused_prelight.png 2012-06-25 05:36:11 +0000 and metacity-1/unmaximize_unfocused_prelight.png 2012-10-14 13:23:19 +0000 differ
553=== modified file 'metacity-1/unmaximize_unfocused_pressed.png'
554Binary files metacity-1/unmaximize_unfocused_pressed.png 2012-06-25 05:36:11 +0000 and metacity-1/unmaximize_unfocused_pressed.png 2012-10-14 13:23:19 +0000 differ
555=== modified file 'unity/close.png'
556Binary files unity/close.png 2012-07-23 05:03:37 +0000 and unity/close.png 2012-10-14 13:23:19 +0000 differ
557=== modified file 'unity/close_focused_prelight.png'
558Binary files unity/close_focused_prelight.png 2012-07-23 05:03:37 +0000 and unity/close_focused_prelight.png 2012-10-14 13:23:19 +0000 differ
559=== modified file 'unity/close_focused_pressed.png'
560Binary files unity/close_focused_pressed.png 2012-07-23 05:03:37 +0000 and unity/close_focused_pressed.png 2012-10-14 13:23:19 +0000 differ
561=== modified file 'unity/minimize.png'
562Binary files unity/minimize.png 2012-06-25 05:19:52 +0000 and unity/minimize.png 2012-10-14 13:23:19 +0000 differ
563=== modified file 'unity/minimize_focused_prelight.png'
564Binary files unity/minimize_focused_prelight.png 2012-06-25 05:19:52 +0000 and unity/minimize_focused_prelight.png 2012-10-14 13:23:19 +0000 differ
565=== modified file 'unity/minimize_focused_pressed.png'
566Binary files unity/minimize_focused_pressed.png 2012-06-25 05:19:52 +0000 and unity/minimize_focused_pressed.png 2012-10-14 13:23:19 +0000 differ
567=== modified file 'unity/unmaximize.png'
568Binary files unity/unmaximize.png 2012-06-25 05:19:52 +0000 and unity/unmaximize.png 2012-10-14 13:23:19 +0000 differ
569=== modified file 'unity/unmaximize_focused_prelight.png'
570Binary files unity/unmaximize_focused_prelight.png 2012-06-25 05:19:52 +0000 and unity/unmaximize_focused_prelight.png 2012-10-14 13:23:19 +0000 differ
571=== modified file 'unity/unmaximize_focused_pressed.png'
572Binary files unity/unmaximize_focused_pressed.png 2012-06-25 05:19:52 +0000 and unity/unmaximize_focused_pressed.png 2012-10-14 13:23:19 +0000 differ

Subscribers

People subscribed via source and target branches