wallpaper-engine-dsh 1.0.0 → 1.0.2

package/README.md

@@ -10,7 +10,7 @@ A DSH bundle that turns your local **Wallpaper Engine** library into the live ba
 
 **Legibility on any wallpaper.** Text stays readable by construction, not by luck. The veil always opposes the text colour — black in the dark theme, white in the light theme — so neither a pitch-black nor a pure-white wallpaper can swallow the UI. On top of that, a Smart veil samples the wallpaper's brightness every few seconds and automatically strengthens the veil when a scene drifts too bright (or too dark) for the current theme; it also strengthens the border contrast and the glass frosting on the same evidence. Dropdowns, menus, and dialogs sit on DSH's opaque surfaces and are never affected.
 
-**Manual framing.** Pick a base layout — Cover, Contain, Stretch, or Original — then frame the shot yourself. **Adjust** opens the live wallpaper fullscreen: drag to pan, scroll to zoom (0.25×–4×), Esc or Done to finish. The framing persists per selection, and **Reset crop** restores the default in one click.
+**Manual framing.** Pick a base layout — Cover, Contain, Stretch, or Original — then frame the shot yourself. **Adjust** opens the live wallpaper fullscreen: scroll to zoom in (up to 4×), drag to pan within the zoomed framing — the crop is clamped so the image always fills the screen with no exposed edges. Esc or Done finishes, the framing persists per selection, and **Reset crop** restores the default in one click.
 
 **Four live sliders.** Wallpaper blur, Scrim, Borders, and Glass — every change lands instantly and persists. Wallpaper blur uses clipped overscan, so blurring never warps or shifts the image; a whisper of dither noise keeps smooth gradients band-free; and at zero blur the media bypasses the filter pipeline entirely for bit-exact pixels.
 

package/README.zh.md

@@ -10,7 +10,7 @@
 
 **任意壁纸都可读。** 文字可读靠的是结构保障,不是运气。遮罩颜色始终与文字颜色相对——深色主题压黑、浅色主题提亮——无论纯黑还是纯白的壁纸都吞不掉界面。在此基础上,"智能可视"每隔几秒采样一次壁纸亮度,画面偏离当前主题的舒适区时自动加强遮罩。下拉菜单、弹窗等浮层坐在 DSH 原生的不透明表面上,从不受影响。
 
-**手动取景。** 先选基础排布——填充、适应、拉伸、原始——然后自己构图:点「调整画面」把壁纸全屏展开,拖动平移、滚轮缩放(0.25×–4×),Esc 或「完成」退出。取景随选择持久保存,「重置裁剪」一键还原。
+**手动取景。** 先选基础排布——填充、适应、拉伸、原始——然后自己构图:点「调整画面」把壁纸全屏展开,滚轮放大(最高 4×)、拖动在放大的画面内平移——裁剪范围经过钳制,画面永远铺满屏幕、不露边。Esc 或「完成」退出,取景随选择持久保存,「重置裁剪」一键还原。
 
 **四个实时滑杆。** 壁纸模糊、暗化、边框、玻璃——每一步调节即时生效并持久保存。壁纸模糊采用裁边式超采样,模糊不变形、不偏移;叠加微量抖动噪声消除渐变色带;模糊归零时媒体完全绕开滤镜管线,像素逐位精确。
 

package/lib/client.js

