kneesox/NAK_CVR_Mods
1
0
Fork 0
mirror of https://github.com/NotAKidoS/NAK_CVR_Mods.git synced 2025-09-02 06:19:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stickers: limited to 512 buttons max for sticker selection

Browse source
This commit is contained in:
NotAKidoS 2024-08-25 22:13:07 -05:00
parent d1102bb1e5
commit 2bf644aa7b
2 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Stickers/Integrations/BTKUI/UIAddon.Page.StickerSelect.cs
View file

@ -1,4 +1,5 @@
using BTKUILib; using System.Diagnostics;
using BTKUILib;
using BTKUILib.UIObjects; using BTKUILib.UIObjects;
using BTKUILib.UIObjects.Components; using BTKUILib.UIObjects.Components;
using MTJobSystem; using MTJobSystem;
@ -18,6 +19,7 @@ public static partial class BTKUIAddon
private static Category _fileCategory; private static Category _fileCategory;
private static Category _folderCategory; private static Category _folderCategory;
private const int MAX_BUTTONS = 512; // cohtml literally will start to explode
private static Button[] _fileButtons = new Button[80]; // 100 files, will resize if needed private static Button[] _fileButtons = new Button[80]; // 100 files, will resize if needed
private static Button[] _folderButtons = new Button[20]; // 20 folders, will resize if needed private static Button[] _folderButtons = new Button[20]; // 20 folders, will resize if needed
@ -139,6 +141,7 @@ public static partial class BTKUIAddon
if (button == null) break; // Array resized, excess buttons are generating if (button == null) break; // Array resized, excess buttons are generating
//if (button.Hidden) break; // Reached the end of the visible buttons //if (button.Hidden) break; // Reached the end of the visible buttons
button.Hidden = true; button.Hidden = true;
button.ButtonIcon = string.Empty; // hoping this makes cohtml less mad
} }
} }
@ -172,7 +175,7 @@ public static partial class BTKUIAddon
private static void PopulateMenuItems() private static void PopulateMenuItems()
{ {
// StickerMod.Logger.Msg("Populating menu items."); StickerMod.Logger.Msg("Populating menu items.");
try try
{ {
Thread.CurrentThread.IsBackground = false; // working around bug in MTJobManager Thread.CurrentThread.IsBackground = false; // working around bug in MTJobManager
@ -183,26 +186,26 @@ public static partial class BTKUIAddon
MTJobManager.RunOnMainThread("PopulateMenuItems", () => MTJobManager.RunOnMainThread("PopulateMenuItems", () =>
{ {
// resize the arrays to the max amount of buttons // resize the arrays to the max amount of buttons
int difference = directories.Length - _folderButtons.Length; int foldersCount = Mathf.Min(directories.Length, MAX_BUTTONS);
if (difference > 0) if (foldersCount > _folderButtons.Length)
{ {
Array.Resize(ref _folderButtons, directories.Length); int folderEndIdx = _folderButtons.Length;
SetupFolderButtons(difference); Array.Resize(ref _folderButtons, foldersCount);
StickerMod.Logger.Msg($"Resized folder buttons to {directories.Length}"); SetupFolderButtons(folderEndIdx);
} }
difference = files.Length - _fileButtons.Length; int filesCount = Mathf.Min(files.Length, MAX_BUTTONS);
if (difference > 0) if (filesCount > _fileButtons.Length)
{ {
Array.Resize(ref _fileButtons, files.Length); int fileEndIdx = _fileButtons.Length;
SetupFileButtons(difference); Array.Resize(ref _fileButtons, filesCount);
StickerMod.Logger.Msg($"Resized file buttons to {files.Length}"); SetupFileButtons(fileEndIdx);
} }
_folderCategory.Hidden = directories.Length == 0; _folderCategory.Hidden = foldersCount == 0;
_folderCategory.CategoryName = $"Subdirectories ({directories.Length})"; _folderCategory.CategoryName = $"Subdirectories ({foldersCount})";
_fileCategory.Hidden = files.Length == 0; _fileCategory.Hidden = filesCount == 0;
_fileCategory.CategoryName = $"Images ({files.Length})"; _fileCategory.CategoryName = $"Images ({filesCount})";
}); });
PopulateFolders(directories); PopulateFolders(directories);
@ -227,9 +230,11 @@ public static partial class BTKUIAddon
break; break;
Button button = _folderButtons[i]; Button button = _folderButtons[i];
//if (button == null) continue; // Array resized, excess buttons are generating
button.ButtonText = directories[i].Name; button.ButtonText = directories[i].Name;
button.ButtonTooltip = $"Open {directories[i].Name}"; button.ButtonTooltip = $"Open {directories[i].Name}";
MTJobManager.RunOnMainThread("PopulateMenuItems", () => button.Hidden = false); MTJobManager.RunAsyncOnMainThread("PopulateMenuItems", () => button.Hidden = false);
if (i <= 16) Thread.Sleep(10); // For the pop-in effect if (i <= 16) Thread.Sleep(10); // For the pop-in effect
} }
@ -251,6 +256,8 @@ public static partial class BTKUIAddon
string relativePathWithoutExtension = relativePath[..^fileInfo.Extension.Length]; string relativePathWithoutExtension = relativePath[..^fileInfo.Extension.Length];
Button button = _fileButtons[i]; Button button = _fileButtons[i];
//if (button == null) continue; // Array resized, excess buttons are generating
button.ButtonTooltip = $"Load {fileInfo.Name}"; // Do not change "Load " prefix, we extract file name button.ButtonTooltip = $"Load {fileInfo.Name}"; // Do not change "Load " prefix, we extract file name
if (StickerCache.IsThumbnailAvailable(relativePathWithoutExtension)) if (StickerCache.IsThumbnailAvailable(relativePathWithoutExtension))
@ -263,7 +270,7 @@ public static partial class BTKUIAddon
StickerCache.EnqueueThumbnailGeneration(fileInfo, button); StickerCache.EnqueueThumbnailGeneration(fileInfo, button);
} }
MTJobManager.RunOnMainThread("PopulateMenuItems", () => button.Hidden = false); MTJobManager.RunAsyncOnMainThread("PopulateMenuItems", () => button.Hidden = false);
if (i <= 16) Thread.Sleep(10); // For the pop-in effect if (i <= 16) Thread.Sleep(10); // For the pop-in effect
} }

6
Stickers/Stickers/Utilities/StickerCache.cs
View file

@ -60,11 +60,9 @@ public static class StickerCache
{ {
lock (_filesBeingProcessed) lock (_filesBeingProcessed)
{ {
if (!_filesBeingProcessed.Add(fileInfo.FullName)) if (!_filesBeingProcessed.Add(fileInfo.FullName)) return;
return;
_filesToGenerateThumbnails.Enqueue((fileInfo, button)); _filesToGenerateThumbnails.Enqueue((fileInfo, button));
MTJobManager.RunOnMainThread("StartGeneratingThumbnailsIfNeeded", StartGeneratingThumbnailsIfNeeded); StartGeneratingThumbnailsIfNeeded();
} }
} }