From 3bef54f42ec56017359c8c24ad80f4aa864a8743 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Mon, 24 Jul 2023 21:42:24 +0800 Subject: [PATCH] Fixed #488 --- install.sh | 6 +- shell/lib-install.sh | 12 +- src/assets/xfwm4/assets-Light-nord.svg | 1782 ++++++++++++++++++----- src/assets/xfwm4/assets-Light.svg | 1821 +++++++++++++++++++----- src/main/xfwm4/themerc-Light | 2 +- 5 files changed, 2877 insertions(+), 746 deletions(-) diff --git a/install.sh b/install.sh index 90d99b2..089d44d 100755 --- a/install.sh +++ b/install.sh @@ -183,9 +183,9 @@ else fi fi - if (is_running "xfce4-session"); then - msg="XFCE: you may need to run 'xfce4-panel -r' after changing your theme to fix your panel opacity." - elif (is_my_distro "solus") && (is_running "gnome-session"); then +# if (is_running "xfce4-session"); then +# msg="XFCE: you may need to run 'xfce4-panel -r' after changing your theme to fix your panel opacity." + if (is_my_distro "solus") && (is_running "gnome-session"); then msg="GNOME: you may need to disable 'User Themes' extension to fix your dock." # elif (is_running "gnome-session") && [[ "${GNOME_VERSION}" == "3-28" ]]; then # msg="GNOME: you may need to disable 'User Themes' extension to fix your logout and authentication dialog." diff --git a/shell/lib-install.sh b/shell/lib-install.sh index 2e3b042..1e8b93e 100755 --- a/shell/lib-install.sh +++ b/shell/lib-install.sh @@ -556,6 +556,16 @@ remove_libadwaita() { # THEMES # ############################################################################### +fix_whiskermenu() { + if command -v xfce4-popup-whiskermenu &> /dev/null; then + sed -i "s|.*menu-opacity=.*|menu-opacity=95|" "$HOME/.config/xfce4/panel/whiskermenu"*".rc" + fi + + if (pgrep xfce4-session &> /dev/null); then + xfce4-panel -r + fi +} + install_themes() { # "install_theemy" and "install_shelly" require "gtk_base", so multithreading # isn't possible @@ -575,7 +585,7 @@ install_themes() { done done - stop_animation + stop_animation; fix_whiskermenu } remove_themes() { diff --git a/src/assets/xfwm4/assets-Light-nord.svg b/src/assets/xfwm4/assets-Light-nord.svg index ee5ba61..7637b50 100644 --- a/src/assets/xfwm4/assets-Light-nord.svg +++ b/src/assets/xfwm4/assets-Light-nord.svg @@ -1,410 +1,1456 @@ - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + - - - - - - - + + + + + + + + + + - - - - - - - + + + + - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/assets/xfwm4/assets-Light.svg b/src/assets/xfwm4/assets-Light.svg index d4a5132..9bc97fe 100644 --- a/src/assets/xfwm4/assets-Light.svg +++ b/src/assets/xfwm4/assets-Light.svg @@ -1,415 +1,1490 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - + + + - - - - - - - + + + + + + + + + + - - - - - - - + + + - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/main/xfwm4/themerc-Light b/src/main/xfwm4/themerc-Light index 962c3f1..75954d6 100644 --- a/src/main/xfwm4/themerc-Light +++ b/src/main/xfwm4/themerc-Light @@ -1,4 +1,4 @@ -button_offset=20 +button_offset=10 button_spacing=0 show_app_icon=false