@@ -271,7 +271,9 @@ window.__ModuleLoader__.load({
 		      autoScrim: o.autoScrim !== false,
 		      lang: o.lang === "zh" || o.lang === "en" ? o.lang : "auto",
 		      fit: FIT_MODES.indexOf(o.fit) >= 0 ? o.fit : DEFAULTS.fit,
-		      zoom: clampNum(o.zoom, 0.25, 4, DEFAULTS.zoom),
+		      zoom: Math.max(1, clampNum(o.zoom, 0.25, 4, DEFAULTS.zoom)),
+		      // Pan may have been persisted with a larger headroom than the zoom
+		      // allows (older builds let zoom go below 1) — clampCrop re-seats it.
 		      offsetX: clampNum(o.offsetX, -200, 200, DEFAULTS.offsetX),
 		      offsetY: clampNum(o.offsetY, -200, 200, DEFAULTS.offsetY),
 		    };
@@ -298,6 +300,9 @@ window.__ModuleLoader__.load({
 		  inventory: { installDir: null, wallpapers: [], total: 0, portableCount: 0, playlists: [], error: null },
 		  loaded: false,
 		};
+		// Older builds allowed zoom < 1 and unclamped pans — re-seat any persisted
+		// crop into the gap-free envelope before the first render.
+		clampCrop();
 
 		const listeners = new Set();
 		function emit() { for (const fn of [...listeners]) fn(); }
@@ -724,6 +729,18 @@ window.__ModuleLoader__.load({
 		// The layer normally sits at z-index -2 behind the entire app, so it can
 		// never receive pointer events. Adjust mode moves the LIVE layer node into a
 		// topmost transparent overlay — the user edits the real thing, WYSIWYG.
+		//
+		// Crop geometry invariants: the media box covers the viewport exactly at
+		// zoom 1; zooming creates headroom, panning spends it. Zoom floors at 1
+		// and pan is clamped to ±(zoom-1)/2·100 %, so a gap-free fullscreen image
+		// is guaranteed at every setting.
+		function clampCrop() {
+		  selection.zoom = Math.round(Math.min(4, Math.max(1, selection.zoom)) * 100) / 100;
+		  const pan = (selection.zoom - 1) * 50;
+		  selection.offsetX = Math.min(pan, Math.max(-pan, selection.offsetX));
+		  selection.offsetY = Math.min(pan, Math.max(-pan, selection.offsetY));
+		}
+
 		let adjustOverlay = null;
 		let adjustCleanup = null;
 
@@ -780,11 +797,9 @@ window.__ModuleLoader__.load({
 		    // content tracks the cursor 1:1 at any blur setting.
 		    const w = (overlay.clientWidth || 1) + 2 * selection.wallpaperBlur;
 		    const h = (overlay.clientHeight || 1) + 2 * selection.wallpaperBlur;
-		    // True clamping (clampNum is a validate-or-fallback for persisted data).
-		    selection.offsetX = Math.min(200, Math.max(-200,
-		      selection.offsetX + ((e.clientX - drag.x) / w) * 100));
-		    selection.offsetY = Math.min(200, Math.max(-200,
-		      selection.offsetY + ((e.clientY - drag.y) / h) * 100));
+		    selection.offsetX += ((e.clientX - drag.x) / w) * 100;
+		    selection.offsetY += ((e.clientY - drag.y) / h) * 100;
+		    clampCrop(); // gap-free guarantee: pan never outruns the zoom headroom
 		    drag = { x: e.clientX, y: e.clientY };
 		    applyEffects();
 		  };
@@ -802,12 +817,12 @@ window.__ModuleLoader__.load({
 		  };
 		  const onWheel = (e) => {
 		    if (typeof e.preventDefault === "function") e.preventDefault();
-		    // True clamping to [0.25, 4] — clampNum is a validate-or-fallback for
-		    // persisted data and would REJECT an out-of-range zoom instead of
-		    // pinning it to the boundary.
-		    const next = Math.min(4, Math.max(0.25,
-		      selection.zoom * Math.exp(-(e.deltaY || 0) * 0.0012)));
-		    selection.zoom = Math.round(next * 100) / 100;
+		    // Crop semantics: zoom IN only (1–4×). Zooming below cover would float a
+		    // shrunken box in empty space — that is not a crop. Tightening zoom also
+		    // re-clamps the pan into the new headroom, so zooming back to 1 pulls
+		    // the framing home instead of leaving edge gaps.
+		    selection.zoom *= Math.exp(-(e.deltaY || 0) * 0.0012);
+		    clampCrop();
 		    applyEffects();
 		    persistSelection();
 		  };
@@ -1830,6 +1845,12 @@ window.__ModuleLoader__.load({
 		const inject = ["slots"];
 
 		function apply(ctx) {
+		  // A plugin UPDATE re-applies this module WITHOUT re-evaluating it: the old
+		  // fiber's cleanup has already set `disposed = true`, which would make the
+		  // new fiber's loadInventory return forever (blank picker, no wallpaper).
+		  // Every apply starts a fresh lifecycle.
+		  disposed = false;
+
 		  // 0. Language: follow the shell's locale service when present, and react
 		  //    to its change events. Everything is optional — without the service
 		  //    the browser language decides, and the manual override always wins.

package/lib/index.js

@@ -228,10 +228,11 @@ export function createRouteRegistrar(webServer, opts = {}) {
       res.setHeader('X-Content-Type-Options', 'nosniff');
       if (mime === 'text/html' || mime === 'image/svg+xml') {
         // Script-capable documents (web wallpapers, SVG previews) get a
-        // sandboxed CSP even on direct top-level navigation, so they can
-        // never execute against the DSH origin. The client's iframe sandbox
-        // already covers embedding; this is the server-side backstop.
-        res.setHeader('Content-Security-Policy', 'sandbox');
+        // sandbox CSP even on direct top-level navigation, so they can
+        // never execute against the DSH origin. `allow-scripts` keeps the
+        // wallpaper itself functional — inside the sandbox the origin is
+        // opaque either way, so the isolation goal is unchanged.
+        res.setHeader('Content-Security-Policy', 'sandbox allow-scripts');
       }
 
       const range = core.parseRangeHeader(req.headers.range, st.size);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wallpaper-engine-dsh",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Wallpaper Engine library as the DSH web GUI background — video/web/still wallpapers, rotation lists, search, resource monitor, bilingual UI.",
   "type": "module",
   "main": "lib/index.js",