From d531a91505d271d68628f4778983289a9b314e48 Mon Sep 17 00:00:00 2001 From: EMH-Mark-I Date: Sat, 7 Aug 2021 12:03:13 -0500 Subject: [PATCH] Applying a few more adjustments for the window control buttons. --- Theme/Chicago95/xfwm4/close-active.xpm | 54 +++++++++---------- Theme/Chicago95/xfwm4/close-inactive.xpm | 54 +++++++++---------- Theme/Chicago95/xfwm4/close-pressed.xpm | 54 +++++++++---------- Theme/Chicago95/xfwm4/hide-active.xpm | 11 ++-- Theme/Chicago95/xfwm4/hide-inactive.xpm | 11 ++-- Theme/Chicago95/xfwm4/hide-pressed.xpm | 11 ++-- Theme/Chicago95/xfwm4/maximize-active.xpm | 11 ++-- Theme/Chicago95/xfwm4/maximize-inactive.xpm | 11 ++-- Theme/Chicago95/xfwm4/maximize-pressed.xpm | 11 ++-- .../xfwm4/maximize-toggled-active.xpm | 11 ++-- .../xfwm4/maximize-toggled-inactive.xpm | 11 ++-- .../xfwm4/maximize-toggled-pressed.xpm | 11 ++-- Theme/Chicago95/xfwm4/themerc | 3 +- 13 files changed, 136 insertions(+), 128 deletions(-) diff --git a/Theme/Chicago95/xfwm4/close-active.xpm b/Theme/Chicago95/xfwm4/close-active.xpm index fe08ffe..5491cdf 100644 --- a/Theme/Chicago95/xfwm4/close-active.xpm +++ b/Theme/Chicago95/xfwm4/close-active.xpm @@ -1,35 +1,35 @@ /* XPM */ static char * close_active_xpm[] = { -"19 24 7 1", -" c #8CB754 s active_color_1", +"18 24 8 1", +" c None", +"^ c #8CB754 s active_color_1", ". c #000000 s active_mid_2", "& c #000000 s active_shadow_1", "+ c #FFFFFF s active_hilight_2", "S c #FFFFFF s active_hilight_1", "@ c #C0C0C0 s active_mid_1", "# c #808080 s active_shadow_2", -"SSSSSSSSSSSSSSSSSSS", -"+++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@", -" ", -" ", -" +++++++++++++++& ", -" +SSSSSSSSSSSSS#& ", -" +S@@@@@@@@@@@@#& ", -" +S@@..@@@@..@@#& ", -" +S@@@..@@..@@@#& ", -" +S@@@@....@@@@#& ", -" +S@@@@@..@@@@@#& ", -" +S@@@@....@@@@#& ", -" +S@@@..@@..@@@#& ", -" +S@@..@@@@..@@#& ", -" +S@@@@@@@@@@@@#& ", -" +S@@@@@@@@@@@@#& ", -" +##############& ", -" &&&&&&&&&&&&&&&& ", -" ", -" ", -"@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@"}; - +" ", +" ", +" ", +" ", +"^^^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^^^", +"^^+++++++++++++++&", +"^^+SSSSSSSSSSSSS#&", +"^^+S@@@@@@@@@@@@#&", +"^^+S@@..@@@@..@@#&", +"^^+S@@@..@@..@@@#&", +"^^+S@@@@....@@@@#&", +"^^+S@@@@@..@@@@@#&", +"^^+S@@@@....@@@@#&", +"^^+S@@@..@@..@@@#&", +"^^+S@@..@@@@..@@#&", +"^^+S@@@@@@@@@@@@#&", +"^^+S@@@@@@@@@@@@#&", +"^^+##############&", +"^^&&&&&&&&&&&&&&&&", +"^^^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^^^", +" ", +" "}; diff --git a/Theme/Chicago95/xfwm4/close-inactive.xpm b/Theme/Chicago95/xfwm4/close-inactive.xpm index c4d40ae..a625f55 100644 --- a/Theme/Chicago95/xfwm4/close-inactive.xpm +++ b/Theme/Chicago95/xfwm4/close-inactive.xpm @@ -1,35 +1,35 @@ /* XPM */ static char * close_inactive_xpm[] = { -"19 24 7 1", -" c #8CB754 s inactive_color_1", +"18 24 8 1", +" c None", +"^ c #8CB754 s inactive_color_1", ". c #000000 s inactive_mid_2", "& c #000000 s inactive_shadow_1", "+ c #FFFFFF s inactive_hilight_2", "S c #FFFFFF s inactive_hilight_1", "@ c #C0C0C0 s inactive_mid_1", "# c #808080 s inactive_shadow_2", -"SSSSSSSSSSSSSSSSSSS", -"+++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@", -" ", -" ", -" +++++++++++++++& ", -" +SSSSSSSSSSSSS#& ", -" +S@@@@@@@@@@@@#& ", -" +S@@..@@@@..@@#& ", -" +S@@@..@@..@@@#& ", -" +S@@@@....@@@@#& ", -" +S@@@@@..@@@@@#& ", -" +S@@@@....@@@@#& ", -" +S@@@..@@..@@@#& ", -" +S@@..@@@@..@@#& ", -" +S@@@@@@@@@@@@#& ", -" +S@@@@@@@@@@@@#& ", -" +##############& ", -" &&&&&&&&&&&&&&&& ", -" ", -" ", -"@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@"}; - +" ", +" ", +" ", +" ", +"^^^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^^^", +"^^+++++++++++++++&", +"^^+SSSSSSSSSSSSS#&", +"^^+S@@@@@@@@@@@@#&", +"^^+S@@..@@@@..@@#&", +"^^+S@@@..@@..@@@#&", +"^^+S@@@@....@@@@#&", +"^^+S@@@@@..@@@@@#&", +"^^+S@@@@....@@@@#&", +"^^+S@@@..@@..@@@#&", +"^^+S@@..@@@@..@@#&", +"^^+S@@@@@@@@@@@@#&", +"^^+S@@@@@@@@@@@@#&", +"^^+##############&", +"^^&&&&&&&&&&&&&&&&", +"^^^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^^^", +" ", +" "}; diff --git a/Theme/Chicago95/xfwm4/close-pressed.xpm b/Theme/Chicago95/xfwm4/close-pressed.xpm index 21fb768..cbe4c6b 100644 --- a/Theme/Chicago95/xfwm4/close-pressed.xpm +++ b/Theme/Chicago95/xfwm4/close-pressed.xpm @@ -1,35 +1,35 @@ /* XPM */ static char * close_pressed_xpm[] = { -"19 24 7 1", -" c #8CB754 s active_color_1", +"18 24 8 1", +" c None", +"^ c #8CB754 s active_color_1", "+ c #000000 s active_shadow_1", "& c #FFFFFF s active_hilight_2", "# c #FFFFFF s active_hilight_1", "@ c #C0C0C0 s active_mid_1", ". c #FF00FF s active_mid_2", "S c #808080 s active_shadow_2", -"###################", -"&&&&&&&&&&&&&&&&&&&", -"@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@", -" ", -" ", -" +++++++++++++++& ", -" +SSSSSSSSSSSSS#& ", -" +S@@@@@@@@@@@@#& ", -" +S@@@@@@@@@@@@#& ", -" +S@@@..@@@@..@#& ", -" +S@@@@..@@..@@#& ", -" +S@@@@@....@@@#& ", -" +S@@@@@@..@@@@#& ", -" +S@@@@@....@@@#& ", -" +S@@@@..@@..@@#& ", -" +S@@@..@@@@..@#& ", -" +S@@@@@@@@@@@@#& ", -" +##############& ", -" &&&&&&&&&&&&&&&& ", -" ", -" ", -"@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@"}; - +" ", +" ", +" ", +" ", +"^^^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^^^", +"^^+++++++++++++++&", +"^^+SSSSSSSSSSSSS#&", +"^^+S@@@@@@@@@@@@#&", +"^^+S@@@@@@@@@@@@#&", +"^^+S@@@..@@@@..@#&", +"^^+S@@@@..@@..@@#&", +"^^+S@@@@@....@@@#&", +"^^+S@@@@@@..@@@@#&", +"^^+S@@@@@....@@@#&", +"^^+S@@@@..@@..@@#&", +"^^+S@@@..@@@@..@#&", +"^^+S@@@@@@@@@@@@#&", +"^^+##############&", +"^^&&&&&&&&&&&&&&&&", +"^^^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^^^", +" ", +" "}; diff --git a/Theme/Chicago95/xfwm4/hide-active.xpm b/Theme/Chicago95/xfwm4/hide-active.xpm index 4f5f2fd..da80724 100644 --- a/Theme/Chicago95/xfwm4/hide-active.xpm +++ b/Theme/Chicago95/xfwm4/hide-active.xpm @@ -1,7 +1,8 @@ /* XPM */ static char * hide_active_xpm[] = { -"16 24 7 1", +"16 24 8 1", " c None", +"^ c #8CB754 s active_color_1", "& c #000000 s active_shadow_1", "+ c #FFFFFF s active_hilight_2", "S c #FFFFFF s active_hilight_1", @@ -12,8 +13,8 @@ static char * hide_active_xpm[] = { " ", " ", " ", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", "+++++++++++++++&", "+SSSSSSSSSSSSS#&", "+S@@@@@@@@@@@@#&", @@ -28,8 +29,8 @@ static char * hide_active_xpm[] = { "+S@@@@@@@@@@@@#&", "+##############&", "&&&&&&&&&&&&&&&&", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", " ", " "}; diff --git a/Theme/Chicago95/xfwm4/hide-inactive.xpm b/Theme/Chicago95/xfwm4/hide-inactive.xpm index 2ec2251..2e7fb0d 100644 --- a/Theme/Chicago95/xfwm4/hide-inactive.xpm +++ b/Theme/Chicago95/xfwm4/hide-inactive.xpm @@ -1,7 +1,8 @@ /* XPM */ static char * hide_inactive_xpm[] = { -"16 24 7 1", +"16 24 8 1", " c None", +"^ c #8CB754 s inactive_color_1", "& c #000000 s inactive_shadow_1", "+ c #FFFFFF s inactive_hilight_2", "S c #FFFFFF s inactive_hilight_1", @@ -12,8 +13,8 @@ static char * hide_inactive_xpm[] = { " ", " ", " ", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", "+++++++++++++++&", "+SSSSSSSSSSSSS#&", "+S@@@@@@@@@@@@#&", @@ -28,8 +29,8 @@ static char * hide_inactive_xpm[] = { "+S@@@@@@@@@@@@#&", "+##############&", "&&&&&&&&&&&&&&&&", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", " ", " "}; diff --git a/Theme/Chicago95/xfwm4/hide-pressed.xpm b/Theme/Chicago95/xfwm4/hide-pressed.xpm index 4c094d1..c3b6339 100644 --- a/Theme/Chicago95/xfwm4/hide-pressed.xpm +++ b/Theme/Chicago95/xfwm4/hide-pressed.xpm @@ -1,7 +1,8 @@ /* XPM */ static char * hide_pressed_xpm[] = { -"16 24 7 1", +"16 24 8 1", " c None", +"^ c #8CB754 s active_color_1", "& c #000000 s active_shadow_1", "+ c #FFFFFF s active_shadow_2", "S c #FFFFFF s active_hilight_1", @@ -12,8 +13,8 @@ static char * hide_pressed_xpm[] = { " ", " ", " ", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", "&&&&&&&&&&&&&&&#", "&+++++++++++++S#", "&+@@@@@@@@@@@@S#", @@ -28,8 +29,8 @@ static char * hide_pressed_xpm[] = { "&+@@@......@@@S#", "&SSSSSSSSSSSSSS#", "################", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", " ", " "}; diff --git a/Theme/Chicago95/xfwm4/maximize-active.xpm b/Theme/Chicago95/xfwm4/maximize-active.xpm index 6eac636..5cc53c7 100644 --- a/Theme/Chicago95/xfwm4/maximize-active.xpm +++ b/Theme/Chicago95/xfwm4/maximize-active.xpm @@ -1,7 +1,8 @@ /* XPM */ static char * maximize_active_xpm[] = { -"16 24 7 1", +"16 24 8 1", " c None", +"^ c #8CB754 s active_color_1", "& c #000000 s active_shadow_1", "+ c #FFFFFF s active_hilight_2", "S c #FFFFFF s active_hilight_1", @@ -12,8 +13,8 @@ static char * maximize_active_xpm[] = { " ", " ", " ", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", "+++++++++++++++&", "+SSSSSSSSSSSSS#&", "+S@.........@@#&", @@ -28,8 +29,8 @@ static char * maximize_active_xpm[] = { "+S@@@@@@@@@@@@#&", "+##############&", "&&&&&&&&&&&&&&&&", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", " ", " "}; diff --git a/Theme/Chicago95/xfwm4/maximize-inactive.xpm b/Theme/Chicago95/xfwm4/maximize-inactive.xpm index 4bf40b0..ea35c9e 100644 --- a/Theme/Chicago95/xfwm4/maximize-inactive.xpm +++ b/Theme/Chicago95/xfwm4/maximize-inactive.xpm @@ -1,7 +1,8 @@ /* XPM */ static char * maximize_inactive_xpm[] = { -"16 24 7 1", +"16 24 8 1", " c None", +"^ c #8CB754 s inactive_color_1", "& c #000000 s inactive_shadow_1", "+ c #FFFFFF s inactive_hilight_2", "S c #FFFFFF s inactive_hilight_1", @@ -12,8 +13,8 @@ static char * maximize_inactive_xpm[] = { " ", " ", " ", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", "+++++++++++++++&", "+SSSSSSSSSSSSS#&", "+S@.........@@#&", @@ -28,8 +29,8 @@ static char * maximize_inactive_xpm[] = { "+S@@@@@@@@@@@@#&", "+##############&", "&&&&&&&&&&&&&&&&", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", " ", " "}; diff --git a/Theme/Chicago95/xfwm4/maximize-pressed.xpm b/Theme/Chicago95/xfwm4/maximize-pressed.xpm index d1fe976..54446c5 100644 --- a/Theme/Chicago95/xfwm4/maximize-pressed.xpm +++ b/Theme/Chicago95/xfwm4/maximize-pressed.xpm @@ -1,7 +1,8 @@ /* XPM */ static char * maximize_pressed_xpm[] = { -"16 24 7 1", +"16 24 8 1", " c None", +"^ c #8CB754 s active_color_1", "& c #000000 s active_shadow_1", "+ c #808080 s active_shadow_2", "S c #C0C0C0 s active_hilight_1", @@ -12,8 +13,8 @@ static char * maximize_pressed_xpm[] = { " ", " ", " ", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", "&&&&&&&&&&&&&&&#", "&+++++++++++++S#", "&+@@@@@@@@@@@@S#", @@ -28,8 +29,8 @@ static char * maximize_pressed_xpm[] = { "&+@@.........@S#", "&SSSSSSSSSSSSSS#", "################", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", " ", " "}; diff --git a/Theme/Chicago95/xfwm4/maximize-toggled-active.xpm b/Theme/Chicago95/xfwm4/maximize-toggled-active.xpm index 09d8b42..afe9cd5 100644 --- a/Theme/Chicago95/xfwm4/maximize-toggled-active.xpm +++ b/Theme/Chicago95/xfwm4/maximize-toggled-active.xpm @@ -1,7 +1,8 @@ /* XPM */ static char * maximize_toggled_active_xpm[] = { -"16 24 7 1", +"16 24 8 1", " c None", +"^ c #8CB754 s active_color_1", "& c #000000 s active_shadow_1", "+ c #FFFFFF s active_hilight_2", "S c #FFFFFF s active_hilight_1", @@ -12,8 +13,8 @@ static char * maximize_toggled_active_xpm[] = { " ", " ", " ", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", "+++++++++++++++&", "+SSSSSSSSSSSSS#&", "+S@@@......@@@#&", @@ -28,8 +29,8 @@ static char * maximize_toggled_active_xpm[] = { "+S@@@@@@@@@@@@#&", "+##############&", "&&&&&&&&&&&&&&&&", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", " ", " "}; diff --git a/Theme/Chicago95/xfwm4/maximize-toggled-inactive.xpm b/Theme/Chicago95/xfwm4/maximize-toggled-inactive.xpm index 2398773..be8fde0 100644 --- a/Theme/Chicago95/xfwm4/maximize-toggled-inactive.xpm +++ b/Theme/Chicago95/xfwm4/maximize-toggled-inactive.xpm @@ -1,7 +1,8 @@ /* XPM */ static char * maximize_toggled_inactive_xpm[] = { -"16 24 7 1", +"16 24 8 1", " c None", +"^ c #8CB754 s inactive_color_1", "& c #000000 s active_shadow_1", "+ c #FFFFFF s active_hilight_2", "S c #FFFFFF s active_hilight_1", @@ -12,8 +13,8 @@ static char * maximize_toggled_inactive_xpm[] = { " ", " ", " ", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", "+++++++++++++++&", "+SSSSSSSSSSSSS#&", "+S@@@......@@@#&", @@ -28,8 +29,8 @@ static char * maximize_toggled_inactive_xpm[] = { "+S@@@@@@@@@@@@#&", "+##############&", "&&&&&&&&&&&&&&&&", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", " ", " "}; diff --git a/Theme/Chicago95/xfwm4/maximize-toggled-pressed.xpm b/Theme/Chicago95/xfwm4/maximize-toggled-pressed.xpm index 344286f..16d795e 100644 --- a/Theme/Chicago95/xfwm4/maximize-toggled-pressed.xpm +++ b/Theme/Chicago95/xfwm4/maximize-toggled-pressed.xpm @@ -1,7 +1,8 @@ /* XPM */ static char * maximize_toggled_pressed_xpm[] = { -"16 24 7 1", +"16 24 8 1", " c None", +"^ c #8CB754 s active_color_1", "& c #000000 s active_shadow_1", "+ c #00FF00 s active_shadow_2", "S c #FFFF00 s active_hilight_1", @@ -12,8 +13,8 @@ static char * maximize_toggled_pressed_xpm[] = { " ", " ", " ", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", "&&&&&&&&&&&&&&&#", "&+++++++++++++S#", "&+@@@@@@@@@@@@S#", @@ -28,8 +29,8 @@ static char * maximize_toggled_pressed_xpm[] = { "&+@@......@@@@S#", "&SSSSSSSSSSSSSS#", "################", -" ", -" ", +"^^^^^^^^^^^^^^^^", +"^^^^^^^^^^^^^^^^", " ", " "}; diff --git a/Theme/Chicago95/xfwm4/themerc b/Theme/Chicago95/xfwm4/themerc index cea744c..beebd29 100755 --- a/Theme/Chicago95/xfwm4/themerc +++ b/Theme/Chicago95/xfwm4/themerc @@ -47,7 +47,7 @@ active_mid_2=#000000 inactive_mid_2=#000000 button_layout=O|HMC -button_offset=0 +button_offset=1 button_spacing=0 full_width_title=true maximized_offset=0 @@ -56,5 +56,4 @@ title_alignment=left title_horizontal_offset=2 title_vertical_offset_active=1 title_vertical_offset_inactive=1 - frame_border_top=4