Skip to content

Commit 82fa807

Browse files
committed
metacity: Add menu button icon
Fixes: #69
1 parent 00901d9 commit 82fa807

File tree

6 files changed

+220
-25
lines changed

6 files changed

+220
-25
lines changed

common/metacity-1/menu-icon.svg

Lines changed: 63 additions & 0 deletions
Loading

common/metacity-1/metacity-theme-1-dark.xml

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,33 @@
240240
<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
241241
</draw_ops>
242242

243+
<!--menu-->
244+
<draw_ops name="menu_focused">
245+
<image filename="menu-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
246+
</draw_ops>
247+
248+
<draw_ops name="menu_focused_pressed">
249+
<image filename="menu-icon.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
250+
</draw_ops>
251+
252+
<draw_ops name="menu_focused_prelight">
253+
<image filename="menu-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
254+
</draw_ops>
255+
256+
<draw_ops name="menu_unfocused">
257+
<image filename="menu-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
258+
</draw_ops>
259+
260+
<draw_ops name="menu_unfocused_prelight">
261+
<image filename="menu-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
262+
</draw_ops>
263+
264+
<draw_ops name="menu_unfocused_pressed">
265+
<image filename="menu-icon.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
266+
</draw_ops>
267+
243268

244269
<!--Todo-->
245-
<draw_ops name="menu_focused"></draw_ops>
246-
<draw_ops name="menu_focused_pressed"></draw_ops>
247-
<draw_ops name="menu_unfocused"></draw_ops>
248-
<draw_ops name="menu_unfocused_prelight"></draw_ops>
249-
<draw_ops name="menu_unfocused_pressed"></draw_ops>
250270
<draw_ops name="shade_focused"></draw_ops>
251271
<draw_ops name="shade_focused_pressed"></draw_ops>
252272
<draw_ops name="shade_unfocused"></draw_ops>
@@ -270,6 +290,7 @@
270290
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
271291
<button function="menu" state="normal" draw_ops="menu_focused" />
272292
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
293+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
273294
<button function="shade" state="normal" draw_ops="shade_focused" />
274295
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
275296
<button function="unshade" state="normal" draw_ops="shade_focused" />
@@ -331,6 +352,7 @@
331352
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
332353
<button function="menu" state="normal" draw_ops="menu_focused" />
333354
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
355+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
334356
<button function="shade" state="normal" draw_ops="shade_focused" />
335357
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
336358
<button function="unshade" state="normal" draw_ops="shade_focused" />
@@ -392,6 +414,7 @@
392414
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
393415
<button function="menu" state="normal" draw_ops="menu_focused" />
394416
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
417+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
395418
<button function="shade" state="normal" draw_ops="shade_focused" />
396419
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
397420
<button function="unshade" state="normal" draw_ops="shade_focused" />
@@ -453,6 +476,7 @@
453476
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
454477
<button function="menu" state="normal" draw_ops="menu_focused" />
455478
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
479+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
456480
<button function="shade" state="normal" draw_ops="shade_focused" />
457481
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
458482
<button function="unshade" state="normal" draw_ops="shade_focused" />
@@ -512,6 +536,7 @@
512536
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
513537
<button function="menu" state="normal" draw_ops="menu_focused" />
514538
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
539+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
515540
<button function="shade" state="normal" draw_ops="shade_focused" />
516541
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
517542
<button function="unshade" state="normal" draw_ops="shade_focused" />
@@ -572,6 +597,7 @@
572597
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
573598
<button function="menu" state="normal" draw_ops="menu_focused" />
574599
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
600+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
575601
<button function="shade" state="normal" draw_ops="shade_focused" />
576602
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
577603
<button function="unshade" state="normal" draw_ops="shade_focused" />

common/metacity-1/metacity-theme-1.xml

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,33 @@
240240
<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
241241
</draw_ops>
242242

243+
<!--menu-->
244+
<draw_ops name="menu_focused">
245+
<image filename="menu-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
246+
</draw_ops>
247+
248+
<draw_ops name="menu_focused_pressed">
249+
<image filename="menu-icon.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
250+
</draw_ops>
251+
252+
<draw_ops name="menu_focused_prelight">
253+
<image filename="menu-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
254+
</draw_ops>
255+
256+
<draw_ops name="menu_unfocused">
257+
<image filename="menu-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
258+
</draw_ops>
259+
260+
<draw_ops name="menu_unfocused_prelight">
261+
<image filename="menu-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
262+
</draw_ops>
263+
264+
<draw_ops name="menu_unfocused_pressed">
265+
<image filename="menu-icon.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
266+
</draw_ops>
267+
243268

