Doni/ModelHandle
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need to handle mouse button in click detector.

Browse Source
This commit is contained in:
kovacsv 2021-12-12 21:24:08 +01:00
parent a003210666
commit bcf0c588fe
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/viewer/navigation.js
View File

@ -192,13 +192,11 @@ OV.ClickDetector = class
constructor () constructor ()
{ {
this.isClick = false; this.isClick = false;
this.button = 0;
} }
Down (ev) Down ()
{ {
this.isClick = true; this.isClick = true;
this.button = ev.which;
} }
Move () Move ()
@ -206,17 +204,9 @@ OV.ClickDetector = class
this.isClick = false; this.isClick = false;
} }
Up (ev)
{
if (this.isClick && ev.which !== this.button) {
this.isClick = false;
}
}
Leave () Leave ()
{ {
this.isClick = false; this.isClick = false;
this.button = 0;
} }
IsClick () IsClick ()
@ -392,7 +382,7 @@ OV.Navigation = class
ev.preventDefault (); ev.preventDefault ();
this.mouse.Down (this.canvas, ev); this.mouse.Down (this.canvas, ev);
this.clickDetector.Down (ev); this.clickDetector.Down ();
} }
OnMouseMove (ev) OnMouseMove (ev)
@ -442,7 +432,7 @@ OV.Navigation = class
OnMouseUp (ev) OnMouseUp (ev)
{ {
this.mouse.Up (this.canvas, ev); this.mouse.Up (this.canvas, ev);
this.clickDetector.Up (ev);
if (this.clickDetector.IsClick ()) { if (this.clickDetector.IsClick ()) {
let mouseCoords = this.mouse.GetPosition (); let mouseCoords = this.mouse.GetPosition ();
this.Click (ev.which, mouseCoords); this.Click (ev.which, mouseCoords);
@ -512,7 +502,6 @@ OV.Navigation = class
{ {
ev.preventDefault (); ev.preventDefault ();
this.clickDetector.Up (ev);
if (this.clickDetector.IsClick ()) { if (this.clickDetector.IsClick ()) {
this.Context (ev.clientX, ev.clientY); this.Context (ev.clientX, ev.clientY);
} }