From 6de213b9849fbf5d47a5ee633b99f5c95678219c Mon Sep 17 00:00:00 2001
From: Vince <vinceliuice@hotmail.com>
Date: Sun, 9 May 2021 11:05:51 +0800
Subject: [PATCH] Fixed #226

---
 lib-install.sh                      | 19 +++++++------
 src/sass/gtk/_applications-3.0.scss | 43 ++++++++++++++++++-----------
 2 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/lib-install.sh b/lib-install.sh
index 25b46fbf..538f5100 100755
--- a/lib-install.sh
+++ b/lib-install.sh
@@ -122,12 +122,19 @@ install_beggy() {
     default)
       if [[ "${no_blur}" == "false" || "${darken}" == "true" ]]; then
         install_beggy_deps && convert "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/background-default.png" ${CONVERT_OPT} "${WHITESUR_TMP_DIR}/beggy.png"
+      elif [[ "${no_blur}" == "false" && "${darken}" == "true" ]]; then
+        cp -r "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/background-blur.png"          "${WHITESUR_TMP_DIR}/beggy.png"
       else
-        cp -r "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/background-blur.png"         "${WHITESUR_TMP_DIR}/beggy.png"
+        cp -r "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/background-default.png"       "${WHITESUR_TMP_DIR}/beggy.png"
       fi
       ;;
     *)
-      install_beggy_deps && convert "${background}" ${CONVERT_OPT}                            "${WHITESUR_TMP_DIR}/beggy.png" ;;
+      if [[ "${no_blur}" == "false" || "${darken}" == "true" ]]; then
+        install_beggy_deps && convert "${background}" ${CONVERT_OPT}                          "${WHITESUR_TMP_DIR}/beggy.png"
+      else
+        cp -r "${background}"                                                                 "${WHITESUR_TMP_DIR}/beggy.png"
+      fi
+      ;;
   esac
 }
 
@@ -203,13 +210,7 @@ install_shelly() {
 
   cp -r "${THEME_SRC_DIR}/assets/gnome-shell/assets${color}/"*".svg"                          "${TARGET_DIR}/assets"
   cp -r "${THEME_SRC_DIR}/assets/gnome-shell/activities/activities${icon}.svg"                "${TARGET_DIR}/assets/activities.svg"
-
-  if [[ "${gdm}" == 'true' && "${no_blur}" == "false" ]]; then
-    cp -r "${WHITESUR_TMP_DIR}/beggy.png"                                                     "${TARGET_DIR}/assets/background.png"
-  else
-    cp -r "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/background-default.png"          "${TARGET_DIR}/assets/background.png"
-  fi
-
+  cp -r "${WHITESUR_TMP_DIR}/beggy.png"                                                       "${TARGET_DIR}/assets/background.png"
   cp -r "${WHITESUR_TMP_DIR}/beggy-blur.png"                                                  "${TARGET_DIR}/assets/background-blur.png"
 
   (
diff --git a/src/sass/gtk/_applications-3.0.scss b/src/sass/gtk/_applications-3.0.scss
index 052b582b..314eb962 100644
--- a/src/sass/gtk/_applications-3.0.scss
+++ b/src/sass/gtk/_applications-3.0.scss
@@ -3059,8 +3059,8 @@ window.thunar {
 //
 // Geary
 //
-.geary-main-window.background.csd,
-window#GearyMainWindow.background.csd {
+.geary-main-window.background.csd, // <= 3.38
+window#GearyMainWindow.background.csd { // <= 3.32
   > overlay > box.vertical {
     > paned {
       > separator { @extend %side_separator; }
@@ -3134,6 +3134,29 @@ window#GearyMainWindow.background.csd {
     }
   }
 
+  stack#conversation_viewer { // 3.28
+    background-color: $base_color;
+    border-bottom-right-radius: $wm_radius + 1px;
+
+    scrolledwindow.geary-conversation-scroller {
+      viewport.frame {
+        background-color: $base_color;
+        border-bottom-right-radius: $wm_radius;
+
+        list.conversation-listbox {
+          background-color: transparent;
+        }
+      }
+    }
+
+    searchbar {
+      > revealer > box {
+        background-color: $base_color;
+        border-color: $dark_sidebar_border;
+      }
+    }
+  }
+
   &.maximized, &.tiled, &.fullscreen {
     > overlay > box.vertical {
       > paned {
@@ -3161,6 +3184,7 @@ window#GearyMainWindow.background.csd {
   }
 }
 
+// >= 40.0
 .geary-main-window {
   &.background.csd.unified { background: none; }
 
@@ -3260,21 +3284,8 @@ window#GearyMainWindow.background.csd {
 
   separator.geary-sidebar-pane-separator { background-color: $dark_sidebar_border; }
 
-  geary-conversation-viewer#conversation_viewer,  // 40.0 right side
-  stack#conversation_viewer { // 3.28
+  geary-conversation-viewer#conversation_viewer { // right side
     background-color: $base_color;
-    border-bottom-right-radius: $wm_radius + 1px;
-
-    scrolledwindow.geary-conversation-scroller {
-      viewport.frame {
-        background-color: $base_color;
-        border-bottom-right-radius: $wm_radius;
-
-        list.conversation-listbox {
-          background-color: transparent;
-        }
-      }
-    }
 
     searchbar {
       > revealer > box {