From 70ca478a78bb83af38b4342a92a766901e1542e7 Mon Sep 17 00:00:00 2001
From: Maxim Devaev <mdevaev@gmail.com>
Date: Sun, 18 May 2025 00:39:10 +0300
Subject: [PATCH] web: fixed race for organize_hook

---
 web/kvm/index.html        | 2 +-
 web/kvm/window-stream.pug | 2 +-
 web/share/js/wm.js        | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/web/kvm/index.html b/web/kvm/index.html
index e2f6b263..5c964d39 100644
--- a/web/kvm/index.html
+++ b/web/kvm/index.html
@@ -982,7 +982,7 @@
     <div class="window" id="stream-ocr-window">
       <div class="hidden" id="stream-ocr-selection"></div>
     </div>
-    <div class="window window-resizable" id="stream-window" data-show-maximized>
+    <div class="window window-resizable" id="stream-window" data-show-maximized data-organize-hook>
       <div class="window-header" id="stream-window-header">
         <div class="window-grab">MJPEG</div>
         <div class="window-buttons">
diff --git a/web/kvm/window-stream.pug b/web/kvm/window-stream.pug
index 76ba0c49..51bbc32f 100644
--- a/web/kvm/window-stream.pug
+++ b/web/kvm/window-stream.pug
@@ -1,7 +1,7 @@
 .window#stream-ocr-window
 	.hidden#stream-ocr-selection
 
-.window.window-resizable#stream-window(data-show-maximized)
+.window.window-resizable#stream-window(data-show-maximized data-organize-hook)
 	.window-header#stream-window-header
 		.window-grab MJPEG
 		.window-buttons
diff --git a/web/share/js/wm.js b/web/share/js/wm.js
index 9c9578fe..6ddb25c3 100644
--- a/web/share/js/wm.js
+++ b/web/share/js/wm.js
@@ -564,7 +564,7 @@ function __WindowManager() {
 		let ah = el_win.__aspect_ratio_height;
 		let gw = view.right - view.left;
 		let gh = view.bottom - view.top;
-		if (el_win.organize_hook && aw && ah) {
+		if (aw && ah) {
 			// Умная машинерия только для aspect-ratio
 			if (aw / gw < ah / gh) {
 				el_win.style.width = "";
@@ -574,7 +574,10 @@ function __WindowManager() {
 				el_win.style.height = "";
 				el_win.style.width = gw + "px";
 			}
-		} else {
+		} else if (!el_win.hasAttribute("data-organize-hook")) {
+			// FIXME: Можно было бы проверять наличие organize_hook,
+			// но эвент от обзервера приходит раньше чем настроятся хуки.
+			// По идее это надо бы глобально исправить.
 			el_win.style.width = gw + "px";
 			el_win.style.height = gh + "px";
 		}