The default layout is now copied into place like the others.

A step along the way toward making layout files selectable, maybe?
ceejbot · Dec 18, 2023 · 348f535 · 348f535
1 parent ca18fd1
commit 348f535
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 275 deletions.
diff --git a/installer/core/SKSE/plugins/SoulsyHUD_Layout.toml b/installer/core/SKSE/plugins/SoulsyHUD_Layout.toml
diff --git a/installer/fomod/ModuleConfig.xml b/installer/fomod/ModuleConfig.xml
diff --git a/src/layouts/layout_v2.rs b/src/layouts/layout_v2.rs
@@ -77,7 +77,8 @@ impl HudLayout2 {
     }
 
     pub fn fallback() -> Self {
-        let buf = include_str!("../../installer/core/SKSE/plugins/SoulsyHUD_Layout.toml");
+        let buf =
+            include_str!("../../installer/core/SKSE/plugins/soulsy_layouts/SoulsyHUD_default.toml");
         match toml::from_str::<HudLayout2>(buf) {
             Ok(v) => v,
             Err(e) => {
@@ -294,7 +295,8 @@ mod tests {
 
     #[test]
     fn default_layout_valid() {
-        let buf = include_str!("../../installer/core/SKSE/plugins/SoulsyHUD_Layout.toml");
+        let buf =
+            include_str!("../../installer/core/SKSE/plugins/soulsy_layouts/SoulsyHUD_default.toml");
         match toml::from_str::<HudLayout2>(buf) {
             Ok(v) => {
                 assert_eq!(v.anchor_point().x, 150.0);

diff --git a/src/layouts/mod.rs b/src/layouts/mod.rs
@@ -283,7 +283,9 @@ mod tests {
 
     #[test]
     fn default_layout_exists() {
-        let fpath = std::path::Path::new("installer/core/SKSE/plugins/SoulsyHUD_Layout.toml");
+        let fpath = std::path::Path::new(
+            "installer/core/SKSE/plugins/soulsy_layouts/SoulsyHUD_default.toml",
+        );
         assert!(fpath.exists());
     }