Skip to content

Commit

Permalink
Version 252:
Browse files Browse the repository at this point in the history
* Fixed a bug introduced in version 251 where touchscreen zooming could cause unwanted panning when adding touch points.
  • Loading branch information
bp2008 committed Aug 26, 2023
1 parent 50f723a commit 9019f53
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion ui3.htm
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
};
</script>
<script type="text/javascript">
var ui_version = "251";
var ui_version = "252";
var bi_version = "%%VERSION%%";
var appPath_raw = "%%VIRTDIR%%";
var local_bi_session = "%%SESSION%%";
Expand Down
21 changes: 11 additions & 10 deletions ui3/ui3.js
Original file line number Diff line number Diff line change
Expand Up @@ -6569,22 +6569,23 @@ function RelativePTZ()
function Precon_3dPos(e)
{
if (!videoPlayer.Loading().image.isLive)
return;
return false;

currentCam = cameraListLoader.GetCameraWithId(videoPlayer.Loading().image.id);
videoPlayer.DoThingIfImgClickEligible(e, function (camData)
if ((e.which === 2 || enabled3dPositioning || (e.getModifierState && e.getModifierState("Control"))))
{
currentCam = camData;
});
mouseCoordFixer.fix(e); // <- Doing this at the wrong time creates havoc when doing two-finger zooming on touchscreens.
currentCam = cameraListLoader.GetCameraWithId(videoPlayer.Loading().image.id);
videoPlayer.DoThingIfImgClickEligible(e, function (camData)
{
currentCam = camData;
});

if (!currentCam || !currentCam.ptz || !currentCam.ptzdirect)
return;
return (e.which === 2 || enabled3dPositioning ||
(e.getModifierState && e.getModifierState("Control")));
return !!(currentCam && currentCam.ptz && currentCam.ptzdirect);
}
return false;
}
function ImageArea_MouseDown(e)
{
mouseCoordFixer.fix(e);
if (pos3dDragging)
{
pos3dDragging = false;
Expand Down

0 comments on commit 9019f53

Please sign in to comment.