mirror of
https://github.com/ksyasuda/SubMiner.git
synced 2026-02-28 06:22:45 -08:00
refactor: extract overlay runtime deps bundle
This commit is contained in:
105
src/core/services/overlay-runtime-deps-service.test.ts
Normal file
105
src/core/services/overlay-runtime-deps-service.test.ts
Normal file
@@ -0,0 +1,105 @@
|
||||
import test from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import {
|
||||
createInitializeOverlayRuntimeDepsService,
|
||||
createInvisibleOverlayVisibilityDepsRuntimeService,
|
||||
createOverlayWindowRuntimeDepsService,
|
||||
createVisibleOverlayVisibilityDepsRuntimeService,
|
||||
} from "./overlay-runtime-deps-service";
|
||||
|
||||
test("createOverlayWindowRuntimeDepsService maps runtime state providers", () => {
|
||||
let visible = true;
|
||||
let invisible = false;
|
||||
const deps = createOverlayWindowRuntimeDepsService({
|
||||
isDev: false,
|
||||
getOverlayDebugVisualizationEnabled: () => true,
|
||||
ensureOverlayWindowLevel: () => {},
|
||||
onRuntimeOptionsChanged: () => {},
|
||||
setOverlayDebugVisualizationEnabled: () => {},
|
||||
getVisibleOverlayVisible: () => visible,
|
||||
getInvisibleOverlayVisible: () => invisible,
|
||||
tryHandleOverlayShortcutLocalFallback: () => false,
|
||||
onWindowClosed: () => {},
|
||||
});
|
||||
|
||||
assert.equal(deps.isOverlayVisible("visible"), true);
|
||||
assert.equal(deps.isOverlayVisible("invisible"), false);
|
||||
visible = false;
|
||||
invisible = true;
|
||||
assert.equal(deps.isOverlayVisible("visible"), false);
|
||||
assert.equal(deps.isOverlayVisible("invisible"), true);
|
||||
});
|
||||
|
||||
test("createInitializeOverlayRuntimeDepsService passes through overlay init deps", () => {
|
||||
const windows: any[] = [];
|
||||
const deps = createInitializeOverlayRuntimeDepsService({
|
||||
backendOverride: null,
|
||||
getInitialInvisibleOverlayVisibility: () => true,
|
||||
createMainWindow: () => {},
|
||||
createInvisibleWindow: () => {},
|
||||
registerGlobalShortcuts: () => {},
|
||||
updateOverlayBounds: () => {},
|
||||
isVisibleOverlayVisible: () => false,
|
||||
isInvisibleOverlayVisible: () => true,
|
||||
updateVisibleOverlayVisibility: () => {},
|
||||
updateInvisibleOverlayVisibility: () => {},
|
||||
getOverlayWindows: () => windows as never,
|
||||
syncOverlayShortcuts: () => {},
|
||||
setWindowTracker: () => {},
|
||||
getResolvedConfig: () => ({ ankiConnect: undefined }),
|
||||
getSubtitleTimingTracker: () => null,
|
||||
getMpvClient: () => null,
|
||||
getRuntimeOptionsManager: () => null,
|
||||
setAnkiIntegration: () => {},
|
||||
showDesktopNotification: () => {},
|
||||
createFieldGroupingCallback: () => async () => ({
|
||||
keepNoteId: 0,
|
||||
deleteNoteId: 0,
|
||||
deleteDuplicate: true,
|
||||
cancelled: true,
|
||||
}),
|
||||
});
|
||||
|
||||
assert.equal(deps.getInitialInvisibleOverlayVisibility(), true);
|
||||
assert.equal(deps.getOverlayWindows().length, 0);
|
||||
});
|
||||
|
||||
test("createVisibleOverlayVisibilityDepsRuntimeService snapshots runtime values", () => {
|
||||
const deps = createVisibleOverlayVisibilityDepsRuntimeService({
|
||||
getVisibleOverlayVisible: () => true,
|
||||
getMainWindow: () => null,
|
||||
getWindowTracker: () => null,
|
||||
getTrackerNotReadyWarningShown: () => false,
|
||||
setTrackerNotReadyWarningShown: () => {},
|
||||
shouldBindVisibleOverlayToMpvSubVisibility: () => true,
|
||||
getPreviousSecondarySubVisibility: () => null,
|
||||
setPreviousSecondarySubVisibility: () => {},
|
||||
isMpvConnected: () => false,
|
||||
mpvSend: () => {},
|
||||
secondarySubVisibilityRequestId: 123,
|
||||
updateOverlayBounds: () => {},
|
||||
ensureOverlayWindowLevel: () => {},
|
||||
enforceOverlayLayerOrder: () => {},
|
||||
syncOverlayShortcuts: () => {},
|
||||
});
|
||||
|
||||
assert.equal(deps.visibleOverlayVisible, true);
|
||||
assert.equal(deps.secondarySubVisibilityRequestId, 123);
|
||||
assert.equal(deps.mpvConnected, false);
|
||||
});
|
||||
|
||||
test("createInvisibleOverlayVisibilityDepsRuntimeService snapshots runtime values", () => {
|
||||
const deps = createInvisibleOverlayVisibilityDepsRuntimeService({
|
||||
getInvisibleWindow: () => null,
|
||||
getVisibleOverlayVisible: () => true,
|
||||
getInvisibleOverlayVisible: () => false,
|
||||
getWindowTracker: () => null,
|
||||
updateOverlayBounds: () => {},
|
||||
ensureOverlayWindowLevel: () => {},
|
||||
enforceOverlayLayerOrder: () => {},
|
||||
syncOverlayShortcuts: () => {},
|
||||
});
|
||||
|
||||
assert.equal(deps.visibleOverlayVisible, true);
|
||||
assert.equal(deps.invisibleOverlayVisible, false);
|
||||
});
|
||||
174
src/core/services/overlay-runtime-deps-service.ts
Normal file
174
src/core/services/overlay-runtime-deps-service.ts
Normal file
@@ -0,0 +1,174 @@
|
||||
import { BrowserWindow } from "electron";
|
||||
import { BaseWindowTracker } from "../../window-trackers";
|
||||
import {
|
||||
AnkiConnectConfig,
|
||||
KikuFieldGroupingChoice,
|
||||
KikuFieldGroupingRequestData,
|
||||
WindowGeometry,
|
||||
} from "../../types";
|
||||
import { createOverlayWindowService } from "./overlay-window-service";
|
||||
import { initializeOverlayRuntimeService } from "./overlay-runtime-init-service";
|
||||
import {
|
||||
updateInvisibleOverlayVisibilityService,
|
||||
updateVisibleOverlayVisibilityService,
|
||||
} from "./overlay-visibility-service";
|
||||
|
||||
interface MpvCommandSender {
|
||||
command: Array<string | number>;
|
||||
request_id?: number;
|
||||
}
|
||||
|
||||
export interface OverlayWindowRuntimeDepsOptions {
|
||||
isDev: boolean;
|
||||
getOverlayDebugVisualizationEnabled: () => boolean;
|
||||
ensureOverlayWindowLevel: (window: BrowserWindow) => void;
|
||||
onRuntimeOptionsChanged: () => void;
|
||||
setOverlayDebugVisualizationEnabled: (enabled: boolean) => void;
|
||||
getVisibleOverlayVisible: () => boolean;
|
||||
getInvisibleOverlayVisible: () => boolean;
|
||||
tryHandleOverlayShortcutLocalFallback: (input: Electron.Input) => boolean;
|
||||
onWindowClosed: (kind: "visible" | "invisible") => void;
|
||||
}
|
||||
|
||||
export interface InitializeOverlayRuntimeDepsOptions {
|
||||
backendOverride: string | null;
|
||||
getInitialInvisibleOverlayVisibility: () => boolean;
|
||||
createMainWindow: () => void;
|
||||
createInvisibleWindow: () => void;
|
||||
registerGlobalShortcuts: () => void;
|
||||
updateOverlayBounds: (geometry: WindowGeometry) => void;
|
||||
isVisibleOverlayVisible: () => boolean;
|
||||
isInvisibleOverlayVisible: () => boolean;
|
||||
updateVisibleOverlayVisibility: () => void;
|
||||
updateInvisibleOverlayVisibility: () => void;
|
||||
getOverlayWindows: () => BrowserWindow[];
|
||||
syncOverlayShortcuts: () => void;
|
||||
setWindowTracker: (tracker: BaseWindowTracker | null) => void;
|
||||
getResolvedConfig: () => { ankiConnect?: AnkiConnectConfig };
|
||||
getSubtitleTimingTracker: () => unknown | null;
|
||||
getMpvClient: () => { send?: (payload: { command: string[] }) => void } | null;
|
||||
getRuntimeOptionsManager: () => {
|
||||
getEffectiveAnkiConnectConfig: (config?: AnkiConnectConfig) => AnkiConnectConfig;
|
||||
} | null;
|
||||
setAnkiIntegration: (integration: unknown | null) => void;
|
||||
showDesktopNotification: (title: string, options: { body?: string; icon?: string }) => void;
|
||||
createFieldGroupingCallback: () => (
|
||||
data: KikuFieldGroupingRequestData,
|
||||
) => Promise<KikuFieldGroupingChoice>;
|
||||
}
|
||||
|
||||
export interface VisibleOverlayVisibilityDepsRuntimeOptions {
|
||||
getVisibleOverlayVisible: () => boolean;
|
||||
getMainWindow: () => BrowserWindow | null;
|
||||
getWindowTracker: () => BaseWindowTracker | null;
|
||||
getTrackerNotReadyWarningShown: () => boolean;
|
||||
setTrackerNotReadyWarningShown: (shown: boolean) => void;
|
||||
shouldBindVisibleOverlayToMpvSubVisibility: () => boolean;
|
||||
getPreviousSecondarySubVisibility: () => boolean | null;
|
||||
setPreviousSecondarySubVisibility: (value: boolean | null) => void;
|
||||
isMpvConnected: () => boolean;
|
||||
mpvSend: (payload: MpvCommandSender) => void;
|
||||
secondarySubVisibilityRequestId: number;
|
||||
updateOverlayBounds: (geometry: WindowGeometry) => void;
|
||||
ensureOverlayWindowLevel: (window: BrowserWindow) => void;
|
||||
enforceOverlayLayerOrder: () => void;
|
||||
syncOverlayShortcuts: () => void;
|
||||
}
|
||||
|
||||
export interface InvisibleOverlayVisibilityDepsRuntimeOptions {
|
||||
getInvisibleWindow: () => BrowserWindow | null;
|
||||
getVisibleOverlayVisible: () => boolean;
|
||||
getInvisibleOverlayVisible: () => boolean;
|
||||
getWindowTracker: () => BaseWindowTracker | null;
|
||||
updateOverlayBounds: (geometry: WindowGeometry) => void;
|
||||
ensureOverlayWindowLevel: (window: BrowserWindow) => void;
|
||||
enforceOverlayLayerOrder: () => void;
|
||||
syncOverlayShortcuts: () => void;
|
||||
}
|
||||
|
||||
export function createOverlayWindowRuntimeDepsService(
|
||||
options: OverlayWindowRuntimeDepsOptions,
|
||||
): Parameters<typeof createOverlayWindowService>[1] {
|
||||
return {
|
||||
isDev: options.isDev,
|
||||
overlayDebugVisualizationEnabled:
|
||||
options.getOverlayDebugVisualizationEnabled(),
|
||||
ensureOverlayWindowLevel: options.ensureOverlayWindowLevel,
|
||||
onRuntimeOptionsChanged: options.onRuntimeOptionsChanged,
|
||||
setOverlayDebugVisualizationEnabled:
|
||||
options.setOverlayDebugVisualizationEnabled,
|
||||
isOverlayVisible: (kind) =>
|
||||
kind === "visible"
|
||||
? options.getVisibleOverlayVisible()
|
||||
: options.getInvisibleOverlayVisible(),
|
||||
tryHandleOverlayShortcutLocalFallback:
|
||||
options.tryHandleOverlayShortcutLocalFallback,
|
||||
onWindowClosed: options.onWindowClosed,
|
||||
};
|
||||
}
|
||||
|
||||
export function createInitializeOverlayRuntimeDepsService(
|
||||
options: InitializeOverlayRuntimeDepsOptions,
|
||||
): Parameters<typeof initializeOverlayRuntimeService>[0] {
|
||||
return {
|
||||
backendOverride: options.backendOverride,
|
||||
getInitialInvisibleOverlayVisibility:
|
||||
options.getInitialInvisibleOverlayVisibility,
|
||||
createMainWindow: options.createMainWindow,
|
||||
createInvisibleWindow: options.createInvisibleWindow,
|
||||
registerGlobalShortcuts: options.registerGlobalShortcuts,
|
||||
updateOverlayBounds: options.updateOverlayBounds,
|
||||
isVisibleOverlayVisible: options.isVisibleOverlayVisible,
|
||||
isInvisibleOverlayVisible: options.isInvisibleOverlayVisible,
|
||||
updateVisibleOverlayVisibility: options.updateVisibleOverlayVisibility,
|
||||
updateInvisibleOverlayVisibility: options.updateInvisibleOverlayVisibility,
|
||||
getOverlayWindows: options.getOverlayWindows,
|
||||
syncOverlayShortcuts: options.syncOverlayShortcuts,
|
||||
setWindowTracker: options.setWindowTracker,
|
||||
getResolvedConfig: options.getResolvedConfig,
|
||||
getSubtitleTimingTracker: options.getSubtitleTimingTracker,
|
||||
getMpvClient: options.getMpvClient,
|
||||
getRuntimeOptionsManager: options.getRuntimeOptionsManager,
|
||||
setAnkiIntegration: options.setAnkiIntegration,
|
||||
showDesktopNotification: options.showDesktopNotification,
|
||||
createFieldGroupingCallback: options.createFieldGroupingCallback,
|
||||
};
|
||||
}
|
||||
|
||||
export function createVisibleOverlayVisibilityDepsRuntimeService(
|
||||
options: VisibleOverlayVisibilityDepsRuntimeOptions,
|
||||
): Parameters<typeof updateVisibleOverlayVisibilityService>[0] {
|
||||
return {
|
||||
visibleOverlayVisible: options.getVisibleOverlayVisible(),
|
||||
mainWindow: options.getMainWindow(),
|
||||
windowTracker: options.getWindowTracker(),
|
||||
trackerNotReadyWarningShown: options.getTrackerNotReadyWarningShown(),
|
||||
setTrackerNotReadyWarningShown: options.setTrackerNotReadyWarningShown,
|
||||
shouldBindVisibleOverlayToMpvSubVisibility:
|
||||
options.shouldBindVisibleOverlayToMpvSubVisibility(),
|
||||
previousSecondarySubVisibility: options.getPreviousSecondarySubVisibility(),
|
||||
setPreviousSecondarySubVisibility: options.setPreviousSecondarySubVisibility,
|
||||
mpvConnected: options.isMpvConnected(),
|
||||
mpvSend: options.mpvSend,
|
||||
secondarySubVisibilityRequestId: options.secondarySubVisibilityRequestId,
|
||||
updateOverlayBounds: options.updateOverlayBounds,
|
||||
ensureOverlayWindowLevel: options.ensureOverlayWindowLevel,
|
||||
enforceOverlayLayerOrder: options.enforceOverlayLayerOrder,
|
||||
syncOverlayShortcuts: options.syncOverlayShortcuts,
|
||||
};
|
||||
}
|
||||
|
||||
export function createInvisibleOverlayVisibilityDepsRuntimeService(
|
||||
options: InvisibleOverlayVisibilityDepsRuntimeOptions,
|
||||
): Parameters<typeof updateInvisibleOverlayVisibilityService>[0] {
|
||||
return {
|
||||
invisibleWindow: options.getInvisibleWindow(),
|
||||
visibleOverlayVisible: options.getVisibleOverlayVisible(),
|
||||
invisibleOverlayVisible: options.getInvisibleOverlayVisible(),
|
||||
windowTracker: options.getWindowTracker(),
|
||||
updateOverlayBounds: options.updateOverlayBounds,
|
||||
ensureOverlayWindowLevel: options.ensureOverlayWindowLevel,
|
||||
enforceOverlayLayerOrder: options.enforceOverlayLayerOrder,
|
||||
syncOverlayShortcuts: options.syncOverlayShortcuts,
|
||||
};
|
||||
}
|
||||
204
src/main.ts
204
src/main.ts
@@ -201,6 +201,12 @@ import { createOverlayVisibilityFacadeDepsRuntimeService } from "./core/services
|
||||
import { createMpvCommandIpcDepsRuntimeService } from "./core/services/mpv-command-ipc-deps-runtime-service";
|
||||
import { createRuntimeOptionsIpcDepsRuntimeService } from "./core/services/runtime-options-ipc-deps-runtime-service";
|
||||
import { createTokenizerDepsRuntimeService } from "./core/services/tokenizer-deps-runtime-service";
|
||||
import {
|
||||
createInitializeOverlayRuntimeDepsService,
|
||||
createInvisibleOverlayVisibilityDepsRuntimeService,
|
||||
createOverlayWindowRuntimeDepsService,
|
||||
createVisibleOverlayVisibilityDepsRuntimeService,
|
||||
} from "./core/services/overlay-runtime-deps-service";
|
||||
import { createRuntimeOptionsManagerRuntimeService } from "./core/services/runtime-options-manager-runtime-service";
|
||||
import { createAppLoggingRuntimeService } from "./core/services/app-logging-runtime-service";
|
||||
import {
|
||||
@@ -807,25 +813,28 @@ async function loadYomitanExtension(): Promise<Extension | null> {
|
||||
}
|
||||
|
||||
function createOverlayWindow(kind: "visible" | "invisible"): BrowserWindow {
|
||||
return createOverlayWindowService(kind, {
|
||||
isDev,
|
||||
overlayDebugVisualizationEnabled,
|
||||
ensureOverlayWindowLevel: (window) => ensureOverlayWindowLevel(window),
|
||||
onRuntimeOptionsChanged: () => broadcastRuntimeOptionsChanged(),
|
||||
setOverlayDebugVisualizationEnabled: (enabled) =>
|
||||
setOverlayDebugVisualizationEnabled(enabled),
|
||||
isOverlayVisible: (windowKind) =>
|
||||
windowKind === "visible" ? visibleOverlayVisible : invisibleOverlayVisible,
|
||||
tryHandleOverlayShortcutLocalFallback: (input) =>
|
||||
tryHandleOverlayShortcutLocalFallback(input),
|
||||
onWindowClosed: (windowKind) => {
|
||||
if (windowKind === "visible") {
|
||||
mainWindow = null;
|
||||
} else {
|
||||
invisibleWindow = null;
|
||||
}
|
||||
},
|
||||
});
|
||||
return createOverlayWindowService(
|
||||
kind,
|
||||
createOverlayWindowRuntimeDepsService({
|
||||
isDev,
|
||||
getOverlayDebugVisualizationEnabled: () => overlayDebugVisualizationEnabled,
|
||||
ensureOverlayWindowLevel: (window) => ensureOverlayWindowLevel(window),
|
||||
onRuntimeOptionsChanged: () => broadcastRuntimeOptionsChanged(),
|
||||
setOverlayDebugVisualizationEnabled: (enabled) =>
|
||||
setOverlayDebugVisualizationEnabled(enabled),
|
||||
getVisibleOverlayVisible: () => visibleOverlayVisible,
|
||||
getInvisibleOverlayVisible: () => invisibleOverlayVisible,
|
||||
tryHandleOverlayShortcutLocalFallback: (input) =>
|
||||
tryHandleOverlayShortcutLocalFallback(input),
|
||||
onWindowClosed: (windowKind) => {
|
||||
if (windowKind === "visible") {
|
||||
mainWindow = null;
|
||||
} else {
|
||||
invisibleWindow = null;
|
||||
}
|
||||
},
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
function createMainWindow(): BrowserWindow { mainWindow = createOverlayWindow("visible"); return mainWindow; }
|
||||
@@ -835,46 +844,49 @@ function initializeOverlayRuntime(): void {
|
||||
if (overlayRuntimeInitialized) {
|
||||
return;
|
||||
}
|
||||
const result = initializeOverlayRuntimeService({
|
||||
backendOverride,
|
||||
getInitialInvisibleOverlayVisibility: () => getInitialInvisibleOverlayVisibility(),
|
||||
createMainWindow: () => {
|
||||
createMainWindow();
|
||||
},
|
||||
createInvisibleWindow: () => {
|
||||
createInvisibleWindow();
|
||||
},
|
||||
registerGlobalShortcuts: () => {
|
||||
registerGlobalShortcuts();
|
||||
},
|
||||
updateOverlayBounds: (geometry) => {
|
||||
updateOverlayBounds(geometry);
|
||||
},
|
||||
isVisibleOverlayVisible: () => visibleOverlayVisible,
|
||||
isInvisibleOverlayVisible: () => invisibleOverlayVisible,
|
||||
updateVisibleOverlayVisibility: () => {
|
||||
updateVisibleOverlayVisibility();
|
||||
},
|
||||
updateInvisibleOverlayVisibility: () => {
|
||||
updateInvisibleOverlayVisibility();
|
||||
},
|
||||
getOverlayWindows: () => getOverlayWindows(),
|
||||
syncOverlayShortcuts: () => {
|
||||
syncOverlayShortcuts();
|
||||
},
|
||||
setWindowTracker: (tracker) => {
|
||||
windowTracker = tracker;
|
||||
},
|
||||
getResolvedConfig: () => getResolvedConfig(),
|
||||
getSubtitleTimingTracker: () => subtitleTimingTracker,
|
||||
getMpvClient: () => mpvClient,
|
||||
getRuntimeOptionsManager: () => runtimeOptionsManager,
|
||||
setAnkiIntegration: (integration) => {
|
||||
ankiIntegration = integration as AnkiIntegration | null;
|
||||
},
|
||||
showDesktopNotification,
|
||||
createFieldGroupingCallback: () => createFieldGroupingCallback(),
|
||||
});
|
||||
const result = initializeOverlayRuntimeService(
|
||||
createInitializeOverlayRuntimeDepsService({
|
||||
backendOverride,
|
||||
getInitialInvisibleOverlayVisibility: () =>
|
||||
getInitialInvisibleOverlayVisibility(),
|
||||
createMainWindow: () => {
|
||||
createMainWindow();
|
||||
},
|
||||
createInvisibleWindow: () => {
|
||||
createInvisibleWindow();
|
||||
},
|
||||
registerGlobalShortcuts: () => {
|
||||
registerGlobalShortcuts();
|
||||
},
|
||||
updateOverlayBounds: (geometry) => {
|
||||
updateOverlayBounds(geometry);
|
||||
},
|
||||
isVisibleOverlayVisible: () => visibleOverlayVisible,
|
||||
isInvisibleOverlayVisible: () => invisibleOverlayVisible,
|
||||
updateVisibleOverlayVisibility: () => {
|
||||
updateVisibleOverlayVisibility();
|
||||
},
|
||||
updateInvisibleOverlayVisibility: () => {
|
||||
updateInvisibleOverlayVisibility();
|
||||
},
|
||||
getOverlayWindows: () => getOverlayWindows(),
|
||||
syncOverlayShortcuts: () => {
|
||||
syncOverlayShortcuts();
|
||||
},
|
||||
setWindowTracker: (tracker) => {
|
||||
windowTracker = tracker;
|
||||
},
|
||||
getResolvedConfig: () => getResolvedConfig(),
|
||||
getSubtitleTimingTracker: () => subtitleTimingTracker,
|
||||
getMpvClient: () => mpvClient,
|
||||
getRuntimeOptionsManager: () => runtimeOptionsManager,
|
||||
setAnkiIntegration: (integration) => {
|
||||
ankiIntegration = integration as AnkiIntegration | null;
|
||||
},
|
||||
showDesktopNotification,
|
||||
createFieldGroupingCallback: () => createFieldGroupingCallback(),
|
||||
}),
|
||||
);
|
||||
invisibleOverlayVisible = result.invisibleOverlayVisible;
|
||||
overlayRuntimeInitialized = true;
|
||||
}
|
||||
@@ -1127,44 +1139,48 @@ function refreshOverlayShortcuts(): void {
|
||||
}
|
||||
|
||||
function updateVisibleOverlayVisibility(): void {
|
||||
updateVisibleOverlayVisibilityService({
|
||||
visibleOverlayVisible,
|
||||
mainWindow,
|
||||
windowTracker,
|
||||
trackerNotReadyWarningShown,
|
||||
setTrackerNotReadyWarningShown: (shown) => {
|
||||
trackerNotReadyWarningShown = shown;
|
||||
},
|
||||
shouldBindVisibleOverlayToMpvSubVisibility:
|
||||
shouldBindVisibleOverlayToMpvSubVisibility(),
|
||||
previousSecondarySubVisibility,
|
||||
setPreviousSecondarySubVisibility: (value) => {
|
||||
previousSecondarySubVisibility = value;
|
||||
},
|
||||
mpvConnected: Boolean(mpvClient && mpvClient.connected),
|
||||
mpvSend: (payload) => {
|
||||
if (!mpvClient) return;
|
||||
mpvClient.send(payload);
|
||||
},
|
||||
secondarySubVisibilityRequestId: MPV_REQUEST_ID_SECONDARY_SUB_VISIBILITY,
|
||||
updateOverlayBounds: (geometry) => updateOverlayBounds(geometry),
|
||||
ensureOverlayWindowLevel: (window) => ensureOverlayWindowLevel(window),
|
||||
enforceOverlayLayerOrder: () => enforceOverlayLayerOrder(),
|
||||
syncOverlayShortcuts: () => syncOverlayShortcuts(),
|
||||
});
|
||||
updateVisibleOverlayVisibilityService(
|
||||
createVisibleOverlayVisibilityDepsRuntimeService({
|
||||
getVisibleOverlayVisible: () => visibleOverlayVisible,
|
||||
getMainWindow: () => mainWindow,
|
||||
getWindowTracker: () => windowTracker,
|
||||
getTrackerNotReadyWarningShown: () => trackerNotReadyWarningShown,
|
||||
setTrackerNotReadyWarningShown: (shown) => {
|
||||
trackerNotReadyWarningShown = shown;
|
||||
},
|
||||
shouldBindVisibleOverlayToMpvSubVisibility: () =>
|
||||
shouldBindVisibleOverlayToMpvSubVisibility(),
|
||||
getPreviousSecondarySubVisibility: () => previousSecondarySubVisibility,
|
||||
setPreviousSecondarySubVisibility: (value) => {
|
||||
previousSecondarySubVisibility = value;
|
||||
},
|
||||
isMpvConnected: () => Boolean(mpvClient && mpvClient.connected),
|
||||
mpvSend: (payload) => {
|
||||
if (!mpvClient) return;
|
||||
mpvClient.send(payload);
|
||||
},
|
||||
secondarySubVisibilityRequestId: MPV_REQUEST_ID_SECONDARY_SUB_VISIBILITY,
|
||||
updateOverlayBounds: (geometry) => updateOverlayBounds(geometry),
|
||||
ensureOverlayWindowLevel: (window) => ensureOverlayWindowLevel(window),
|
||||
enforceOverlayLayerOrder: () => enforceOverlayLayerOrder(),
|
||||
syncOverlayShortcuts: () => syncOverlayShortcuts(),
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
function updateInvisibleOverlayVisibility(): void {
|
||||
updateInvisibleOverlayVisibilityService({
|
||||
invisibleWindow,
|
||||
visibleOverlayVisible,
|
||||
invisibleOverlayVisible,
|
||||
windowTracker,
|
||||
updateOverlayBounds: (geometry) => updateOverlayBounds(geometry),
|
||||
ensureOverlayWindowLevel: (window) => ensureOverlayWindowLevel(window),
|
||||
enforceOverlayLayerOrder: () => enforceOverlayLayerOrder(),
|
||||
syncOverlayShortcuts: () => syncOverlayShortcuts(),
|
||||
});
|
||||
updateInvisibleOverlayVisibilityService(
|
||||
createInvisibleOverlayVisibilityDepsRuntimeService({
|
||||
getInvisibleWindow: () => invisibleWindow,
|
||||
getVisibleOverlayVisible: () => visibleOverlayVisible,
|
||||
getInvisibleOverlayVisible: () => invisibleOverlayVisible,
|
||||
getWindowTracker: () => windowTracker,
|
||||
updateOverlayBounds: (geometry) => updateOverlayBounds(geometry),
|
||||
ensureOverlayWindowLevel: (window) => ensureOverlayWindowLevel(window),
|
||||
enforceOverlayLayerOrder: () => enforceOverlayLayerOrder(),
|
||||
syncOverlayShortcuts: () => syncOverlayShortcuts(),
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
function syncInvisibleOverlayMousePassthrough(): void {
|
||||
|
||||
Reference in New Issue
Block a user