nodebb-plugin-pdf-secure2 1.4.5 → 1.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-pdf-secure2",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "Secure PDF viewer plugin for NodeBB - prevents downloading, enables canvas-only rendering with Premium group support",
   "main": "library.js",
   "repository": {

package/static/lib/main.js

@@ -33,6 +33,8 @@
 		document.documentElement.webkitRequestFullscreen
 	);
 	var simulatedFullscreenIframe = null;
+	var windowedModeIframe = null;
+	var windowedBackdrop = null;
 	var savedBodyOverflow = '';
 
 	// Loading queue - only load one PDF at a time
@@ -103,6 +105,9 @@
 			});
 			if (!sourceIframe) return;
 
+			// Exit windowed mode first if active
+			if (windowedModeIframe) exitWindowedMode();
+
 			if (fullscreenApiSupported) {
 				// Native fullscreen path
 				var fsEl = document.fullscreenElement || document.webkitFullscreenElement;
@@ -123,6 +128,28 @@
 			}
 		}
 
+		// Windowed mode toggle request from iframe viewer
+		if (event.data && event.data.type === 'pdf-secure-windowed-toggle') {
+			var sourceIframe = document.querySelector('.pdf-secure-iframe');
+			document.querySelectorAll('.pdf-secure-iframe').forEach(function (f) {
+				if (f.contentWindow === event.source) sourceIframe = f;
+			});
+			if (!sourceIframe) return;
+
+			if (windowedModeIframe) {
+				exitWindowedMode();
+			} else {
+				// Exit fullscreen/simulated fullscreen first if active
+				var fsEl = document.fullscreenElement || document.webkitFullscreenElement;
+				if (fsEl) {
+					if (document.exitFullscreen) document.exitFullscreen();
+					else if (document.webkitExitFullscreen) document.webkitExitFullscreen();
+				}
+				if (simulatedFullscreenIframe) exitSimulatedFullscreen();
+				enterWindowedMode(sourceIframe);
+			}
+		}
+
 		// Fullscreen state query from iframe
 		if (event.data && event.data.type === 'pdf-secure-fullscreen-query') {
 			var fsActive = !!(document.fullscreenElement || document.webkitFullscreenElement) ||
@@ -270,6 +297,90 @@
 		}
 	}
 
