diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e80e391e..50808380 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,6 +21,8 @@ jobs:
run: sudo apt update && sudo apt install -y sassc inkscape optipng
- name: Generate themes
run: |
+ python patches/xfwm4/generate_assets.py
+
python ./build.py mocha --all-accents --zip -d $PWD/releases &&
python ./build.py macchiato --all-accents --zip -d $PWD/releases &&
python ./build.py frappe --all-accents --zip -d $PWD/releases &&
diff --git a/build.py b/build.py
index 2d445313..fe0a321c 100755
--- a/build.py
+++ b/build.py
@@ -393,17 +393,16 @@ def make_assets(ctx: BuildContext):
f"{output_dir}/metacity-1/thumbnail.png",
)
- # TODO: Make our own assets for this and patch them in with the patch system, then code it to be
- # {src_dir}/assets/xfwm4/assets{light_suffix}-Catppuccin/
- # where assets-Light-Catppuccin will have latte
- # nad assets-Catppuccin will have mocha or something
- for file in glob.glob(f"{SRC_DIR}/assets/xfwm4/assets{ctx.apply_suffix(IS_LIGHT)}/*.png"):
+ xfwm4_assets = f"{THIS_DIR}/patches/xfwm4/generated/assets-catppuccin-{ctx.flavor.identifier}"
+ for file in glob.glob(xfwm4_assets + '/*'):
shutil.copy(file, f"{output_dir}/xfwm4")
- for file in glob.glob(f"{SRC_DIR}/assets/xfwm4/assets{ctx.apply_suffix(IS_LIGHT)}-hdpi/*.png"):
+ xfwm4_assets = xfwm4_assets + "-hdpi/*"
+ for file in glob.glob(xfwm4_assets):
shutil.copy(file, f"{output_dir}-hdpi/xfwm4")
- for file in glob.glob(f"{SRC_DIR}/assets/xfwm4/assets{ctx.apply_suffix(IS_LIGHT)}-xhdpi/*.png"):
+ xfwm4_assets = xfwm4_assets + "-xhdpi/*"
+ for file in glob.glob(xfwm4_assets):
shutil.copy(file, f"{output_dir}-xhdpi/xfwm4")
@@ -491,7 +490,6 @@ def apply_colloid_patches():
logger.info("Patching finished.")
-
def parse_args():
parser = argparse.ArgumentParser()
parser.add_argument(
diff --git a/patches/xfwm4/.gitignore b/patches/xfwm4/.gitignore
new file mode 100644
index 00000000..788a68a4
--- /dev/null
+++ b/patches/xfwm4/.gitignore
@@ -0,0 +1,2 @@
+generated/
+patched/
\ No newline at end of file
diff --git a/patches/xfwm4/assets-Catppuccin-frappe.svg b/patches/xfwm4/assets-Catppuccin-frappe.svg
deleted file mode 100644
index ac47d7d8..00000000
--- a/patches/xfwm4/assets-Catppuccin-frappe.svg
+++ /dev/null
@@ -1,1328 +0,0 @@
-
-
diff --git a/patches/xfwm4/assets-Catppuccin-latte-Normal.svg b/patches/xfwm4/assets-Catppuccin-latte-Normal.svg
deleted file mode 100644
index 05fa92f6..00000000
--- a/patches/xfwm4/assets-Catppuccin-latte-Normal.svg
+++ /dev/null
@@ -1,1543 +0,0 @@
-
-
diff --git a/patches/xfwm4/assets-Catppuccin-latte.svg b/patches/xfwm4/assets-Catppuccin-latte.svg
deleted file mode 100644
index ac47d7d8..00000000
--- a/patches/xfwm4/assets-Catppuccin-latte.svg
+++ /dev/null
@@ -1,1328 +0,0 @@
-
-
diff --git a/patches/xfwm4/assets-Catppuccin-macchiato-Normal.svg b/patches/xfwm4/assets-Catppuccin-macchiato-Normal.svg
deleted file mode 100644
index 848c5a45..00000000
--- a/patches/xfwm4/assets-Catppuccin-macchiato-Normal.svg
+++ /dev/null
@@ -1,1543 +0,0 @@
-
-
diff --git a/patches/xfwm4/assets-Catppuccin-mocha-Normal.svg b/patches/xfwm4/assets-Catppuccin-mocha-Normal.svg
deleted file mode 100644
index 9ee2fec6..00000000
--- a/patches/xfwm4/assets-Catppuccin-mocha-Normal.svg
+++ /dev/null
@@ -1,1543 +0,0 @@
-
-
diff --git a/patches/xfwm4/assets-Catppuccin-mocha.svg b/patches/xfwm4/assets-Catppuccin-mocha.svg
deleted file mode 100644
index b2f5ab2f..00000000
--- a/patches/xfwm4/assets-Catppuccin-mocha.svg
+++ /dev/null
@@ -1,1328 +0,0 @@
-
-
diff --git a/patches/xfwm4/assets-Light-Catppuccin-frappe-Normal.svg b/patches/xfwm4/assets-Light-Catppuccin-frappe-Normal.svg
deleted file mode 100644
index f14a4527..00000000
--- a/patches/xfwm4/assets-Light-Catppuccin-frappe-Normal.svg
+++ /dev/null
@@ -1,1546 +0,0 @@
-
-
diff --git a/patches/xfwm4/assets-Light-Catppuccin-latte-Normal.svg b/patches/xfwm4/assets-Light-Catppuccin-latte-Normal.svg
deleted file mode 100644
index f14a4527..00000000
--- a/patches/xfwm4/assets-Light-Catppuccin-latte-Normal.svg
+++ /dev/null
@@ -1,1546 +0,0 @@
-
-
diff --git a/patches/xfwm4/assets-Light-Catppuccin-latte.svg b/patches/xfwm4/assets-Light-Catppuccin-latte.svg
deleted file mode 100644
index 8aaafe89..00000000
--- a/patches/xfwm4/assets-Light-Catppuccin-latte.svg
+++ /dev/null
@@ -1,1368 +0,0 @@
-
-
diff --git a/patches/xfwm4/assets-Light-Catppuccin-macchiato.svg b/patches/xfwm4/assets-Light-Catppuccin-macchiato.svg
deleted file mode 100644
index 8aaafe89..00000000
--- a/patches/xfwm4/assets-Light-Catppuccin-macchiato.svg
+++ /dev/null
@@ -1,1368 +0,0 @@
-
-
diff --git a/patches/xfwm4/assets-Light-Catppuccin-mocha-Normal.svg b/patches/xfwm4/assets-Light-Catppuccin-mocha-Normal.svg
deleted file mode 100644
index f14a4527..00000000
--- a/patches/xfwm4/assets-Light-Catppuccin-mocha-Normal.svg
+++ /dev/null
@@ -1,1546 +0,0 @@
-
-
diff --git a/patches/xfwm4/assets-Light-Catppuccin-mocha.svg b/patches/xfwm4/assets-Light-Catppuccin-mocha.svg
deleted file mode 100644
index 8aaafe89..00000000
--- a/patches/xfwm4/assets-Light-Catppuccin-mocha.svg
+++ /dev/null
@@ -1,1368 +0,0 @@
-
-
diff --git a/patches/xfwm4/assets-Catppuccin-frappe-Normal.svg b/patches/xfwm4/assets-dark-normal.svg
similarity index 80%
rename from patches/xfwm4/assets-Catppuccin-frappe-Normal.svg
rename to patches/xfwm4/assets-dark-normal.svg
index 05fa92f6..2e0c25a7 100644
--- a/patches/xfwm4/assets-Catppuccin-frappe-Normal.svg
+++ b/patches/xfwm4/assets-dark-normal.svg
@@ -1,7 +1,7 @@