Skip to content

Commit 0d2a983

Browse files
committed
metacity: Add shade/unshade button icon
1 parent 82fa807 commit 0d2a983

File tree

6 files changed

+550
-195
lines changed

6 files changed

+550
-195
lines changed

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

Lines changed: 93 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -265,13 +265,55 @@
265265
<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"/>
266266
</draw_ops>
267267

268+
<!--shade-->
269+
<draw_ops name="shade_focused">
270+
<image filename="shade-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
271+
</draw_ops>
272+
273+
<draw_ops name="shade_focused_pressed">
274+
<image filename="shade-icon.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
275+
</draw_ops>
276+
277+
<draw_ops name="shade_focused_prelight">
278+
<image filename="shade-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
279+
</draw_ops>
280+
281+
<draw_ops name="shade_unfocused">
282+
<image filename="shade-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
283+
</draw_ops>
268284

269-
<!--Todo-->
270-
<draw_ops name="shade_focused"></draw_ops>
271-
<draw_ops name="shade_focused_pressed"></draw_ops>
272-
<draw_ops name="shade_unfocused"></draw_ops>
273-
<draw_ops name="shade_unfocused_prelight"></draw_ops>
274-
<draw_ops name="shade_unfocused_pressed"></draw_ops>
285+
<draw_ops name="shade_unfocused_prelight">
286+
<image filename="shade-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
287+
</draw_ops>
288+
289+
<draw_ops name="shade_unfocused_pressed">
290+
<image filename="shade-icon.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
291+
</draw_ops>
292+
293+
<!--unshade-->
294+
<draw_ops name="unshade_focused">
295+
<image filename="shade-icon.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
296+
</draw_ops>
297+
298+
<draw_ops name="unshade_focused_pressed">
299+
<image filename="shade-icon.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
300+
</draw_ops>
301+
302+
<draw_ops name="unshade_focused_prelight">
303+
<image filename="shade-icon.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
304+
</draw_ops>
305+
306+
<draw_ops name="unshade_unfocused">
307+
<image filename="shade-icon.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
308+
</draw_ops>
309+
310+
<draw_ops name="unshade_unfocused_prelight">
311+
<image filename="shade-icon.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
312+
</draw_ops>
313+
314+
<draw_ops name="unshade_unfocused_pressed">
315+
<image filename="shade-icon.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
316+
</draw_ops>
275317

276318
<!-- frame styles -->
277319

