From 8403f51031cf6a77ca24938d18c994cc825ed19a Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Tue, 16 Dec 2025 08:21:42 -0700
Subject: [PATCH] extra-animations: carpet: Change setting options to more
 appropriate names

---
 metadata/extra-animations.xml   | 8 ++++----
 src/extra-animations/carpet.hpp | 4 ++--
 src/extra-animations/plugin.cpp | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/metadata/extra-animations.xml b/metadata/extra-animations.xml
index 86e49c8..5f435fd 100644
--- a/metadata/extra-animations.xml
+++ b/metadata/extra-animations.xml
@@ -128,13 +128,13 @@
 		</group>
 		<group>
 			<_short>Magic Carpet Settings</_short>
-			<option name="carpet_duration" type="animation">
-				<_short>Magic carpet duration</_short>
+			<option name="carpet_roll_duration" type="animation">
+				<_short>Roll Duration</_short>
 				<_long>Sets the duration for the magic carpet animation in milliseconds.</_long>
 				<default>1000ms linear</default>
 			</option>
-			<option name="carpet_direction" type="int">
-				<_short>Carpet Direction</_short>
+			<option name="carpet_roll_direction" type="int">
+				<_short>Roll Direction</_short>
 				<_long>From which side to unroll the carpet for the open animation. The opposite direction will be used on close animation.</_long>
 				<default>0</default>
 				<desc>
diff --git a/src/extra-animations/carpet.hpp b/src/extra-animations/carpet.hpp
index 07d3c95..9f5f790 100644
--- a/src/extra-animations/carpet.hpp
+++ b/src/extra-animations/carpet.hpp
@@ -194,7 +194,7 @@ using namespace wf::animation;
 
 static std::string carpet_transformer_name = "animation-carpet";
 
-wf::option_wrapper_t<int> carpet_direction{"extra-animations/carpet_direction"};
+wf::option_wrapper_t<int> carpet_roll_direction{"extra-animations/carpet_roll_direction"};
 
 class carpet_transformer : public wf::scene::view_2d_transformer_t
 {
@@ -282,7 +282,7 @@ class carpet_transformer : public wf::scene::view_2d_transformer_t
                 self->program.attrib_pointer("position", 2, 0, vertices);
                 self->program.attrib_pointer("uv_in", 2, 0, uv);
                 self->program.uniform1f("progress", progress);
-                self->program.uniform1i("direction", carpet_direction);
+                self->program.uniform1i("direction", carpet_roll_direction);
 
                 self->program.set_active_texture(tex);
                 GL_CALL(glDrawArrays(GL_TRIANGLE_FAN, 0, 4));
diff --git a/src/extra-animations/plugin.cpp b/src/extra-animations/plugin.cpp
index 8ad8625..834b3ca 100644
--- a/src/extra-animations/plugin.cpp
+++ b/src/extra-animations/plugin.cpp
@@ -46,7 +46,8 @@ class wayfire_extra_animations : public wf::plugin_interface_t
     wf::option_wrapper_t<wf::animation_description_t> vortex_duration{"extra-animations/vortex_duration"};
     wf::option_wrapper_t<wf::animation_description_t> melt_duration{"extra-animations/melt_duration"};
     wf::option_wrapper_t<wf::animation_description_t> burn_duration{"extra-animations/burn_duration"};
-    wf::option_wrapper_t<wf::animation_description_t> carpet_duration{"extra-animations/carpet_duration"};
+    wf::option_wrapper_t<wf::animation_description_t> carpet_roll_duration{
+        "extra-animations/carpet_roll_duration"};
     std::unique_ptr<wf::dodge::wayfire_dodge> dodge_plugin;
 
   public:
@@ -84,7 +85,7 @@ class wayfire_extra_animations : public wf::plugin_interface_t
         });
         effects_registry->register_effect("carpet", wf::animate::effect_description_t{
             .generator = [] { return std::make_unique<wf::carpet::carpet_animation>(); },
-            .default_duration = [=] { return carpet_duration.value(); },
+            .default_duration = [=] { return carpet_roll_duration.value(); },
         });
         dodge_toggle.set_callback([=] {dodge_option_changed();});
         dodge_option_changed();