erik/acdream
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor(D.2b): LayoutImporter review fixes — root-fallback trace + cursor-discard note

Browse source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Erik 2026-06-15 14:03:24 +02:00
parent bd01a29eb2
commit 9a55a688ca
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/AcDream.App/UI/Layout/LayoutImporter.cs
View file

@ -86,8 +86,12 @@ public static class LayoutImporter
var byId = new Dictionary<uint, UiElement>(); var byId = new Dictionary<uint, UiElement>();
// Root is never a Type-12 prototype in practice; fall back to a generic // Root is never a Type-12 prototype in practice; fall back to a generic
// container if the factory returns null for an exotic root type. // container if the factory returns null for an exotic root type.
var root = BuildWidget(rootInfo, resolve, datFont, byId) var root = BuildWidget(rootInfo, resolve, datFont, byId);
?? new UiDatElement(rootInfo, resolve); if (root is null)
{
Console.WriteLine($"[D.2b] LayoutImporter: root element 0x{rootInfo.Id:X8} (type {rootInfo.Type}) produced no widget — using empty container fallback.");
root = new UiDatElement(rootInfo, resolve);
}
return new ImportedLayout(root, byId); return new ImportedLayout(root, byId);
} }
@ -228,7 +232,8 @@ public static class LayoutImporter
/// </summary> /// </summary>
private static void ReadState(StateDesc sd, string name, ElementInfo info) private static void ReadState(StateDesc sd, string name, ElementInfo info)
{ {
// First MediaDescImage in this state's Media list wins (format doc §5). // Only MediaDescImage is read for rendering; MediaDescCursor items (on grips/drag bars)
// are intentionally skipped — cursor behavior is Plan 2.
foreach (var m in sd.Media) foreach (var m in sd.Media)
{ {
if (m is MediaDescImage img && img.File != 0) if (m is MediaDescImage img && img.File != 0)