diff --git a/metacity-1/close_focused_normal.png b/metacity-1/close_focused_normal.png index 6608e95..d3c84ec 100644 Binary files a/metacity-1/close_focused_normal.png and b/metacity-1/close_focused_normal.png differ diff --git a/metacity-1/close_unfocused.png b/metacity-1/close_unfocused.png index 7320bd6..7b0814f 100644 Binary files a/metacity-1/close_unfocused.png and b/metacity-1/close_unfocused.png differ diff --git a/metacity-1/maximize_focused_normal.png b/metacity-1/maximize_focused_normal.png index a329af9..9e09e71 100644 Binary files a/metacity-1/maximize_focused_normal.png and b/metacity-1/maximize_focused_normal.png differ diff --git a/metacity-1/maximize_unfocused.png b/metacity-1/maximize_unfocused.png index 357924e..fdb0d03 100644 Binary files a/metacity-1/maximize_unfocused.png and b/metacity-1/maximize_unfocused.png differ diff --git a/metacity-1/metacity-theme-2.xml b/metacity-1/metacity-theme-2.xml index 4aeeb51..cd65830 100644 --- a/metacity-1/metacity-theme-2.xml +++ b/metacity-1/metacity-theme-2.xml @@ -304,15 +304,19 @@ + + + + @@ -325,15 +329,19 @@ + + + + diff --git a/metacity-1/metacity-theme-3.xml b/metacity-1/metacity-theme-3.xml index 349dac7..f9e6e6d 100644 --- a/metacity-1/metacity-theme-3.xml +++ b/metacity-1/metacity-theme-3.xml @@ -316,15 +316,19 @@ + + + + @@ -337,15 +341,19 @@ + + + + diff --git a/metacity-1/minimize_focused_normal.png b/metacity-1/minimize_focused_normal.png index 865ee9c..520575e 100644 Binary files a/metacity-1/minimize_focused_normal.png and b/metacity-1/minimize_focused_normal.png differ diff --git a/metacity-1/minimize_unfocused.png b/metacity-1/minimize_unfocused.png index 40de23e..dbd30d9 100644 Binary files a/metacity-1/minimize_unfocused.png and b/metacity-1/minimize_unfocused.png differ diff --git a/metacity-1/shade_focused_normal.png b/metacity-1/shade_focused_normal.png new file mode 100644 index 0000000..2284463 Binary files /dev/null and b/metacity-1/shade_focused_normal.png differ diff --git a/metacity-1/shade_focused_prelight.png b/metacity-1/shade_focused_prelight.png new file mode 100644 index 0000000..a75800a Binary files /dev/null and b/metacity-1/shade_focused_prelight.png differ diff --git a/metacity-1/shade_focused_pressed.png b/metacity-1/shade_focused_pressed.png new file mode 100644 index 0000000..d0c1cdd Binary files /dev/null and b/metacity-1/shade_focused_pressed.png differ diff --git a/metacity-1/shade_unfocused.png b/metacity-1/shade_unfocused.png new file mode 100644 index 0000000..b5c6065 Binary files /dev/null and b/metacity-1/shade_unfocused.png differ diff --git a/metacity-1/unmaximize_focused_normal.png b/metacity-1/unmaximize_focused_normal.png index 1557fa8..8710cfa 100644 Binary files a/metacity-1/unmaximize_focused_normal.png and b/metacity-1/unmaximize_focused_normal.png differ diff --git a/metacity-1/unmaximize_unfocused.png b/metacity-1/unmaximize_unfocused.png index 68649d6..26d13b9 100644 Binary files a/metacity-1/unmaximize_unfocused.png and b/metacity-1/unmaximize_unfocused.png differ diff --git a/metacity-1/unshade_focused_normal.png b/metacity-1/unshade_focused_normal.png new file mode 100644 index 0000000..ef9e236 Binary files /dev/null and b/metacity-1/unshade_focused_normal.png differ diff --git a/metacity-1/unshade_focused_prelight.png b/metacity-1/unshade_focused_prelight.png new file mode 100644 index 0000000..25baf49 Binary files /dev/null and b/metacity-1/unshade_focused_prelight.png differ diff --git a/metacity-1/unshade_focused_pressed.png b/metacity-1/unshade_focused_pressed.png new file mode 100644 index 0000000..d30485f Binary files /dev/null and b/metacity-1/unshade_focused_pressed.png differ diff --git a/metacity-1/unshade_unfocused.png b/metacity-1/unshade_unfocused.png new file mode 100644 index 0000000..999c6c5 Binary files /dev/null and b/metacity-1/unshade_unfocused.png differ diff --git a/openbox-3/shade.xbm b/openbox-3/shade.xbm index 83df38d..fcacf42 100644 --- a/openbox-3/shade.xbm +++ b/openbox-3/shade.xbm @@ -1,4 +1,4 @@ #define shade_width 8 #define shade_height 8 static unsigned char shade_bits[] = { - 0x18, 0x3c, 0x7e, 0xff, 0x18, 0x18, 0x18, 0x18 }; + 0x18, 0x3c, 0x7e, 0xff, 0xdb, 0x18, 0x18, 0x18 }; diff --git a/openbox-3/shade_toggled.xbm b/openbox-3/shade_toggled.xbm index 188cce2..594201e 100644 --- a/openbox-3/shade_toggled.xbm +++ b/openbox-3/shade_toggled.xbm @@ -1,4 +1,4 @@ #define shade_toggled_width 8 #define shade_toggled_height 8 static unsigned char shade_toggled_bits[] = { - 0x18, 0x18, 0x18, 0x18, 0xff, 0x7e, 0x3c, 0x18 }; + 0x18, 0x18, 0x18, 0xdb, 0xff, 0x7e, 0x3c, 0x18 }; diff --git a/unity/close.png b/unity/close.png index 6608e95..d3c84ec 100644 Binary files a/unity/close.png and b/unity/close.png differ diff --git a/unity/close_focused_normal.png b/unity/close_focused_normal.png index 6608e95..d3c84ec 100644 Binary files a/unity/close_focused_normal.png and b/unity/close_focused_normal.png differ diff --git a/unity/close_unfocused.png b/unity/close_unfocused.png index 7320bd6..7b0814f 100644 Binary files a/unity/close_unfocused.png and b/unity/close_unfocused.png differ diff --git a/unity/maximize.png b/unity/maximize.png index a329af9..9e09e71 100644 Binary files a/unity/maximize.png and b/unity/maximize.png differ diff --git a/unity/maximize_focused_normal.png b/unity/maximize_focused_normal.png index a329af9..9e09e71 100644 Binary files a/unity/maximize_focused_normal.png and b/unity/maximize_focused_normal.png differ diff --git a/unity/maximize_unfocused.png b/unity/maximize_unfocused.png index 357924e..fdb0d03 100644 Binary files a/unity/maximize_unfocused.png and b/unity/maximize_unfocused.png differ diff --git a/unity/minimize_focused_normal.png b/unity/minimize_focused_normal.png index 865ee9c..520575e 100644 Binary files a/unity/minimize_focused_normal.png and b/unity/minimize_focused_normal.png differ diff --git a/unity/minimize_unfocused.png b/unity/minimize_unfocused.png index 40de23e..dbd30d9 100644 Binary files a/unity/minimize_unfocused.png and b/unity/minimize_unfocused.png differ diff --git a/unity/minimized.png b/unity/minimized.png new file mode 100644 index 0000000..520575e Binary files /dev/null and b/unity/minimized.png differ diff --git a/unity/unmaximize.png b/unity/unmaximize.png index 1557fa8..8710cfa 100644 Binary files a/unity/unmaximize.png and b/unity/unmaximize.png differ diff --git a/unity/unmaximize_focused_normal.png b/unity/unmaximize_focused_normal.png index 1557fa8..8710cfa 100644 Binary files a/unity/unmaximize_focused_normal.png and b/unity/unmaximize_focused_normal.png differ diff --git a/unity/unmaximize_unfocused.png b/unity/unmaximize_unfocused.png index 68649d6..26d13b9 100644 Binary files a/unity/unmaximize_unfocused.png and b/unity/unmaximize_unfocused.png differ diff --git a/xfwm4/close-inactive.xpm b/xfwm4/close-inactive.xpm index 642c389..0ac3837 100644 --- a/xfwm4/close-inactive.xpm +++ b/xfwm4/close-inactive.xpm @@ -1,23 +1,22 @@ /* XPM */ static char * close_inactive_xpm[] = { -"16 16 17 1", +"16 16 16 1", " c None", ". c #2D2D2D", -"+ c #ADA9A8", -"@ c #848181", +"+ c #AAAAAA", +"@ c #828282", "# c #3A3A3A", -"$ c #858383", -"% c #A5A1A0", -"& c #484747", +"$ c #848484", +"% c #A2A2A2", +"& c #474747", "* c #3B3B3B", -"= c #A6A3A2", -"- c #A39F9D", -"; c #4C4B4B", -"> c #A29F9E", -", c #A3A09F", -"' c #474646", -") c #83807F", -"! c #383838", +"= c #A4A4A4", +"- c #A0A0A0", +"; c #4B4B4B", +"> c #A1A1A1", +", c #464646", +"' c #818181", +") c #383838", "................", "................", "................", @@ -27,9 +26,9 @@ static char * close_inactive_xpm[] = { "....*=+--+%#....", ".....;=++-&.....", ".....;=++-&.....", -"....*=+>>+%#....", -"....$+,'',+@....", -"....+)!..!)+....", +"....*=+--+%#....", +"....$+>,,>+@....", +"....+')..)'+....", "................", "................", "................", diff --git a/xfwm4/hide-inactive.xpm b/xfwm4/hide-inactive.xpm index 160f553..f8fc850 100644 --- a/xfwm4/hide-inactive.xpm +++ b/xfwm4/hide-inactive.xpm @@ -3,7 +3,7 @@ static char * hide_inactive_xpm[] = { "16 16 3 1", " c None", ". c #2D2D2D", -"+ c #ADA9A8", +"+ c #AAAAAA", "................", "................", "................", diff --git a/xfwm4/maximize-inactive.xpm b/xfwm4/maximize-inactive.xpm index 6bb48cb..62a9251 100644 --- a/xfwm4/maximize-inactive.xpm +++ b/xfwm4/maximize-inactive.xpm @@ -3,7 +3,7 @@ static char * maximize_inactive_xpm[] = { "16 16 3 1", " c None", ". c #2D2D2D", -"+ c #ADA9A8", +"+ c #AAAAAA", "................", "................", "................", diff --git a/xfwm4/shade-active.xpm b/xfwm4/shade-active.xpm new file mode 100644 index 0000000..f533efd --- /dev/null +++ b/xfwm4/shade-active.xpm @@ -0,0 +1,22 @@ +/* XPM */ +static char * shade_active_xpm[] = { +"16 16 3 1", +" c None", +". c #2D2D2D", +"+ c #DBDBDB", +"................", +"................", +"................", +"................", +".......++.......", +"......++++......", +".....++++++.....", +"....++++++++....", +"...+++.++.+++...", +".......++.......", +".......++.......", +".......++.......", +"................", +"................", +"................", +"................"}; diff --git a/xfwm4/shade-inactive.xpm b/xfwm4/shade-inactive.xpm new file mode 100644 index 0000000..ed6b2af --- /dev/null +++ b/xfwm4/shade-inactive.xpm @@ -0,0 +1,22 @@ +/* XPM */ +static char * shade_inactive_xpm[] = { +"16 16 3 1", +" c None", +". c #2D2D2D", +"+ c #AAAAAA", +"................", +"................", +"................", +"................", +".......++.......", +"......++++......", +".....++++++.....", +"....++++++++....", +"...+++.++.+++...", +".......++.......", +".......++.......", +".......++.......", +"................", +"................", +"................", +"................"}; diff --git a/xfwm4/shade-prelight.xpm b/xfwm4/shade-prelight.xpm new file mode 100644 index 0000000..f7226bd --- /dev/null +++ b/xfwm4/shade-prelight.xpm @@ -0,0 +1,22 @@ +/* XPM */ +static char * shade_prelight_xpm[] = { +"16 16 3 1", +" c None", +". c #2D2D2D", +"+ c #D64937", +"................", +"................", +"................", +"................", +".......++.......", +"......++++......", +".....++++++.....", +"....++++++++....", +"...+++.++.+++...", +".......++.......", +".......++.......", +".......++.......", +"................", +"................", +"................", +"................"}; diff --git a/xfwm4/shade-pressed.xpm b/xfwm4/shade-pressed.xpm new file mode 100644 index 0000000..4dceebd --- /dev/null +++ b/xfwm4/shade-pressed.xpm @@ -0,0 +1,22 @@ +/* XPM */ +static char * shade_pressed_xpm[] = { +"16 16 3 1", +" c None", +". c #2D2D2D", +"+ c #B44335", +"................", +"................", +"................", +"................", +".......++.......", +"......++++......", +".....++++++.....", +"....++++++++....", +"...+++.++.+++...", +".......++.......", +".......++.......", +".......++.......", +"................", +"................", +"................", +"................"}; diff --git a/xfwm4/shade-toggled-active.xpm b/xfwm4/shade-toggled-active.xpm new file mode 100644 index 0000000..5986f3d --- /dev/null +++ b/xfwm4/shade-toggled-active.xpm @@ -0,0 +1,22 @@ +/* XPM */ +static char * shade_toggled_active_xpm[] = { +"16 16 3 1", +" c None", +". c #2D2D2D", +"+ c #DBDBDB", +"................", +"................", +"................", +"................", +".......++.......", +".......++.......", +".......++.......", +"...+++.++.+++...", +"....++++++++....", +".....++++++.....", +"......++++......", +".......++.......", +"................", +"................", +"................", +"................"}; diff --git a/xfwm4/shade-toggled-inactive.xpm b/xfwm4/shade-toggled-inactive.xpm new file mode 100644 index 0000000..89587d0 --- /dev/null +++ b/xfwm4/shade-toggled-inactive.xpm @@ -0,0 +1,22 @@ +/* XPM */ +static char * shade_toggled_inactive_xpm[] = { +"16 16 3 1", +" c None", +". c #2D2D2D", +"+ c #AAAAAA", +"................", +"................", +"................", +"................", +".......++.......", +".......++.......", +".......++.......", +"...+++.++.+++...", +"....++++++++....", +".....++++++.....", +"......++++......", +".......++.......", +"................", +"................", +"................", +"................"}; diff --git a/xfwm4/shade-toggled-prelight.xpm b/xfwm4/shade-toggled-prelight.xpm new file mode 100644 index 0000000..30a6db5 --- /dev/null +++ b/xfwm4/shade-toggled-prelight.xpm @@ -0,0 +1,22 @@ +/* XPM */ +static char * shade_toggled_prelight_xpm[] = { +"16 16 3 1", +" c None", +". c #2D2D2D", +"+ c #D64937", +"................", +"................", +"................", +"................", +".......++.......", +".......++.......", +".......++.......", +"...+++.++.+++...", +"....++++++++....", +".....++++++.....", +"......++++......", +".......++.......", +"................", +"................", +"................", +"................"}; diff --git a/xfwm4/shade-toggled-pressed.xpm b/xfwm4/shade-toggled-pressed.xpm new file mode 100644 index 0000000..a444c27 --- /dev/null +++ b/xfwm4/shade-toggled-pressed.xpm @@ -0,0 +1,22 @@ +/* XPM */ +static char * shade_toggled_pressed_xpm[] = { +"16 16 3 1", +" c None", +". c #2D2D2D", +"+ c #B44335", +"................", +"................", +"................", +"................", +".......++.......", +".......++.......", +".......++.......", +"...+++.++.+++...", +"....++++++++....", +".....++++++.....", +"......++++......", +".......++.......", +"................", +"................", +"................", +"................"};