From 4bf8e2c49ff8ec11136dbc40b38780167b451fce Mon Sep 17 00:00:00 2001
From: RossAscends <124905043+RossAscends@users.noreply.github.com>
Date: Fri, 14 Jul 2023 04:15:31 +0900
Subject: [PATCH] fix charlist state on character deletion

---
 public/script.js             | 54 +++++++++++++++++++++---------------
 public/scripts/power-user.js |  5 +++-
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/public/script.js b/public/script.js
index 3e0032fc6..8c205bea4 100644
--- a/public/script.js
+++ b/public/script.js
@@ -916,6 +916,7 @@ async function printCharacters() {
     sortCharactersList();
     favsToHotswap();
     await delay(300);
+    doCharListDisplaySwitch();
     updateVisibleDivs('#rm_print_characters_block', true);
     displayOverrideWarnings();
 
@@ -6797,6 +6798,35 @@ async function doImpersonate() {
 const isPwaMode = window.navigator.standalone;
 if (isPwaMode) { $("body").addClass('PWA') }
 
+function doCharListDisplaySwitch(flipSwitch) {
+
+    if (!flipSwitch) {
+        console.debug('toggling body charListGrid state')
+        $("body").toggleClass('charListGrid')
+        power_user.charListGrid = $("body").hasClass("charListGrid") ? true : false;
+        saveSettingsDebounced()
+    }
+
+    //(wide100p alignitemsflexstart) removed, the rest added
+    if (power_user.charListGrid === true && $("body").hasClass('charListGrid')
+        || power_user.charListGrid === false && !$("body").hasClass('charListGrid')) {
+        $("#rm_print_characters_block").toggleClass('flexFlowColumn flex-container')
+
+        $("#rm_print_characters_block .character_select").toggleClass('wide100p alignitemsflexstart heightMinContent flexFlowColumn wide30p overflowHidden wideMax100px')
+        $("#rm_print_characters_block .character_select .ch_name").toggleClass('wide100p wideMax100px')
+        $("#rm_print_characters_block .character_select .ch_name").parent().toggleClass('wide100p')
+        $("#rm_print_characters_block .character_select .ch_name").parent().parent().toggleClass('wide100pLess70px justifyCenter wideMax100px')
+
+        $("#rm_print_characters_block .group_select").toggleClass('wide100p alignitemsflexstart heightMinContent alignitemscenter flexFlowColumn wide30p overflowHidden wideMax100px')
+        $("#rm_print_characters_block .group_select .ch_name").toggleClass('wide100p wideMax100px')
+        $("#rm_print_characters_block .group_select .ch_name").parent().toggleClass('wide100pLess70px')
+
+        $(".character_select .ch_description").toggle()
+        $("#rm_print_characters_block .tags_inline").toggle()
+        select_rm_characters()
+    }
+}
+
 $(document).ready(function () {
 
     if (isMobile() === true) {
@@ -8622,30 +8652,8 @@ $(document).ready(function () {
     }
 
     $("#charListGridToggle").on('click', async () => {
-        doCharListDisplaySwitch()
+        doCharListDisplaySwitch(true)
     })
 
-    function doCharListDisplaySwitch() {
 
-        $("body").toggleClass('charListGrid')
-
-        //(wide100p alignitemsflexstart) removed, the rest added
-        $("#rm_print_characters_block").toggleClass('flexFlowColumn flex-container')
-
-        $("#rm_print_characters_block .character_select").toggleClass('wide100p alignitemsflexstart heightMinContent flexFlowColumn wide30p overflowHidden wideMax100px')
-        $("#rm_print_characters_block .character_select .ch_name").toggleClass('wide100p wideMax100px')
-        $("#rm_print_characters_block .character_select .ch_name").parent().toggleClass('wide100p')
-        $("#rm_print_characters_block .character_select .ch_name").parent().parent().toggleClass('wide100pLess70px justifyCenter wideMax100px')
-
-        $("#rm_print_characters_block .group_select").toggleClass('wide100p alignitemsflexstart heightMinContent alignitemscenter flexFlowColumn wide30p overflowHidden wideMax100px')
-        $("#rm_print_characters_block .group_select .ch_name").toggleClass('wide100p wideMax100px')
-        $("#rm_print_characters_block .group_select .ch_name").parent().toggleClass('wide100pLess70px')
-
-        $(".character_select .ch_description").toggle()
-        $("#rm_print_characters_block .tags_inline").toggle()
-        power_user.charListGrid = $("body").hasClass("charListGrid") ? true : false;
-        saveSettingsDebounced()
-        select_rm_characters()
-
-    }
 })
diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index 3dad2d2d2..b8b459974 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -750,10 +750,13 @@ function loadPowerUserSettings(settings, data) {
 
 async function loadCharListState() {
     if (document.getElementById('CharID0') !== null) {
+        console.debug('setting charlist state to...')
         if (power_user.charListGrid === true) {
+            console.debug('..to grid')
             $("#charListGridToggle").trigger('click')
-        }
+        } else { console.debug('..to list') }
     } else {
+        console.debug('charlist not ready yet')
         await delay(100)
         loadCharListState();
     }