diff --git a/Canvas.js b/Canvas.js index 6d36cecc2..0190e8448 100644 --- a/Canvas.js +++ b/Canvas.js @@ -230,6 +230,8 @@ function newCanvas () { if (INFO_LOG === true) { logger.write('[INFO] initializeBrowserCanvas -> Entering function.') } browserCanvasContext = browserCanvas.getContext('2d') + // browserCanvasContext.font = 'italic small-caps bold 12px Saira' + browserCanvasContext.font = 'Saira' viewPort.initialize() } catch (err) { @@ -679,4 +681,3 @@ function newCanvas () { } } } - diff --git a/FloatingSpace/Note.js b/FloatingSpace/Note.js index f1c5b8125..87fe4fe15 100644 --- a/FloatingSpace/Note.js +++ b/FloatingSpace/Note.js @@ -214,7 +214,7 @@ function newNote () { if (label !== undefined) { if (SIZE_PERCENTAGE > 0.9) { - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + ' Saira' let xOffset = label.length / 2 * fontSize * FONT_ASPECT_RATIO let yOffset = (TITLE_BAR_HEIGHT - fontSize) / 2 + 2 @@ -292,7 +292,7 @@ function newNote () { y: startingPosition.y + (i + 1) * (fontSize * FONT_ASPECT_RATIO + 10) } - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + ' Saira' browserCanvasContext.fillStyle = 'rgba(60, 60, 60, ' + ALPHA + ')' browserCanvasContext.fillText(labelRow, labelPoint.x, labelPoint.y) } diff --git a/FloatingSpace/ProfileBall.js b/FloatingSpace/ProfileBall.js index 23f60d563..8675a3003 100644 --- a/FloatingSpace/ProfileBall.js +++ b/FloatingSpace/ProfileBall.js @@ -278,7 +278,7 @@ function newProfileBall () { let labelPoint let fontSize = pFloatingObject.currentFontSize - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + ' Saira' let label @@ -290,7 +290,7 @@ function newProfileBall () { y: pFloatingObject.currentPosition.y - pFloatingObject.currentImageSize / 2 - fontSize * FONT_ASPECT_RATIO - 10 } - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + ' Saira' browserCanvasContext.fillStyle = pFloatingObject.labelStrokeStyle browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y) } @@ -303,7 +303,7 @@ function newProfileBall () { y: pFloatingObject.currentPosition.y + pFloatingObject.currentImageSize / 2 + fontSize * FONT_ASPECT_RATIO + 15 } - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + ' Saira' browserCanvasContext.fillStyle = pFloatingObject.labelStrokeStyle browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y) } diff --git a/Frame.js b/Frame.js index 062c55a3d..7ae3e4f29 100644 --- a/Frame.js +++ b/Frame.js @@ -375,7 +375,7 @@ function newFrame () { let labelPoint let fontSize = 10 - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + ' Saira' let label = frame.containerName diff --git a/Panels/TimeControlPanel.js b/Panels/TimeControlPanel.js index e854b10bb..82b53eac5 100644 --- a/Panels/TimeControlPanel.js +++ b/Panels/TimeControlPanel.js @@ -120,7 +120,7 @@ function newTimeControlPanel () { labelPoint = thisObject.container.frame.frameThisPoint(labelPoint) - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + ' Saira' browserCanvasContext.fillStyle = 'rgba(60, 60, 60, 0.50)' browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y) @@ -137,7 +137,7 @@ function newTimeControlPanel () { labelPoint = thisObject.container.frame.frameThisPoint(labelPoint) - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + ' Saira' browserCanvasContext.fillStyle = 'rgba(60, 60, 60, 0.50)' browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y) @@ -156,7 +156,7 @@ function newTimeControlPanel () { labelPoint = thisObject.container.frame.frameThisPoint(labelPoint) - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + ' Saira' browserCanvasContext.fillStyle = 'rgba(60, 60, 60, 0.50)' browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y) } diff --git a/ProductCard.js b/ProductCard.js index 7ef21a7f0..05bfcb62f 100644 --- a/ProductCard.js +++ b/ProductCard.js @@ -587,7 +587,7 @@ let labelPoint let fontSize = 10 - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + ' Saira' let label @@ -602,7 +602,7 @@ labelPoint = thisObject.container.frame.frameThisPoint(labelPoint) - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + ' Saira' browserCanvasContext.fillStyle = 'rgba(60, 60, 60, 0.50)' browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y) @@ -617,7 +617,7 @@ labelPoint = thisObject.container.frame.frameThisPoint(labelPoint) - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + ' Saira' browserCanvasContext.fillStyle = 'rgba(60, 60, 60, 0.50)' browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y) @@ -639,7 +639,7 @@ labelPoint = thisObject.container.frame.frameThisPoint(labelPoint) - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + ' Saira' browserCanvasContext.fillStyle = 'rgba(60, 60, 60, 0.50)' browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y) diff --git a/SplashScreen.js b/SplashScreen.js index 4a6ab3d9a..78ea7d85a 100644 --- a/SplashScreen.js +++ b/SplashScreen.js @@ -133,6 +133,7 @@ function newSplashScreen () { } browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY + browserCanvasContext.font = 'Saira' browserCanvasContext.fillStyle = 'rgba(0, 0, 0, ' + opacity + ')' browserCanvasContext.fillText(title, titlePoint.x, titlePoint.y) }