Merge pull request #5343 from Ylianst/fix-multidisplay-multimonitor

fix multidisplay multimonitor
This commit is contained in:
Ylian Saint-Hilaire 2023-09-15 17:37:57 -07:00 committed by GitHub
commit 2bb65110f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8709,6 +8709,7 @@
Q('Desk').addEventListener('mousewheel', function (e) { return dmousewheel(e); }); Q('Desk').addEventListener('mousewheel', function (e) { return dmousewheel(e); });
} }
desktopNode = currentNode; desktopNode = currentNode;
if(desktop){ desktop.m.onDisplayinfo = deskDisplayInfo; deskDisplayInfo(desktop.m, desktop.m.displays, desktop.m.selectedDisplay); }
updateDesktopButtons(); updateDesktopButtons();
deskAdjust(); deskAdjust();
updateMetadata(desktop, 'deskmetadata'); updateMetadata(desktop, 'deskmetadata');
@ -8955,7 +8956,7 @@
if (desktopsettings.swapmouse) { desktop.m.SwapMouse = desktopsettings.swapmouse; } if (desktopsettings.swapmouse) { desktop.m.SwapMouse = desktopsettings.swapmouse; }
if (desktopsettings.rmw) { desktop.m.ReverseMouseWheel = desktopsettings.rmw; } if (desktopsettings.rmw) { desktop.m.ReverseMouseWheel = desktopsettings.rmw; }
if (desktopsettings.remotekeymap == true) { desktop.m.remoteKeyMap = desktopsettings.remotekeymap; } if (desktopsettings.remotekeymap == true) { desktop.m.remoteKeyMap = desktopsettings.remotekeymap; }
desktop.m.onDisplayinfo = deskDisplayInfo; //desktop.m.onDisplayinfo = deskDisplayInfo;
desktop.m.onScreenSizeChange = deskAdjust; desktop.m.onScreenSizeChange = deskAdjust;
desktop.Start(desktopNode._id); desktop.Start(desktopNode._id);
desktop.latency.callback = function(ms) { console.log('latency', ms); updateSessionTime(); }; desktop.latency.callback = function(ms) { console.log('latency', ms); updateSessionTime(); };
@ -18339,4 +18340,4 @@
</script> </script>
</body> </body>
</html> </html>