From 4d45bd7c678e819858f0921bca1cc4de5fba1b95 Mon Sep 17 00:00:00 2001
From: yutent <yutent.io@gmail.com>
Date: Fri, 6 May 2022 20:10:37 +0800
Subject: [PATCH] update

---
 Readme.md                       | 14 +++---
 metacity-1/button-bg.svg        |  2 +-
 metacity-1/metacity-theme-3.xml | 82 +++++++++++++++------------------
 3 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/Readme.md b/Readme.md
index e337704..8229337 100644
--- a/Readme.md
+++ b/Readme.md
@@ -17,9 +17,9 @@
   --color-blue-3: #2196f3;
   /* danger */
   --color-red-a: rgba(252, 118, 97, 0.35);
-  --color-red-1: rgb(252, 118, 97);
-  --color-red-2: rgb(255, 95, 69);
-  --color-red-3: rgb(243, 62, 34);
+  --color-red-1: #fc7661;
+  --color-red-2: #ff5f45;
+  --color-red-3: #f33e22;
   /* warning */
   --color-orange-a: rgba(255, 211, 66, 0.35);
   --color-orange-1: rgb(255, 211, 66);
@@ -27,12 +27,12 @@
   --color-orange-3: rgb(245, 189, 7);
   /* default1 */
   --color-plain-a: rgba(150, 204, 248, 0.35);
-  --color-plain-1: rgb(242, 245, 252);
-  --color-plain-2: rgb(232, 235, 244);
-  --color-plain-3: rgb(218, 225, 233);
+  --color-plain-1: #f2f5fc;
+  --color-plain-2: #e8ebf4;
+  --color-plain-3: #dae1e9;
   /* default2 */
   --color-grey-a: rgba(206, 214, 224, 0.35);
-  --color-grey-1: rgb(206, 214, 224);
+  --color-grey-1: #ced6e0;
   --color-grey-2: #a4b0be;
   --color-grey-3: #86909b;
   /* inverse */
diff --git a/metacity-1/button-bg.svg b/metacity-1/button-bg.svg
index fddf3c6..16dd6fa 100644
--- a/metacity-1/button-bg.svg
+++ b/metacity-1/button-bg.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" fill="#a4b0be"><circle cy="9" cx="9" r="9" /></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" fill="#a4b0be"><circle cy="8" cx="8" r="8" /></svg>
\ No newline at end of file
diff --git a/metacity-1/metacity-theme-3.xml b/metacity-1/metacity-theme-3.xml
index 30341f9..82a9050 100644
--- a/metacity-1/metacity-theme-3.xml
+++ b/metacity-1/metacity-theme-3.xml
@@ -11,8 +11,8 @@
 <!-- ::: CONSTANTS ::: -->
 
 <!-- 标题栏文字 -->
-<constant name="C_title_focused" value="rgb(242, 245, 252)"/>
-<constant name="C_title_unfocused" value="rgb(206, 214, 224)"/>
+<constant name="C_title_focused" value="#dae1e9"/>
+<constant name="C_title_unfocused" value="#86909b"/>
 
 <!-- 标题栏背景 -->
 <constant name="C_wm_bg" value="#57606f" />
@@ -23,35 +23,26 @@
 <constant name="C_wm_border_unfocused" value="#57606f" />
 <constant name="C_wm_highlight" value="#57606f" />
 
-<!-- window button colors -->
 
+<!-- close, minimize, maximize, etc color -->
+
+<constant name="C_button_close_bg_unfocused" value="#86909b" />
 <constant name="C_button_close_bg_focused" value="#f55449" />
-<constant name="C_button_close_bg_unfocused" value="#f55449" />
-<constant name="C_button_close_bg_hover" value="#f55449" />
-<constant name="C_button_close_bg_active" value="#f55449" />
-
-<constant name="C_icon_close_bg_focused" value="#0099ff" />
-<constant name="C_icon_close_bg_unfocused" value="#0099ff" />
-<constant name="C_icon_close_bg_hover" value="#0099ff" />
-<constant name="C_icon_close_bg_active" value="#0099ff" />
+<constant name="C_button_close_bg_hover" value="#d84945" />
 
 
-
-<!-- minimize, maximize -->
-<constant name="C_button_bg_focused" value="#dee1e3" />
-<constant name="C_button_bg_unfocused" value="#dee1e3" />
 <constant name="C_button_bg_hover" value="#fac536" />
 <constant name="C_button_bg_active" value="#fac536" />
 
+<constant name="C_button_maximize_bg_unfocused" value="#86909b" />
 <constant name="C_button_maximize_bg_focused" value="#39ea49" />
-<constant name="C_button_maximize_bg_unfocused" value="#dee1e3" />
-<constant name="C_button_maximize_bg_hover" value="#39ea49" />
-<constant name="C_button_maximize_bg_active" value="#39ea49" />
+<constant name="C_button_maximize_bg_hover" value="#34c63b" />
 
+<constant name="C_button_minimize_bg_unfocused" value="#86909b" />
 <constant name="C_button_minimize_bg_focused" value="#fac536" />
-<constant name="C_button_minimize_bg_unfocused" value="#dee1e3" />
-<constant name="C_button_minimize_bg_hover" value="#fac536" />
-<constant name="C_button_minimize_bg_active" value="#fac536" />
+<constant name="C_button_minimize_bg_hover" value="#d8a932" />
+
+<constant name="C_icon_color" value="#3c4d5e" />
 
 <constant name="C_icon_bg_focused" value="#3c4d5e" />
 <constant name="C_icon_bg_unfocused" value="#3c4d5e" />
@@ -291,79 +282,82 @@
 
 <draw_ops name="close_focused">
   <image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="close-icon.svg" colorize="C_icon_close_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="close-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused_pressed">
-  <image filename="button-bg.svg" colorize="C_button_close_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="close-icon.svg" colorize="C_icon_close_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="close-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused_prelight">
   <image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="close-icon.svg" colorize="C_icon_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="close-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused">
   <image filename="button-bg.svg" colorize="C_button_close_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="close-icon.svg" colorize="C_icon_close_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <!--maximize-->
 <draw_ops name="maximize_focused">
-  <image filename="max-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" colorize="C_button_maximize_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="max-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_pressed">
-  <image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="max-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" colorize="C_button_maximize_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="max-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_prelight">
-  <image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="max-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" colorize="C_button_maximize_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="max-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused">
-  <image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" colorize="C_button_maximize_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <!--unmaximize-->
 <draw_ops name="unmaximize_focused">
-    <image filename="restore-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" colorize="C_button_maximize_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="restore-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="unmaximize_focused_pressed">
-    <image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-    <image filename="restore-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" colorize="C_button_maximize_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="restore-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="unmaximize_focused_prelight">
-    <image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-    <image filename="restore-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" colorize="C_button_maximize_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="restore-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="unmaximize_unfocused">
-    <image filename="restore-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="restore-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <!--minimize-->
 <draw_ops name="minimize_focused">
-  <image filename="min-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" colorize="C_button_minimize_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="min-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_pressed">
-  <image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" colorize="C_button_minimize_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="min-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_prelight">
-  <image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="min-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" colorize="C_button_minimize_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="min-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused">
-  <image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" colorize="C_button_minimize_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <!-- shade icon -->