+	// Enter windowed overlay mode (large overlay without hiding browser chrome/tabs)
+	function enterWindowedMode(iframe) {
+		if (windowedModeIframe) return;
+		windowedModeIframe = iframe;
+
+		// Save original styles
+		iframe._savedWindowedStyle = {
+			position: iframe.style.position,
+			top: iframe.style.top,
+			left: iframe.style.left,
+			width: iframe.style.width,
+			height: iframe.style.height,
+			zIndex: iframe.style.zIndex,
+			borderRadius: iframe.style.borderRadius,
+			boxShadow: iframe.style.boxShadow
+		};
+
+		// Create backdrop
+		windowedBackdrop = document.createElement('div');
+		windowedBackdrop.style.cssText = 'position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.6);z-index:2147483646;transition:opacity 0.2s;';
+		windowedBackdrop.onclick = function () { exitWindowedMode(); };
+		document.body.appendChild(windowedBackdrop);
+
+		// Position iframe as overlay with margins (browser tabs stay visible)
+		iframe.style.position = 'fixed';
+		iframe.style.top = '24px';
+		iframe.style.left = '24px';
+		iframe.style.width = 'calc(100vw - 48px)';
+		iframe.style.height = 'calc(100vh - 48px)';
+		iframe.style.zIndex = '2147483647';
+		iframe.style.borderRadius = '12px';
+		iframe.style.boxShadow = '0 8px 48px rgba(0,0,0,0.5)';
+
+		// Lock body scroll
+		savedBodyOverflow = document.body.style.overflow;
+		document.body.style.overflow = 'hidden';
+
+		// Notify iframe
+		if (iframe.contentWindow) {
+			iframe.contentWindow.postMessage({
+				type: 'pdf-secure-windowed-state',
+				isWindowed: true
+			}, window.location.origin);
+		}
+	}
+
+	// Exit windowed overlay mode
+	function exitWindowedMode() {
+		if (!windowedModeIframe) return;
+		var iframe = windowedModeIframe;
+		windowedModeIframe = null;
+
+		// Restore original styles
+		if (iframe._savedWindowedStyle) {
+			iframe.style.position = iframe._savedWindowedStyle.position;
+			iframe.style.top = iframe._savedWindowedStyle.top;
+			iframe.style.left = iframe._savedWindowedStyle.left;
+			iframe.style.width = iframe._savedWindowedStyle.width;
+			iframe.style.height = iframe._savedWindowedStyle.height;
+			iframe.style.zIndex = iframe._savedWindowedStyle.zIndex;
+			iframe.style.borderRadius = iframe._savedWindowedStyle.borderRadius;
+			iframe.style.boxShadow = iframe._savedWindowedStyle.boxShadow;
+			delete iframe._savedWindowedStyle;
+		}
+
+		// Remove backdrop
+		if (windowedBackdrop && windowedBackdrop.parentNode) {
+			windowedBackdrop.remove();
+			windowedBackdrop = null;
+		}
+
+		// Restore body scroll
+		document.body.style.overflow = savedBodyOverflow;
+		savedBodyOverflow = '';
+
+		// Notify iframe
+		if (iframe.contentWindow) {
+			iframe.contentWindow.postMessage({
+				type: 'pdf-secure-windowed-state',
+				isWindowed: false
+			}, window.location.origin);
+		}
+	}
+
 	async function processQueue() {
 		if (isLoading || loadQueue.length === 0) return;
 
@@ -302,8 +413,9 @@
 			currentResolver = null;
 			// Clear decrypted PDF buffer cache on navigation
 			pdfBufferCache.clear();
-			// Exit simulated fullscreen on SPA navigation
+			// Exit simulated fullscreen / windowed mode on SPA navigation
 			exitSimulatedFullscreen();
+			exitWindowedMode();
 			interceptPdfLinks();
 		});
 	} catch (err) {

package/static/viewer-app.js

@@ -687,12 +687,14 @@
 
     const dropdownBackdrop = document.getElementById('dropdownBackdrop');
     const overflowDropdown = document.getElementById('overflowDropdown');
+    const fullscreenDropdown = document.getElementById('fullscreenDropdown');
 
     function closeAllDropdowns() {
         highlightDropdown.classList.remove('visible');
         drawDropdown.classList.remove('visible');
         shapesDropdown.classList.remove('visible');
         overflowDropdown.classList.remove('visible');
+        fullscreenDropdown.classList.remove('visible');
         dropdownBackdrop.classList.remove('visible');
     }
 
@@ -726,6 +728,11 @@
     document.getElementById('drawArrow').onclick = (e) => toggleDropdown(drawDropdown, e);
     document.getElementById('shapesArrow').onclick = (e) => toggleDropdown(shapesDropdown, e);
 
+    // Fullscreen dropdown toggle
+    document.getElementById('fullscreenArrow').onclick = (e) => toggleDropdown(fullscreenDropdown, e);
+    fullscreenDropdown.addEventListener('click', (e) => e.stopPropagation());
+    fullscreenDropdown.addEventListener('pointerup', (e) => e.stopPropagation());
+
     // Overflow menu toggle
     document.getElementById('overflowBtn').onclick = (e) => toggleDropdown(overflowDropdown, e);
     overflowDropdown.addEventListener('click', (e) => e.stopPropagation());
@@ -762,9 +769,27 @@
         closeAllDropdowns();
     });
     attachOverflowAction('overflowFullscreen', () => {
+        if (isWindowed) toggleWindowed();
+        toggleFullscreen();
+        closeAllDropdowns();
+    });
+    attachOverflowAction('overflowWindowed', () => {
+        if (isFullscreen) toggleFullscreen();
+        toggleWindowed();
+        closeAllDropdowns();
+    });
+
+    // Fullscreen dropdown options
+    attachOverflowAction('fullscreenOptionFull', () => {
+        if (isWindowed) toggleWindowed();
         toggleFullscreen();
         closeAllDropdowns();
     });
