mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Use delta when scale factor is above 2 and odd

Browse source
This commit is contained in:
Kevin Sawicki 2016-09-08 16:24:11 -07:00
parent 59a49f6f96
commit 68c67b64c5
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
spec/api-browser-window-spec.js
View file

@ -1355,7 +1355,7 @@ describe('browser-window module', function () {
}) })
const assertBoundsEqual = (actual, expect) => { const assertBoundsEqual = (actual, expect) => {
if (isIntegerScaleFactor()) { if (!isScaleFactorRounding()) {
assert.deepEqual(expect, actual) assert.deepEqual(expect, actual)
} else if (Array.isArray(actual)) { } else if (Array.isArray(actual)) {
assertWithinDelta(actual[0], expect[0], 1, 'x') assertWithinDelta(actual[0], expect[0], 1, 'x')
@ -1373,7 +1373,12 @@ const assertWithinDelta = (actual, expect, delta, label) => {
assert.ok(result <= delta, `${label} value of ${expect} was not within ${delta} of ${actual}`) assert.ok(result <= delta, `${label} value of ${expect} was not within ${delta} of ${actual}`)
} }
const isIntegerScaleFactor = () => { // Is the display's scale factor possibly causing rounding of pixel coordinate
// values?
const isScaleFactorRounding = () => {
const {scaleFactor} = screen.getPrimaryDisplay() const {scaleFactor} = screen.getPrimaryDisplay()
return Math.round(scaleFactor) === scaleFactor // Return true if scale factor is non-integer value
if (Math.round(scaleFactor) === scaleFactor) return true
// Return true if scale factor is odd number above 2
return scaleFactor > 2 && scaleFactor % 2 === 1
} }