From e23c79601c53b846832e2da430dbb9737b3ef70f Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sun, 16 Jun 2024 01:32:59 +0800
Subject: [PATCH] update

---
 install.sh                   |  6 +++---
 src/main/xfwm4/themerc       | 24 ++++++++++++------------
 src/main/xfwm4/themerc-Light | 23 -----------------------
 3 files changed, 15 insertions(+), 38 deletions(-)
 delete mode 100644 src/main/xfwm4/themerc-Light

diff --git a/install.sh b/install.sh
index c99df8a7..feb83dca 100755
--- a/install.sh
+++ b/install.sh
@@ -142,12 +142,12 @@ install() {
   cd "${THEME_DIR}/metacity-1" && ln -sf metacity-theme-3.xml metacity-theme-1.xml && ln -sf metacity-theme-3.xml metacity-theme-2.xml
 
   mkdir -p                                                                                   "${THEME_DIR}/xfwm4"
-  cp -r "${SRC_DIR}/main/xfwm4/themerc${ELSE_LIGHT:-}"                                       "${THEME_DIR}/xfwm4/themerc"
+  cp -r "${SRC_DIR}/main/xfwm4/themerc"                                                      "${THEME_DIR}/xfwm4/themerc"
   mkdir -p                                                                                   "${THEME_DIR}-hdpi/xfwm4"
-  cp -r "${SRC_DIR}/main/xfwm4/themerc${ELSE_LIGHT:-}"                                       "${THEME_DIR}-hdpi/xfwm4/themerc"
+  cp -r "${SRC_DIR}/main/xfwm4/themerc"                                                      "${THEME_DIR}-hdpi/xfwm4/themerc"
   sed -i "s/button_offset=6/button_offset=9/"                                                "${THEME_DIR}-hdpi/xfwm4/themerc"
   mkdir -p                                                                                   "${THEME_DIR}-xhdpi/xfwm4"
-  cp -r "${SRC_DIR}/main/xfwm4/themerc${ELSE_LIGHT:-}"                                       "${THEME_DIR}-xhdpi/xfwm4/themerc"
+  cp -r "${SRC_DIR}/main/xfwm4/themerc"                                                      "${THEME_DIR}-xhdpi/xfwm4/themerc"
   sed -i "s/button_offset=6/button_offset=12/"                                               "${THEME_DIR}-xhdpi/xfwm4/themerc"
 
   mkdir -p                                                                                   "${THEME_DIR}/plank"
diff --git a/src/main/xfwm4/themerc b/src/main/xfwm4/themerc
index cb238f02..08efb321 100644
--- a/src/main/xfwm4/themerc
+++ b/src/main/xfwm4/themerc
@@ -1,23 +1,23 @@
 button_offset=6
 button_spacing=0
-
 show_app_icon=false
-
 full_width_title=true
+frame_border_top=5
+maximized_offset=0
 
-title_shadow_active=false
-title_shadow_inactive=false
-
-title_horizontal_offset=3
-
-active_text_color=#afafaf
-active_text_shadow_color=#252525
-
-inactive_text_color=#808080
-inactive_text_shadow_color=#252525
+active_text_color=active_text_color_2
+active_text_shadow_color=active_hilight_2
+inactive_text_color=inactive_text_color_2
+inactive_text_shadow_color=inactive_hilight_2
 
 shadow_delta_height=2
 shadow_delta_width=0
 shadow_delta_x=0
 shadow_delta_y=-5
 shadow_opacity=40
+
+title_horizontal_offset=1
+title_shadow_active=false
+title_shadow_inactive=false
+title_vertical_offset_active=1
+title_vertical_offset_inactive=1
diff --git a/src/main/xfwm4/themerc-Light b/src/main/xfwm4/themerc-Light
deleted file mode 100644
index fcaf079a..00000000
--- a/src/main/xfwm4/themerc-Light
+++ /dev/null
@@ -1,23 +0,0 @@
-button_offset=6
-button_spacing=0
-
-show_app_icon=false
-
-full_width_title=true
-
-title_shadow_active=false
-title_shadow_inactive=false
-
-title_horizontal_offset=3
-
-active_text_color=#707070
-active_text_shadow_color=#e7e7e7
-
-inactive_text_color=#979797
-inactive_text_shadow_color=#e7e7e7
-
-shadow_delta_height=2
-shadow_delta_width=0
-shadow_delta_x=0
-shadow_delta_y=-5
-shadow_opacity=40