+    attachOverflowAction('fullscreenOptionWindowed', () => {
+        if (isFullscreen) toggleFullscreen();
+        toggleWindowed();
+        closeAllDropdowns();
+    });
 
     // Close dropdowns when clicking outside
     document.addEventListener('click', (e) => {
@@ -2487,7 +2512,7 @@
         const isLiteMode = _cfg && _cfg.isLite;
 
         // Fullscreen shortcut (always allowed)
-        if (key === 'f') { toggleFullscreen(); e.preventDefault(); }
+        if (key === 'f') { if (isWindowed) toggleWindowed(); else toggleFullscreen(); e.preventDefault(); }
 
         // Tool shortcuts (blocked in Lite mode)
         if (!isLiteMode) {
@@ -2577,9 +2602,11 @@
             return;
         }
 
-        // Escape to deselect tool
+        // Escape to deselect tool / exit windowed mode
         if (key === 'escape') {
-            if (currentTool) {
+            if (isWindowed) {
+                toggleWindowed();
+            } else if (currentTool) {
                 setTool(currentTool); // Toggle off
             }
             closeAllDropdowns();
@@ -2669,8 +2696,9 @@
     // ==========================================
 
 
-    // Fullscreen state (tracks both native and simulated fullscreen)
+    // Fullscreen & Windowed state (tracks native, simulated fullscreen, and windowed overlay)
     let isFullscreen = false;
+    let isWindowed = false;
 
     // Fullscreen toggle function — delegates to parent iframe handler via postMessage
     function toggleFullscreen() {
@@ -2687,23 +2715,41 @@
         }
     }
 
+    // Windowed mode toggle — delegates to parent
+    function toggleWindowed() {
+        if (window.self !== window.top) {
+            window.parent.postMessage({ type: 'pdf-secure-windowed-toggle' }, window.location.origin);
+        }
+    }
+
     // Update fullscreen button icon
     function updateFullscreenIcon() {
         const icon = document.getElementById('fullscreenIcon');
         const btn = document.getElementById('fullscreenBtn');
+        const exitPath = '<path d="M5 16h3v3h2v-5H5v2zm3-8H5v2h5V5H8v3zm6 11h2v-3h3v-2h-5v5zm2-11V5h-2v5h5V8h-3z"/>';
+        const enterPath = '<path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"/>';
+        const windowedPath = '<path d="M19 4H5c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 14H5V8h14v12z"/>';
         if (isFullscreen) {
-            icon.innerHTML = '<path d="M5 16h3v3h2v-5H5v2zm3-8H5v2h5V5H8v3zm6 11h2v-3h3v-2h-5v5zm2-11V5h-2v5h5V8h-3z"/>';
+            icon.innerHTML = exitPath;
+            btn.classList.add('active');
+        } else if (isWindowed) {
+            icon.innerHTML = windowedPath;
             btn.classList.add('active');
         } else {
-            icon.innerHTML = '<path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"/>';
+            icon.innerHTML = enterPath;
             btn.classList.remove('active');
         }
+        // Highlight active option in dropdown
+        const optFull = document.getElementById('fullscreenOptionFull');
+        const optWindowed = document.getElementById('fullscreenOptionWindowed');
+        if (optFull) optFull.classList.toggle('active', isFullscreen);
+        if (optWindowed) optWindowed.classList.toggle('active', isWindowed);
     }
 
     // Apply fullscreen CSS class and touch restrictions
     function applyFullscreenTouchRestrictions() {
-        document.body.classList.toggle('viewer-fullscreen', isFullscreen);
-        if (isFullscreen) {
+        document.body.classList.toggle('viewer-fullscreen', isFullscreen || isWindowed);
+        if (isFullscreen || isWindowed) {
             document.documentElement.style.touchAction = 'pan-y pinch-zoom';
             document.documentElement.style.overscrollBehavior = 'none';
         } else {
@@ -2712,13 +2758,18 @@
         }
     }
 
-    // Listen for fullscreen state from parent (simulated fullscreen)
+    // Listen for fullscreen/windowed state from parent (iframe mode)
     window.addEventListener('message', (event) => {
         if (event.data && event.data.type === 'pdf-secure-fullscreen-state') {
             isFullscreen = event.data.isFullscreen;
             updateFullscreenIcon();
             applyFullscreenTouchRestrictions();
         }
+        if (event.data && event.data.type === 'pdf-secure-windowed-state') {
+            isWindowed = event.data.isWindowed;
+            updateFullscreenIcon();
+            applyFullscreenTouchRestrictions();
+        }
     });
 
     // Local fullscreen events (standalone mode)
@@ -2728,7 +2779,11 @@
         applyFullscreenTouchRestrictions();
     });
 
-    document.getElementById('fullscreenBtn').onclick = () => toggleFullscreen();
+    // Fullscreen button click: toggle current active mode, or fullscreen by default
+    document.getElementById('fullscreenBtn').onclick = () => {
+        if (isWindowed) toggleWindowed();
+        else toggleFullscreen();
+    };
 
 
     // Mouse wheel / touchpad pinch zoom with Ctrl (clamped 0.5x-5x)

package/static/viewer.html

@@ -757,11 +757,24 @@
         .chatMsg .tableWrap {
             overflow-x: auto;
             margin: 6px 0;
+            -webkit-overflow-scrolling: touch;
+            position: relative;
+        }
+        .chatMsg .tableWrap.scrollable::after {
+            content: '';
+            position: absolute;
+            top: 0;
+            right: 0;
+            bottom: 0;
+            width: 24px;
+            background: linear-gradient(to right, transparent, rgba(0,0,0,0.4));
+            pointer-events: none;
         }
         .chatMsg table {
-            width: 100%;
             border-collapse: collapse;
             font-size: 12px;
+            min-width: 100%;
+            width: max-content;
         }
         .chatMsg th, .chatMsg td {
             border: 1px solid rgba(255,255,255,0.15);
@@ -771,6 +784,7 @@
         .chatMsg th {
             background: rgba(255,255,255,0.08);
             font-weight: 600;
+            white-space: nowrap;
         }
         .chatMsg tbody tr:nth-child(even) {
             background: rgba(255,255,255,0.03);
@@ -2742,12 +2756,33 @@
                 </svg>
             </button>
 
-            <!-- Fullscreen Toggle -->
-            <button class="toolbarBtn" id="fullscreenBtn" data-tooltip="Tam Ekran (F)">
-                <svg viewBox="0 0 24 24" id="fullscreenIcon">
-                    <path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z" />
-                </svg>
-            </button>
+            <!-- Fullscreen Toggle with Dropdown -->
+            <div class="toolbarBtnWithDropdown" id="fullscreenWrapper">
+                <button class="toolbarBtn" id="fullscreenBtn" data-tooltip="Tam Ekran (F)">
+                    <svg viewBox="0 0 24 24" id="fullscreenIcon">
+                        <path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z" />
+                    </svg>
+                </button>
+                <button class="dropdownArrow" id="fullscreenArrow">
+                    <svg viewBox="0 0 24 24">
+                        <path d="M7 10l5 5 5-5z" />
+                    </svg>
+                </button>
+                <div class="toolDropdown" id="fullscreenDropdown">
+                    <button class="overflowItem" id="fullscreenOptionFull">
+                        <svg viewBox="0 0 24 24">
+                            <path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z" />
+                        </svg>
+                        <span>Tam Ekran</span>
+                    </button>
+                    <button class="overflowItem" id="fullscreenOptionWindowed">
+                        <svg viewBox="0 0 24 24">
+                            <path d="M19 4H5c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 14H5V8h14v12z" />
+                        </svg>
+                        <span>Pencereli Mod</span>
+                    </button>
+                </div>
+            </div>
 
             <!-- AI Chat Toggle -->
             <button class="toolbarBtn" id="chatBtn" data-tooltip="PDF Chat (C)" style="display:none;">
@@ -3060,6 +3095,12 @@
                         </svg>
                         <span>Tam Ekran</span>
                     </button>
+                    <button class="overflowItem" id="overflowWindowed">
+                        <svg viewBox="0 0 24 24">
+                            <path d="M19 4H5c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 14H5V8h14v12z" />
+                        </svg>
+                        <span>Pencereli Mod</span>
+                    </button>
                 </div>
             </div>
         </div>
@@ -4219,6 +4260,14 @@
                 // Truncate excessively long AI responses
                 if (text.length > 10000) text = text.slice(0, 10000) + '…';
 
+                // Fix multi-line inline math: join $...$ that span line breaks
+                // e.g. "$V_o\n= V_i$" → "$V_o = V_i$"
+                text = text.replace(/\$([^$]*?\n[^$]*?)\$/g, function (match, inner) {
+                    // Only join if the inner content is short (likely math, not prose)
+                    if (inner.length > 80) return match;
+                    return '$' + inner.replace(/\n/g, ' ') + '$';
+                });
+
                 var frag = document.createDocumentFragment();
 
                 // Split into code blocks, LaTeX blocks ($$...$$), and normal text
@@ -4492,15 +4541,19 @@
             }
 
             // Render LaTeX math expression (inline or block)
+            // Tracks pending elements to re-render once KaTeX loads
+            var pendingMathElements = [];
             function renderMath(latex, displayMode) {
-                if (typeof katex === 'undefined') {
-                    // KaTeX not loaded, show raw LaTeX
-                    var fallback = document.createElement('code');
-                    fallback.textContent = (displayMode ? '$$' : '$') + latex + (displayMode ? '$$' : '$');
-                    return fallback;
-                }
                 var container = document.createElement('span');
                 container.className = displayMode ? 'katex-block' : 'katex-inline';
+                if (typeof katex === 'undefined') {
+                    // KaTeX not loaded yet — show placeholder, queue for re-render
+                    container.textContent = (displayMode ? '$$' : '$') + latex + (displayMode ? '$$' : '$');
+                    container.dataset.latex = latex;
+                    container.dataset.displayMode = displayMode ? '1' : '0';
+                    pendingMathElements.push(container);
+                    return container;
+                }
                 try {
                     katex.render(latex, container, { displayMode: displayMode, throwOnError: false });
                 } catch (e) {
@@ -4508,6 +4561,27 @@
                 }
                 return container;
             }
+            // Re-render pending math elements once KaTeX loads
+            function flushPendingMath() {
+                if (typeof katex === 'undefined' || pendingMathElements.length === 0) return;
+                pendingMathElements.forEach(function (el) {
+                    if (!el.dataset.latex) return;
+                    try {
+                        var dm = el.dataset.displayMode === '1';
+                        katex.render(el.dataset.latex, el, { displayMode: dm, throwOnError: false });
+                        delete el.dataset.latex;
+                        delete el.dataset.displayMode;
+                    } catch (e) { /* keep fallback text */ }
+                });
+                pendingMathElements = [];
+            }
+            // Check periodically if KaTeX has loaded (for deferred loading)
+            var katexCheckInterval = setInterval(function () {
+                if (typeof katex !== 'undefined') {
+                    clearInterval(katexCheckInterval);
+                    flushPendingMath();
+                }
+            }, 500);
 
             function tokenizeInline(line) {
                 var nodes = [];
@@ -5195,6 +5269,7 @@
 
             const dropdownBackdrop = document.getElementById('dropdownBackdrop');
             const overflowDropdown = document.getElementById('overflowDropdown');
+            const fullscreenDropdown = document.getElementById('fullscreenDropdown');
 
             // Swipe-to-dismiss controller (declared before closeAllDropdowns which references it)
             let swipeAbortController = null;
@@ -5206,7 +5281,7 @@
                 // Clean up swipe listeners
                 if (swipeAbortController) { swipeAbortController.abort(); swipeAbortController = null; }
                 // Reset inline styles and move dropdowns back to original parents
-                [highlightDropdown, drawDropdown, shapesDropdown, overflowDropdown].forEach(dd => {
+                [highlightDropdown, drawDropdown, shapesDropdown, overflowDropdown, fullscreenDropdown].forEach(dd => {
                     dd.style.transform = '';
                     dd.style.transition = '';
                     dd.style.position = '';
@@ -5223,6 +5298,7 @@
                 drawDropdown.classList.remove('visible');
                 shapesDropdown.classList.remove('visible');
                 overflowDropdown.classList.remove('visible');
+                fullscreenDropdown.classList.remove('visible');
                 dropdownBackdrop.classList.remove('visible');
             }
 
@@ -5313,6 +5389,11 @@
             document.getElementById('drawArrow').onclick = (e) => toggleDropdown(drawDropdown, e);
             document.getElementById('shapesArrow').onclick = (e) => toggleDropdown(shapesDropdown, e);
 
+            // Fullscreen dropdown toggle
+            document.getElementById('fullscreenArrow').onclick = (e) => toggleDropdown(fullscreenDropdown, e);
+            fullscreenDropdown.addEventListener('click', (e) => e.stopPropagation());
+            fullscreenDropdown.addEventListener('pointerup', (e) => e.stopPropagation());
+
             // Overflow menu toggle
             document.getElementById('overflowBtn').onclick = (e) => toggleDropdown(overflowDropdown, e);
             overflowDropdown.addEventListener('click', (e) => e.stopPropagation());
@@ -5351,9 +5432,27 @@
                 closeAllDropdowns();
             });
             attachOverflowAction('overflowFullscreen', () => {
+                if (isWindowed) toggleWindowed();
                 toggleFullscreen();
                 closeAllDropdowns();
             });
+            attachOverflowAction('overflowWindowed', () => {
+                if (isFullscreen) toggleFullscreen();
+                toggleWindowed();
+                closeAllDropdowns();
+            });
+
+            // Fullscreen dropdown options
+            attachOverflowAction('fullscreenOptionFull', () => {
+                if (isWindowed) toggleWindowed(); // exit windowed first
+                toggleFullscreen();
+                closeAllDropdowns();
+            });
+            attachOverflowAction('fullscreenOptionWindowed', () => {
+                if (isFullscreen) toggleFullscreen(); // exit fullscreen first
+                toggleWindowed();
+                closeAllDropdowns();
+            });
 
             // Close dropdowns when clicking outside
             document.addEventListener('click', (e) => {
@@ -7180,7 +7279,7 @@
                 if (key === 't') { setTool('text'); e.preventDefault(); }
                 if (key === 'r') { setTool('shape'); e.preventDefault(); }
                 if (key === 'v') { setTool('select'); e.preventDefault(); }
-                if (key === 'f') { toggleFullscreen(); e.preventDefault(); }
+                if (key === 'f') { if (isWindowed) toggleWindowed(); else toggleFullscreen(); e.preventDefault(); }
 
                 // Delete selected annotation(s)
                 if ((key === 'delete' || key === 'backspace') && (selectedAnnotation || multiSelectedAnnotations.length > 0)) {
@@ -7271,9 +7370,11 @@
                     return;
                 }
 
-                // Escape to deselect tool
+                // Escape to deselect tool / exit windowed mode
                 if (key === 'escape') {
-                    if (currentTool) {
+                    if (isWindowed) {
+                        toggleWindowed();
+                    } else if (currentTool) {
                         setTool(currentTool); // Toggle off
                     }
                     closeAllDropdowns();
@@ -7362,8 +7463,9 @@
             // ERGONOMIC FEATURES
             // ==========================================
 
-            // Fullscreen: track state (parent-managed when in iframe)
+            // Fullscreen & Windowed: track state (parent-managed when in iframe)
             let isFullscreen = false;
+            let isWindowed = false;
             const inIframe = window.self !== window.top;
 
             function toggleFullscreen() {
@@ -7385,6 +7487,12 @@
                 }
             }
 
+            function toggleWindowed() {
+                if (inIframe) {
+                    window.parent.postMessage({ type: 'pdf-secure-windowed-toggle' }, window.location.origin);
+                }
+            }
+
             // Update fullscreen button icon based on state
             function updateFullscreenIcon() {
                 const icon = document.getElementById('fullscreenIcon');
@@ -7392,6 +7500,7 @@
                 const bottomBtn = document.getElementById('bottomFullscreenBtn');
                 const exitPath = '<path d="M5 16h3v3h2v-5H5v2zm3-8H5v2h5V5H8v3zm6 11h2v-3h3v-2h-5v5zm2-11V5h-2v5h5V8h-3z"/>';
                 const enterPath = '<path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"/>';
+                const windowedPath = '<path d="M19 4H5c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 14H5V8h14v12z"/>';
                 if (isFullscreen) {
                     icon.innerHTML = exitPath;
                     btn.classList.add('active');
@@ -7399,6 +7508,13 @@
                         bottomBtn.querySelector('svg').innerHTML = exitPath;
                         bottomBtn.classList.add('active');
                     }
+                } else if (isWindowed) {
+                    icon.innerHTML = windowedPath;
+                    btn.classList.add('active');
+                    if (bottomBtn) {
+                        bottomBtn.querySelector('svg').innerHTML = windowedPath;
+                        bottomBtn.classList.add('active');
+                    }
                 } else {
                     icon.innerHTML = enterPath;
                     btn.classList.remove('active');
@@ -7407,12 +7523,17 @@
                         bottomBtn.classList.remove('active');
                     }
                 }
+                // Highlight active option in dropdown
+                const optFull = document.getElementById('fullscreenOptionFull');
+                const optWindowed = document.getElementById('fullscreenOptionWindowed');
+                if (optFull) optFull.classList.toggle('active', isFullscreen);
+                if (optWindowed) optWindowed.classList.toggle('active', isWindowed);
             }
 
             // Apply touch restrictions when entering/exiting fullscreen
             function applyFullscreenTouchRestrictions() {
-                document.body.classList.toggle('viewer-fullscreen', isFullscreen);
-                if (isFullscreen) {
+                document.body.classList.toggle('viewer-fullscreen', isFullscreen || isWindowed);
+                if (isFullscreen || isWindowed) {
                     document.documentElement.style.touchAction = 'pan-y pinch-zoom';
                     document.documentElement.style.overscrollBehavior = 'none';
                 } else {
@@ -7421,13 +7542,18 @@
                 }
             }
 
-            // Listen for fullscreen state from parent (iframe mode)
+            // Listen for fullscreen/windowed state from parent (iframe mode)
             window.addEventListener('message', (event) => {
                 if (event.data && event.data.type === 'pdf-secure-fullscreen-state') {
                     isFullscreen = event.data.isFullscreen;
                     updateFullscreenIcon();
                     applyFullscreenTouchRestrictions();
                 }
+                if (event.data && event.data.type === 'pdf-secure-windowed-state') {
+                    isWindowed = event.data.isWindowed;
+                    updateFullscreenIcon();
+                    applyFullscreenTouchRestrictions();
+                }
             });
 
             // Local fullscreen events (standalone mode)
@@ -7442,9 +7568,15 @@
                 applyFullscreenTouchRestrictions();
             });
 
-            // Fullscreen button click (top toolbar + bottom toolbar)
-            document.getElementById('fullscreenBtn').onclick = () => toggleFullscreen();
-            document.getElementById('bottomFullscreenBtn').onclick = () => toggleFullscreen();
+            // Fullscreen button click: toggle current active mode, or fullscreen by default
+            document.getElementById('fullscreenBtn').onclick = () => {
+                if (isWindowed) toggleWindowed();
+                else toggleFullscreen();
+            };
+            document.getElementById('bottomFullscreenBtn').onclick = () => {
+                if (isWindowed) toggleWindowed();
+                else toggleFullscreen();
+            };