@@ -293,8 +335,10 @@
293335
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
294336
<button function="shade" state="normal" draw_ops="shade_focused" />
295337
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
296-
<button function="unshade" state="normal" draw_ops="shade_focused" />
297-
<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
338+
<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
339+
<button function="unshade" state="normal" draw_ops="unshade_focused" />
340+
<button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" />
341+
<button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" />
298342
<button function="above" state="normal"><draw_ops></draw_ops></button>
299343
<button function="above" state="pressed"><draw_ops></draw_ops></button>
300344
<button function="unabove" state="normal"><draw_ops></draw_ops></button>
@@ -324,9 +368,9 @@
324368
<button function="shade" state="normal" draw_ops="shade_unfocused" />
325369
<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
326370
<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
327-
<button function="unshade" state="normal" draw_ops="shade_unfocused" />
328-
<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
329-
<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
371+
<button function="unshade" state="normal" draw_ops="unshade_unfocused" />
372+
<button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" />
373+
<button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" />
330374
<button function="above" state="normal"><draw_ops></draw_ops></button>
331375
<button function="above" state="pressed"><draw_ops></draw_ops></button>
332376
<button function="unabove" state="normal"><draw_ops></draw_ops></button>
@@ -355,8 +399,10 @@
355399
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
356400
<button function="shade" state="normal" draw_ops="shade_focused" />
357401
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
358-
<button function="unshade" state="normal" draw_ops="shade_focused" />
359-
<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
402+
<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
403+
<button function="unshade" state="normal" draw_ops="unshade_focused" />
404+
<button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" />
405+
<button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" />
360406
<button function="above" state="normal"><draw_ops></draw_ops></button>
361407
<button function="above" state="pressed"><draw_ops></draw_ops></button>
362408
<button function="unabove" state="normal"><draw_ops></draw_ops></button>
@@ -386,9 +432,9 @@
386432
<button function="shade" state="normal" draw_ops="shade_unfocused" />
387433
<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
388434
<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
389-
<button function="unshade" state="normal" draw_ops="shade_unfocused" />
390-
<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
391-
<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
435+
<button function="unshade" state="normal" draw_ops="unshade_unfocused" />
436+
<button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" />
437+
<button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" />
392438
<button function="above" state="normal"><draw_ops></draw_ops></button>
393439
<button function="above" state="pressed"><draw_ops></draw_ops></button>
394440
<button function="unabove" state="normal"><draw_ops></draw_ops></button>
@@ -417,8 +463,10 @@
417463
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
418464
<button function="shade" state="normal" draw_ops="shade_focused" />
419465
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
420-
<button function="unshade" state="normal" draw_ops="shade_focused" />
421-
<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
466+
<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
467+
<button function="unshade" state="normal" draw_ops="unshade_focused" />
468+
<button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" />
469+
<button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" />
422470
<button function="above" state="normal"><draw_ops></draw_ops></button>
423471
<button function="above" state="pressed"><draw_ops></draw_ops></button>
424472
<button function="unabove" state="normal"><draw_ops></draw_ops></button>
@@ -448,9 +496,9 @@
448496
<button function="shade" state="normal" draw_ops="shade_unfocused" />
449497
<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
450498
<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
451-
<button function="unshade" state="normal" draw_ops="shade_unfocused" />
452-
<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
453-
<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
499+
<button function="unshade" state="normal" draw_ops="unshade_unfocused" />
500+
<button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" />
501+
<button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" />
454502
<button function="above" state="normal"><draw_ops></draw_ops></button>
455503
<button function="above" state="pressed"><draw_ops></draw_ops></button>
456504
<button function="unabove" state="normal"><draw_ops></draw_ops></button>
@@ -479,8 +527,10 @@
479527
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
480528
<button function="shade" state="normal" draw_ops="shade_focused" />
481529
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
482-
<button function="unshade" state="normal" draw_ops="shade_focused" />
483-
<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
530+
<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
531+
<button function="unshade" state="normal" draw_ops="unshade_focused" />
532+
<button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" />
533+
<button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" />
484534
<button function="above" state="normal"><draw_ops></draw_ops></button>
485535
<button function="above" state="pressed"><draw_ops></draw_ops></button>
486536
<button function="unabove" state="normal"><draw_ops></draw_ops></button>
@@ -507,10 +557,12 @@
507557
<button function="menu" state="normal" draw_ops="menu_unfocused" />
508558
<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
509559
<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
510-
<button function="shade" state="normal"><draw_ops></draw_ops></button>
511-
<button function="shade" state="pressed"><draw_ops></draw_ops></button>
512-
<button function="unshade" state="normal"><draw_ops></draw_ops></button>
513-
<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
560+
<button function="shade" state="normal" draw_ops="shade_unfocused" />
561+
<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
562+
<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
563+
<button function="unshade" state="normal" draw_ops="unshade_unfocused" />
564+
<button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" />
565+
<button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" />
514566
<button function="above" state="normal"><draw_ops></draw_ops></button>
515567
<button function="above" state="pressed"><draw_ops></draw_ops></button>
516568
<button function="unabove" state="normal"><draw_ops></draw_ops></button>
@@ -539,8 +591,10 @@
539591
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
540592
<button function="shade" state="normal" draw_ops="shade_focused" />
541593
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
542-
<button function="unshade" state="normal" draw_ops="shade_focused" />
543-
<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
594+
<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
595+
<button function="unshade" state="normal" draw_ops="unshade_focused" />
596+
<button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" />
597+
<button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" />
544598
<button function="above" state="normal"><draw_ops></draw_ops></button>
545599
<button function="above" state="pressed"><draw_ops></draw_ops></button>
546600
<button function="unabove" state="normal"><draw_ops></draw_ops></button>
@@ -569,9 +623,9 @@
569623
<button function="shade" state="normal" draw_ops="shade_unfocused" />
570624
<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
571625
<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
572-
<button function="unshade" state="normal" draw_ops="shade_unfocused" />
573-
<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
574-
<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
626+
<button function="unshade" state="normal" draw_ops="unshade_unfocused" />
627+
<button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" />
628+
<button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" />
575629
<button function="above" state="normal"><draw_ops></draw_ops></button>
576630
<button function="above" state="pressed"><draw_ops></draw_ops></button>
577631
<button function="unabove" state="normal"><draw_ops></draw_ops></button>
@@ -600,8 +654,10 @@
600654
<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
601655
<button function="shade" state="normal" draw_ops="shade_focused" />
602656
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
603-
<button function="unshade" state="normal" draw_ops="shade_focused" />
604-
<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
657+
<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
658+
<button function="unshade" state="normal" draw_ops="unshade_focused" />
659+
<button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" />
660+
<button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" />
605661
<button function="above" state="normal"><draw_ops></draw_ops></button>
606662
<button function="above" state="pressed"><draw_ops></draw_ops></button>
607663
<button function="unabove" state="normal"><draw_ops></draw_ops></button>
@@ -631,9 +687,9 @@
631687
<button function="shade" state="normal" draw_ops="shade_unfocused" />
632688
<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
633689
<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
634-
<button function="unshade" state="normal" draw_ops="shade_unfocused" />
635-
<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
636-
<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
690+
<button function="unshade" state="normal" draw_ops="unshade_unfocused" />
691+
<button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" />
692+
<button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" />
637693
<button function="above" state="normal"><draw_ops></draw_ops></button>
638694
<button function="above" state="pressed"><draw_ops></draw_ops></button>
639695
<button function="unabove" state="normal"><draw_ops></draw_ops></button>

0 commit comments

Comments
 (0)