244269
<!--Todo-->
245-
<draw_ops name="menu_focused"></draw_ops>
246-
<draw_ops name="menu_focused_pressed"></draw_ops>
247-
<draw_ops name="menu_unfocused"></draw_ops>
248-
<draw_ops name="menu_unfocused_prelight"></draw_ops>
249-
<draw_ops name="menu_unfocused_pressed"></draw_ops>
250270
<draw_ops name="shade_focused"></draw_ops>
251271
<draw_ops name="shade_focused_pressed"></draw_ops>
252272
<draw_ops name="shade_unfocused"></draw_ops>
@@ -270,6 +290,7 @@
270290
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
271291
<button function="menu" state="normal" draw_ops="menu_focused" />
272292
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
293+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
273294
<button function="shade" state="normal" draw_ops="shade_focused" />
274295
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
275296
<button function="unshade" state="normal" draw_ops="shade_focused" />
@@ -331,6 +352,7 @@
331352
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
332353
<button function="menu" state="normal" draw_ops="menu_focused" />
333354
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
355+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
334356
<button function="shade" state="normal" draw_ops="shade_focused" />
335357
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
336358
<button function="unshade" state="normal" draw_ops="shade_focused" />
@@ -392,6 +414,7 @@
392414
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
393415
<button function="menu" state="normal" draw_ops="menu_focused" />
394416
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
417+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
395418
<button function="shade" state="normal" draw_ops="shade_focused" />
396419
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
397420
<button function="unshade" state="normal" draw_ops="shade_focused" />
@@ -453,6 +476,7 @@
453476
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
454477
<button function="menu" state="normal" draw_ops="menu_focused" />
455478
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
479+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
456480
<button function="shade" state="normal" draw_ops="shade_focused" />
457481
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
458482
<button function="unshade" state="normal" draw_ops="shade_focused" />
@@ -512,6 +536,7 @@
512536
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
513537
<button function="menu" state="normal" draw_ops="menu_focused" />
514538
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
539+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
515540
<button function="shade" state="normal" draw_ops="shade_focused" />
516541
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
517542
<button function="unshade" state="normal" draw_ops="shade_focused" />
@@ -572,6 +597,7 @@
572597
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
573598
<button function="menu" state="normal" draw_ops="menu_focused" />
574599
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
600+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
575601
<button function="shade" state="normal" draw_ops="shade_focused" />
576602
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
577603
<button function="unshade" state="normal" draw_ops="shade_focused" />

common/metacity-1/metacity-theme-2-dark.xml

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,33 @@
240240
<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
241241
</draw_ops>
242242

243+
<!--menu-->
244+
<draw_ops name="menu_focused">
245+
<image filename="menu-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
246+
</draw_ops>
247+
248+
<draw_ops name="menu_focused_pressed">
249+
<image filename="menu-icon.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
250+
</draw_ops>
251+
252+
<draw_ops name="menu_focused_prelight">
253+
<image filename="menu-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
254+
</draw_ops>
255+
256+
<draw_ops name="menu_unfocused">
257+
<image filename="menu-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
258+
</draw_ops>
259+
260+
<draw_ops name="menu_unfocused_prelight">
261+
<image filename="menu-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
262+
</draw_ops>
263+
264+
<draw_ops name="menu_unfocused_pressed">
265+
<image filename="menu-icon.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
266+
</draw_ops>
267+
243268

244269
<!--Todo-->
245-
<draw_ops name="menu_focused"></draw_ops>
246-
<draw_ops name="menu_focused_pressed"></draw_ops>
247-
<draw_ops name="menu_unfocused"></draw_ops>
248-
<draw_ops name="menu_unfocused_prelight"></draw_ops>
249-
<draw_ops name="menu_unfocused_pressed"></draw_ops>
250270
<draw_ops name="shade_focused"></draw_ops>
251271
<draw_ops name="shade_focused_pressed"></draw_ops>
252272
<draw_ops name="shade_unfocused"></draw_ops>
@@ -270,6 +290,7 @@
270290
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
271291
<button function="menu" state="normal" draw_ops="menu_focused" />
272292
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
293+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
273294
<button function="shade" state="normal" draw_ops="shade_focused" />
274295
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
275296
<button function="unshade" state="normal" draw_ops="shade_focused" />
@@ -331,6 +352,7 @@
331352
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
332353
<button function="menu" state="normal" draw_ops="menu_focused" />
333354
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
355+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
334356
<button function="shade" state="normal" draw_ops="shade_focused" />
335357
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
336358
<button function="unshade" state="normal" draw_ops="shade_focused" />
@@ -392,6 +414,7 @@
392414
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
393415
<button function="menu" state="normal" draw_ops="menu_focused" />
394416
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
417+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
395418
<button function="shade" state="normal" draw_ops="shade_focused" />
396419
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
397420
<button function="unshade" state="normal" draw_ops="shade_focused" />
@@ -453,6 +476,7 @@
453476
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
454477
<button function="menu" state="normal" draw_ops="menu_focused" />
455478
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
479+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
456480
<button function="shade" state="normal" draw_ops="shade_focused" />
457481
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
458482
<button function="unshade" state="normal" draw_ops="shade_focused" />
@@ -512,6 +536,7 @@
512536
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
513537
<button function="menu" state="normal" draw_ops="menu_focused" />
514538
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
539+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
515540
<button function="shade" state="normal" draw_ops="shade_focused" />
516541
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
517542
<button function="unshade" state="normal" draw_ops="shade_focused" />
@@ -572,6 +597,7 @@
572597
<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
573598
<button function="menu" state="normal" draw_ops="menu_focused" />
574599
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
600+
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
575601
<button function="shade" state="normal" draw_ops="shade_focused" />
576602
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
577603
<button function="unshade" state="normal" draw_ops="shade_focused" />

0 commit comments

Comments
 (0)