From c29960abf24ef6bddac6e6e71963b03dd74824dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 2 Nov 2023 09:32:58 +0800 Subject: [PATCH] Presets: fix regression #606 --- presets/examples/11.jsonc | 4 +++- presets/examples/8.jsonc | 10 +++++++--- presets/examples/9.jsonc | 4 +++- src/data/config_user.jsonc | 4 +++- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/presets/examples/11.jsonc b/presets/examples/11.jsonc index 13215add1..018cfd882 100644 --- a/presets/examples/11.jsonc +++ b/presets/examples/11.jsonc @@ -4,7 +4,9 @@ "type": "small" }, "display": { - "percentType": 9, + "percent": { + "type": 9 + }, "separator": "\u001b[31m-> " }, "modules": [ diff --git a/presets/examples/8.jsonc b/presets/examples/8.jsonc index 7fe01dd7f..3aea80971 100644 --- a/presets/examples/8.jsonc +++ b/presets/examples/8.jsonc @@ -8,9 +8,13 @@ "color": { "keys": "magenta" }, - "sizeNdigits": 0, - "sizeMaxPrefix": "MB", - "percentType": 9 + "size": { + "ndigits": 0, + "maxPrefix": "MB" + }, + "percent": { + "type": 9 + } }, "modules": [ { diff --git a/presets/examples/9.jsonc b/presets/examples/9.jsonc index 1dd6f7307..abdc69bd7 100644 --- a/presets/examples/9.jsonc +++ b/presets/examples/9.jsonc @@ -4,12 +4,14 @@ "type": "small" }, "display": { - "percentType": 6, "keyWidth": 11, "bar": { "charElapsed": "=", "charTotal": "-", "width": 13 + }, + "percent": { + "type": 9 } }, "modules": [ diff --git a/src/data/config_user.jsonc b/src/data/config_user.jsonc index 2e3bbb36f..07148cdac 100644 --- a/src/data/config_user.jsonc +++ b/src/data/config_user.jsonc @@ -9,7 +9,9 @@ } }, "display": { - "percentType": 9 // colored percent number + "percent": { + "type": 9 + } // colored percent number }, "modules": [ "title",