Update to ignore mouseRelease events if mousePress event handles by tool

This commit is contained in:
Ryan Huffman 2014-12-30 11:21:50 -08:00
parent eaad95c949
commit a474243f08

View file

@ -494,8 +494,10 @@ var mouseHasMovedSincePress = false;
function mousePressEvent(event) { function mousePressEvent(event) {
mouseHasMovedSincePress = false; mouseHasMovedSincePress = false;
mouseCapturedByTool = false;
if (toolBar.mousePressEvent(event) || progressDialog.mousePressEvent(event)) { if (toolBar.mousePressEvent(event) || progressDialog.mousePressEvent(event) || gridTool.mousePressEvent(event)) {
mouseCapturedByTool = true;
return; return;
} }
if (isActive) { if (isActive) {
@ -519,6 +521,7 @@ function mousePressEvent(event) {
} }
var highlightedEntityID = { isKnownID: false }; var highlightedEntityID = { isKnownID: false };
var mouseCapturedByTool = false;
function mouseMoveEvent(event) { function mouseMoveEvent(event) {
mouseHasMovedSincePress = true; mouseHasMovedSincePress = true;
@ -563,6 +566,9 @@ function mouseReleaseEvent(event) {
if (isActive && selectionManager.hasSelection()) { if (isActive && selectionManager.hasSelection()) {
tooltip.show(false); tooltip.show(false);
} }
if (mouseCapturedByTool) {
return;
}
cameraManager.mouseReleaseEvent(event); cameraManager.mouseReleaseEvent(event);