From 8c762f3f3ee17fa0a69f82e769fc6a3e0c0ffac0 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sat, 31 Jan 2026 02:26:10 +0100
Subject: [PATCH] Fixed sceneConfig, sceneNavigation and SceneEnvironments

---
 .../scene/sceneConfigSettings.mjs             |  8 +++
 module/applications/ui/sceneNavigation.mjs    |  5 +-
 styles/less/ui/scene-config/scene-config.less |  2 +
 .../ui/sceneNavigation/scene-navigation.hbs   | 52 ++++++++++++++++++-
 4 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/module/applications/scene/sceneConfigSettings.mjs b/module/applications/scene/sceneConfigSettings.mjs
index 98e18f09..dda4330a 100644
--- a/module/applications/scene/sceneConfigSettings.mjs
+++ b/module/applications/scene/sceneConfigSettings.mjs
@@ -62,7 +62,15 @@ export default class DhSceneConfigSettings extends foundry.applications.sheets.S
     }
 
     async _onDrop(event) {
+        event.stopPropagation();
         const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
+        if (data.type === 'Level') {
+            const level = await foundry.documents.Level.fromDropData(data);
+            if (level?.parent === this.document) return this._onSortLevel(event, level);
+
+            return;
+        }
+
         const item = await foundry.utils.fromUuid(data.uuid);
         if (item instanceof game.system.api.documents.DhpActor && item.type === 'environment') {
             let sceneUuid = data.uuid;
diff --git a/module/applications/ui/sceneNavigation.mjs b/module/applications/ui/sceneNavigation.mjs
index 0a3e08a5..bc906dac 100644
--- a/module/applications/ui/sceneNavigation.mjs
+++ b/module/applications/ui/sceneNavigation.mjs
@@ -31,7 +31,7 @@ export default class DhSceneNavigation extends foundry.applications.ui.SceneNavi
                 const environments = daggerheartInfo.sceneEnvironments.filter(
                     x => x && x.testUserPermission(game.user, 'LIMITED')
                 );
-                const hasEnvironments = environments.length > 0 && x.isView;
+                const hasEnvironments = environments.length > 0 && x.active;
                 return {
                     ...x,
                     hasEnvironments,
@@ -39,9 +39,10 @@ export default class DhSceneNavigation extends foundry.applications.ui.SceneNavi
                     environments: environments
                 };
             });
+
         context.scenes.active = extendScenes(context.scenes.active);
         context.scenes.inactive = extendScenes(context.scenes.inactive);
-
+        context.scenes.viewed = context.scenes.viewed ? extendScenes([context.scenes.viewed])[0] : null;
         return context;
     }
 
diff --git a/styles/less/ui/scene-config/scene-config.less b/styles/less/ui/scene-config/scene-config.less
index 664e7526..ba1afb0b 100644
--- a/styles/less/ui/scene-config/scene-config.less
+++ b/styles/less/ui/scene-config/scene-config.less
@@ -13,6 +13,8 @@
 
 .application.sheet.scene-config {
     .sheet-tabs.tabs {
+        font-size: 12px;
+
         a[data-tab='dh'] {
             display: flex;
             align-items: center;
diff --git a/templates/ui/sceneNavigation/scene-navigation.hbs b/templates/ui/sceneNavigation/scene-navigation.hbs
index 41e9e3e8..933d2074 100644
--- a/templates/ui/sceneNavigation/scene-navigation.hbs
+++ b/templates/ui/sceneNavigation/scene-navigation.hbs
@@ -1,10 +1,40 @@
+
+
 <nav id="scene-navigation" aria-roledescription="{{localize "SCENE_NAVIGATION.LABEL"}}" data-tooltip-direction="RIGHT">
     {{#if canExpand}}
     <a id="scene-navigation-expand" class="ui-control" data-action="toggleExpand">
         <i class="fa-solid fa-caret-down" inert></i>
     </a>
     {{/if}}
+    {{#with scenes.viewed}}
+        <menu id="scene-navigation-viewed" class="scene-navigation-menu flexcol">
+            {{> ".scene" }}
+        </menu>
+    {{/with}}
+    <menu id="scene-navigation-levels" class="scene-levels scene-navigation-menu flexcol levels-{{ scenes.levels.length }}">
+        {{#each scenes.levels}}
+        <li class="level-row">
+            {{#with button}}
+            <button type="button" class="ui-control icon fa-solid {{ css }}" data-action="cycleLevel"
+                    data-direction="{{ direction }}" aria-label="{{ label }}"></button>
+            {{/with}}
+            <div class="ui-control scene scene-level {{ css }}" data-scene-id="{{ sceneId }}" data-level-id="{{ id }}" data-action="viewLevel">
+                <span class="ellipsis">{{ name }}</span>
+            </div>
+        </li>
+        {{/each}}
+    </menu>
     <menu id="scene-navigation-active" class="scene-navigation-menu flexcol">
+        {{#each scenes.active}}
+        {{> ".scene" }}
+        {{/each}}
+    </menu>
+    <menu id="scene-navigation-inactive" class="scene-navigation-menu flexcol">
+        {{#each scenes.inactive as |scene|}}
+        {{> ".scene" }}
+        {{/each}}
+    </menu>
+    {{!-- <menu id="scene-navigation-active" class="scene-navigation-menu flexcol">
         {{#each scenes.active as |scene|}}
             <li class="scene-wrapper">
                 <div class="ui-control scene {{scene.cssClass}}" data-scene-id="{{scene.id}}" data-action="viewScene" {{#if scene.tooltip}}data-tooltip-text="{{scene.tooltip}}"{{/if}}>
@@ -32,5 +62,25 @@
                 </div>
             </li>
         {{/each}}
-    </menu>
+    </menu> --}}
 </nav>
+
+{{#*inline ".scene"}}
+<li class="scene-wrapper">
+    <div class="ui-control scene {{ cssClass }}" data-scene-id="{{ id }}" data-action="viewScene" {{#if tooltip}}data-tooltip-text="{{ tooltip }}"{{/if}}>
+        <span class="scene-name ellipsis">{{ name }}</span>
+        {{#if users}}
+        <ul class="scene-players">
+            {{#each users}}
+            <li class="scene-player" style="--color-bg: {{ color }}; --color-border: {{ border }}" data-tooltip
+                aria-label="{{ name }}">{{ letter }}</li>
+            {{/each}}
+        </ul>
+        {{/if}}
+    </div>
+    {{#if hasEnvironments}}
+        <button class="ui-control scene-environment {{#if (gt environments.length 1)}}many-environments{{/if}}" data-action="openSceneEnvironment" data-scene-id="{{id}}"><img src="{{environmentImage}}" /> </button>
+    {{/if}}
+</li>
+{{/inline}}
+