From 20ac7caf8ca602bef46dca1224df9c8f1aa237f1 Mon Sep 17 00:00:00 2001
From: Galdormin <theo.plenet@gmail.com>
Date: Wed, 29 Jan 2025 11:14:49 +0100
Subject: [PATCH] Fix aspect settings + mergeObejct

---
 CHANGELOG.md                   |  9 +++++++++
 module.json                    |  2 +-
 modules/fate-aspect-tracker.js |  2 +-
 modules/tracker.js             |  4 ++--
 modules/ui.js                  | 14 +++++++-------
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26ec8c5..f1ca69a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Patch Notes:
 
+## Version 1.4.1
+
+* Fix aspect settings related to font #25
+* Fix `mergeObject` deprecated
+
+## Version 1.4.0
+
+* Update for V12
+
 ## Version 1.3.0
 
 * Remove `_sortable.js` from module dependcy to local dependency #22
diff --git a/module.json b/module.json
index 2cae39d..1842759 100644
--- a/module.json
+++ b/module.json
@@ -2,7 +2,7 @@
   "id": "fate-aspect-tracker",
   "title": "Fate Aspect Tracker",
   "description": "An Aspect Tracker for any Fate RPG.",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "authors": [
     {
       "name": "Théo Plénet",
diff --git a/modules/fate-aspect-tracker.js b/modules/fate-aspect-tracker.js
index e4b6327..891fa1d 100644
--- a/modules/fate-aspect-tracker.js
+++ b/modules/fate-aspect-tracker.js
@@ -87,7 +87,7 @@ Hooks.once('init', async() => {
     config: false,
     type:String,
     restricted:true,
-    choices:CONFIG.fontFamilies,
+    choices:Object.keys(CONFIG.fontDefinitions),
     default:"Arial",
   });
 
diff --git a/modules/tracker.js b/modules/tracker.js
index 897302e..745ed61 100644
--- a/modules/tracker.js
+++ b/modules/tracker.js
@@ -229,7 +229,7 @@ export class Tracker {
         strokeAlpha: game.settings.get("fate-aspect-tracker","AspectDrawingBorderOpacity"),
         text: text,
         fontSize: fontsize,
-        fontFamily: CONFIG.fontDefinitions[game.settings.get("fate-aspect-tracker","AspectDrawingFontFamily")],
+        fontFamily: game.settings.get("fate-aspect-tracker","AspectDrawingFontFamily"),
         textColor: color,
         points: []
       };
@@ -273,7 +273,7 @@ export class Tracker {
         }).filter(d => d != null);
 
         scene.updateEmbeddedDocuments('Drawing', drawings);
-		newDrawings = newDrawings.concat(drawings.map(drawing => drawing._id));
+        newDrawings = newDrawings.concat(drawings.map(drawing => drawing._id));
     });
 
     // Replace drawings with existing textbox (i.e. Remove from list deleted textbox)
diff --git a/modules/ui.js b/modules/ui.js
index 2a19004..2767fb5 100644
--- a/modules/ui.js
+++ b/modules/ui.js
@@ -1,5 +1,5 @@
 /* global jQuery, Handlebars, Sortable */
-/* global game, loadTemplates, mergeObject, Application, FormApplication, Dialog */
+/* global game, loadTemplates, Application, FormApplication, Dialog */
 
 import { Aspect, Tracker } from "./tracker.js";
 import { RGBColor } from "./colors.js";
@@ -40,7 +40,7 @@ async function preloadTemplates() {
 
 export class AspectTrackerWindow extends Application {
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       id: "fate-aspect-tracker-app",
       template: "modules/fate-aspect-tracker/templates/aspect-list.hbs",
       width: 400,
@@ -206,7 +206,7 @@ export class AspectTrackerWindow extends Application {
 
 class AspectForm extends FormApplication {
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       id: "fate-aspect-tracker-form",
       template: "modules/fate-aspect-tracker/templates/aspect-item-form.hbs",
       width: 400,
@@ -262,7 +262,7 @@ class AspectForm extends FormApplication {
 
 class AspectDrawingSettings extends FormApplication {
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       id: "fate-aspect-drawing-settings",
       template: "modules/fate-aspect-tracker/templates/aspect-drawing-settings.hbs",
       width: 450,
@@ -288,8 +288,8 @@ class AspectDrawingSettings extends FormApplication {
   /** @override */
   getData() {
     return {
-      fontFamilies:CONFIG.fontFamilies, 
-      fontFamily:CONFIG.fontFamilies[game.settings.get("fate-aspect-tracker","AspectDrawingFontFamily")],
+      fontFamilies:Object.keys(CONFIG.fontDefinitions), 
+      fontFamily:game.settings.get("fate-aspect-tracker","AspectDrawingFontFamily"),
       fontSize:game.settings.get("fate-aspect-tracker","AspectDrawingFontSize"),
       fontDynamicColor:game.settings.get("fate-aspect-tracker","AspectDrawingFontDynamicColor"),
       fontColor:game.settings.get("fate-aspect-tracker","AspectDrawingFontColor"),
@@ -314,7 +314,7 @@ class AspectDrawingSettings extends FormApplication {
     let borderColor = data.border_color;
     let borderOpacity = data.border_opacity;
 
-    await game.settings.set("fate-aspect-tracker","AspectDrawingFontFamily", CONFIG.fontFamilies.indexOf(fontFamily));
+    await game.settings.set("fate-aspect-tracker","AspectDrawingFontFamily", fontFamily);
     await game.settings.set("fate-aspect-tracker","AspectDrawingFontSize", fontSize);
     await game.settings.set("fate-aspect-tracker","AspectDrawingFontDynamicColor", fontDynamicColor);
     await game.settings.set("fate-aspect-tracker","AspectDrawingFontColor", fontColor);