+
diff --git a/src/ui/shellElements.js b/src/ui/shellElements.js
index c1944b995..9ff12e75f 100644
--- a/src/ui/shellElements.js
+++ b/src/ui/shellElements.js
@@ -7,32 +7,8 @@ export function readShellElements(document = globalThis.document) {
_ppToggles: document.getElementById('pp-toggles'),
_bloomBtn: document.getElementById('bloom-toggle'),
_bloomSlider: document.getElementById('bloom-intensity-slider'),
- _sharpenBtn: document.getElementById('sharpen-toggle'),
- _sharpenSlider: document.getElementById('sharpen-intensity-slider'),
_hudBtn: document.getElementById('hud-toggle'),
- _hudLayoutSelect: document.getElementById('hud-layout-select'),
- _cyberSonarBtn: document.getElementById('cyber-sonar-toggle'),
- _cyberSonarRings: document.getElementById('cyber-sonar-rings'),
- _cyberSonarRange: document.getElementById('cyber-sonar-range'),
- _cyberSonarIntensity: document.getElementById('cyber-sonar-intensity'),
- _cyberSonarOpacity: document.getElementById('cyber-sonar-opacity'),
- _cyberSonarSector: document.getElementById('cyber-sonar-sector'),
- _detectionDensitySlider: document.getElementById(
- 'detection-density-slider',
- ),
- _detectionAllocationBtns: [
- document.getElementById('detection-allocation-elastic'),
- document.getElementById('detection-allocation-weighted'),
- ].filter(Boolean),
- _detectionFadeSlider: document.getElementById('detection-fade-slider'),
- _detectionOpacitySlider: document.getElementById(
- 'detection-opacity-slider',
- ),
- _celestialBtn: document.getElementById('celestial-toggle'),
- _scopeBtn: document.getElementById('scope-toggle'),
- _scopeFeatherSlider: document.getElementById('scope-feather-slider'),
_cleanViewBtn: document.getElementById('clean-view-toggle'),
- _cleanViewExitBtn: document.getElementById('clean-view-exit'),
_dataPanel: document.getElementById('data-panel'),
_scenePanel: document.getElementById('scene-panel'),
_cctvPanel: document.getElementById('cctv-panel'),
@@ -102,7 +78,6 @@ export function readShellElements(document = globalThis.document) {
_clearSelectedLayersBtn: document.getElementById('clear-selected-layers'),
_resetGlobeBtn: document.getElementById('reset-globe-view'),
_cockpitResetGlobeBtn: document.getElementById('cockpit-reset-globe'),
- _styleButtons: document.getElementById('style-buttons'),
_locationSearch: document.getElementById('location-search'),
_searchToggle: document.getElementById('search-toggle'),
_safeFrameOverlay: document.getElementById('safe-frame-overlay'),
diff --git a/src/ui/shellFacade.js b/src/ui/shellFacade.js
index ce12d3211..133f9ec0c 100644
--- a/src/ui/shellFacade.js
+++ b/src/ui/shellFacade.js
@@ -9,14 +9,6 @@ export class ShellFacade {
return this._navigation.subscribeCameraHandoff(listener);
}
- get _models3dModeBtns() {
- return this._aircraftDisplay._models3dModeBtns;
- }
-
- set _models3dModeBtns(value) {
- this._aircraftDisplay._models3dModeBtns = value;
- }
-
get _models3dEnabled() {
return this._aircraftDisplay._models3dEnabled;
}
@@ -137,14 +129,6 @@ export class ShellFacade {
this._displayBindings._frameRateMonitor = value;
}
- get _displayControls() {
- return this._displayBindings?._displayControls;
- }
-
- set _displayControls(value) {
- this._displayBindings._displayControls = value;
- }
-
get _activeLocationId() {
return this._locationNavigation._activeLocationId;
}
diff --git a/src/ui/stores/display.js b/src/ui/stores/display.js
index 8b94b6f3f..7f06bf4cb 100644
--- a/src/ui/stores/display.js
+++ b/src/ui/stores/display.js
@@ -5,7 +5,9 @@ import { markRaw, shallowRef } from 'vue';
* The Display panel as its view renders it. VisualSettings presents its
* groups (`_presentDisplay()`), AircraftDisplay the 3D aircraft group, the
* draw tool its controls and the file import its list, and each publishes
- * here; each keeps its listeners on the controls. VisualSettings also
+ * here. The Display controls' changes reach their owner (DisplayBindings)
+ * through act(); the draw tool and the file import keep their listeners on
+ * their controls. VisualSettings also
* publishes the active style, which the dock and the scene chrome show, and
* the map source controls publish their chip row beside it.
*/
@@ -66,6 +68,34 @@ export const useDisplayStore = defineStore('gev-display', () => {
mapSourceControls.value = controls && markRaw(controls);
}
+ /** @type {{actions: object}|null} The Display controls' owner. */
+ let owner = null;
+
+ /**
+ * Answer the Display controls (and the dock's style buttons) with
+ * `actions`, replacing any earlier owner.
+ * @param {Record} actions
+ * @returns {object} Token for detach().
+ */
+ function connect(actions) {
+ owner = { actions };
+ return owner;
+ }
+
+ /** Stop answering for the owner holding `token`; a later owner stays. */
+ function detach(token) {
+ if (token === owner) owner = null;
+ }
+
+ /**
+ * A control's change: call the owner's action, if one is connected.
+ * @param {string} name
+ * @param {...unknown} args
+ */
+ function act(name, ...args) {
+ owner?.actions[name]?.(...args);
+ }
+
/** The phone shell's tab bar; null until the shell first presents it. */
const phoneShell = shallowRef(null);
@@ -91,5 +121,8 @@ export const useDisplayStore = defineStore('gev-display', () => {
publishMapSource,
mapSourceControls,
connectMapSource,
+ connect,
+ detach,
+ act,
};
});
diff --git a/src/ui/views/CommandDockView.vue b/src/ui/views/CommandDockView.vue
index c6553720e..c34e37286 100644
--- a/src/ui/views/CommandDockView.vue
+++ b/src/ui/views/CommandDockView.vue
@@ -14,9 +14,10 @@ import PhoneTabBar from './panels/PhoneTabBar.vue';
import VoiceControl from './panels/VoiceControl.vue';
// VisualSettings publishes the active style and the map source controls
-// their chip row; until they do, the dock shows its initial markup. The
-// style buttons keep their owner's listeners; a chip calls the controls.
-const { style, mapSource, mapSourceControls } = storeToRefs(useDisplayStore());
+// their chip row; until they do, the dock shows its initial markup. A style
+// button calls the Display controls' owner, a chip the map source controls.
+const display = useDisplayStore();
+const { style, mapSource, mapSourceControls } = storeToRefs(display);
// LocationControls publishes the location tray; pills call the controls,
// and the search field keeps their listeners.
const { view: loc, controls: locationControls } = storeToRefs(useLocationStore());
@@ -80,32 +81,32 @@ function selectMapSource(chip) {
-
-
-
@@ -137,27 +145,24 @@ const geoListed = computed(() => geoRows.value.length > 0);
button ships lit and the mode row ships open — the same markup-carries-the-default
convention as #scope-toggle. ui.js re-syncs both from durable layer state, which
is what flips them back for a share link or a stored session carrying 3D off. -->
-
