Bug Fixed on mouse over
This commit is contained in:
1 parent
bbbffe0e4a
commit
b85806f19b
4 files changed
+12
-24
No files matched your search
+1
-1
@@ -5,7 +5,7 @@ function drawScaleDisplay (label1, label2, label3, xExtraOffSet1, xExtraOffSet2,
|
||||
let fontSize3 = 10
|
||||
|
||||
const RED_LINE_HIGHT = 4
|
||||
const OPACITY = 1
|
||||
const OPACITY = 0.75
|
||||
|
||||
let params = {
|
||||
cornerRadius: 15,
|
||||
|
||||
+3
-7
@@ -93,6 +93,7 @@ function newRateScale () {
|
||||
visible = true
|
||||
} else {
|
||||
visible = false
|
||||
turnOnCounter = 0
|
||||
}
|
||||
}
|
||||
mouse = {
|
||||
@@ -132,7 +133,6 @@ function newRateScale () {
|
||||
}
|
||||
|
||||
function getContainer (point) {
|
||||
if (visible !== true) { return }
|
||||
if (thisObject.container.frame.isThisPointHere(point, true) === true) {
|
||||
return thisObject.container
|
||||
}
|
||||
@@ -230,12 +230,8 @@ function newRateScale () {
|
||||
let icon1 = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.payload.parentNode.type)
|
||||
let icon2 = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.type)
|
||||
|
||||
let backgroundColor
|
||||
if (visible === true) {
|
||||
backgroundColor = UI_COLOR.BLACK
|
||||
} else {
|
||||
backgroundColor = UI_COLOR.DARK
|
||||
}
|
||||
let backgroundColor = UI_COLOR.BLACK
|
||||
|
||||
drawScaleDisplay(label1, label2, label3, 0, 0, 0, icon1, icon2, thisObject.container, backgroundColor)
|
||||
}
|
||||
|
||||
|
||||
@@ -94,6 +94,7 @@ function newTimeFrameScale () {
|
||||
visible = true
|
||||
} else {
|
||||
visible = false
|
||||
turnOnCounter = 0
|
||||
}
|
||||
}
|
||||
mouse = {
|
||||
@@ -104,7 +105,7 @@ function newTimeFrameScale () {
|
||||
}
|
||||
}
|
||||
|
||||
function onMouseOver () {
|
||||
function onMouseOver (event) {
|
||||
isMouseOver = true
|
||||
event.containerId = thisObject.container.id
|
||||
thisObject.container.eventHandler.raiseEvent('onMouseOverScale', event)
|
||||
@@ -222,7 +223,6 @@ function newTimeFrameScale () {
|
||||
}
|
||||
|
||||
function getContainer (point) {
|
||||
if (visible !== true) { return }
|
||||
if (thisObject.container.frame.isThisPointHere(point, true) === true) {
|
||||
return thisObject.container
|
||||
}
|
||||
@@ -278,12 +278,8 @@ function newTimeFrameScale () {
|
||||
let icon1 = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.payload.parentNode.type)
|
||||
let icon2 = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.type)
|
||||
|
||||
let backgroundColor
|
||||
if (visible === true) {
|
||||
backgroundColor = UI_COLOR.BLACK
|
||||
} else {
|
||||
backgroundColor = UI_COLOR.DARK
|
||||
}
|
||||
let backgroundColor = UI_COLOR.BLACK
|
||||
|
||||
drawScaleDisplay(label1, label2, label3, 0, 0, 0, icon1, icon2, thisObject.container, backgroundColor)
|
||||
}
|
||||
}
|
||||
+4
-8
@@ -92,6 +92,7 @@ function newTimeScale () {
|
||||
visible = true
|
||||
} else {
|
||||
visible = false
|
||||
turnOnCounter = 0
|
||||
}
|
||||
}
|
||||
mouse = {
|
||||
@@ -102,7 +103,7 @@ function newTimeScale () {
|
||||
}
|
||||
}
|
||||
|
||||
function onMouseOver () {
|
||||
function onMouseOver (event) {
|
||||
isMouseOver = true
|
||||
event.containerId = thisObject.container.id
|
||||
thisObject.container.eventHandler.raiseEvent('onMouseOverScale', event)
|
||||
@@ -132,7 +133,6 @@ function newTimeScale () {
|
||||
}
|
||||
|
||||
function getContainer (point) {
|
||||
if (visible !== true) { return }
|
||||
if (thisObject.container.frame.isThisPointHere(point, true) === true) {
|
||||
return thisObject.container
|
||||
}
|
||||
@@ -212,12 +212,8 @@ function newTimeScale () {
|
||||
let icon1 = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.payload.parentNode.type)
|
||||
let icon2 = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.type)
|
||||
|
||||
let backgroundColor
|
||||
if (visible === true) {
|
||||
backgroundColor = UI_COLOR.BLACK
|
||||
} else {
|
||||
backgroundColor = UI_COLOR.DARK
|
||||
}
|
||||
let backgroundColor = UI_COLOR.BLACK
|
||||
|
||||
drawScaleDisplay(label1, label2, label3, 0, 0, 0, icon1, icon2, thisObject.container, backgroundColor)
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user