From 8e7bffc8affa084d6ce09a31846ec748f9de3ce1 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Wed, 18 Feb 2026 18:05:32 +0100 Subject: [PATCH] Use comfort for TwoPanelWidth. --- Luna | 2 +- Penumbra/Config/UiConfig.cs | 24 ++++-------------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/Luna b/Luna index 3fa2195b..bff400eb 160000 --- a/Luna +++ b/Luna @@ -1 +1 @@ -Subproject commit 3fa2195ba9b34c4ce21e3180bf238edb488a4d35 +Subproject commit bff400eb44aeded41fb6b1b3d35948881b578737 diff --git a/Penumbra/Config/UiConfig.cs b/Penumbra/Config/UiConfig.cs index 37a88684..233de0e1 100644 --- a/Penumbra/Config/UiConfig.cs +++ b/Penumbra/Config/UiConfig.cs @@ -17,30 +17,14 @@ public sealed partial class UiConfig : ConfigurationFile protected override void AddData(JsonTextWriter j) { - j.WritePropertyName("CollectionsTab"); - j.WriteStartObject(); - j.WritePropertyName("Mode"); - j.WriteValue(CollectionsTabScale.Mode.ToString()); - j.WritePropertyName("Width"); - j.WriteValue(CollectionsTabScale.Width); - j.WriteEndObject(); - j.WritePropertyName("ModsTab"); - j.WriteStartObject(); - j.WritePropertyName("Mode"); - j.WriteValue(ModTabScale.Mode.ToString()); - j.WritePropertyName("Width"); - j.WriteValue(ModTabScale.Width); - j.WriteEndObject(); + CollectionsTabScale.WriteJson(j, "CollectionsTab"); + ModTabScale.WriteJson(j, "ModsTab"); } protected override void LoadData(JObject j) { - if (j["CollectionsTab"] is JObject collections) - _collectionsTabScale = new TwoPanelWidth(collections["Width"].ValueOr(float.NaN), - collections["Mode"].TextEnum(ScalingMode.Percentage)); - - if (j["ModsTab"] is JObject mods) - _modTabScale = new TwoPanelWidth(mods["Width"].ValueOr(float.NaN), mods["Mode"].TextEnum(ScalingMode.Percentage)); + _collectionsTabScale = TwoPanelWidth.ReadJson(j, "CollectionsTab", new TwoPanelWidth(0.25f, ScalingMode.Percentage)); + _modTabScale = TwoPanelWidth.ReadJson(j, "ModsTab", new TwoPanelWidth(0.3f, ScalingMode.Percentage)); } public override int CurrentVersion