Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 77d5109

Browse files
Merge branch 'master' into svetoslavtsenov/gestures
2 parents 22470a3 + ebe92e0 commit 77d5109

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

‎CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
<a name="6.1.2"></a>
2+
## [6.1.2](https://github.com/NativeScript/nativescript-dev-appium/compare/6.1.0...6.1.2) (2019年10月04日)
3+
4+
5+
### Bug Fixes
6+
7+
* **ios-13:** remove statusbar height from viewportRect ([c1a993c](https://github.com/NativeScript/nativescript-dev-appium/commit/c1a993c))
8+
9+
10+
111
<a name="6.1.0"></a>
212
# [6.1.0](https://github.com/NativeScript/nativescript-dev-appium/compare/6.0.0...6.1.0) (2019年10月03日)
313

‎lib/appium-driver.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ export class AppiumDriver {
272272
logInfo("Current version of appium doesn't support appium settings!");
273273
}
274274

275-
await DeviceManager.applyDeviceAdditionsSettings(driver, args, appiumCapsFromConfig);
275+
await DeviceManager.applyDeviceAdditionsSettings(driver, args, sessionInfoDetails);
276276

277277
hasStarted = true;
278278
} catch (error) {
@@ -322,7 +322,8 @@ export class AppiumDriver {
322322
const matches = devicesInfos.filter(d => sessionInfoDetails.deviceName.includes(d.deviceType));
323323
if (matches && matches.length > 0) {
324324
const deviceType = matches[matches.length - 1];
325-
args.device.viewportRect.y += deviceType.actionBarHeight * deviceType.density;
325+
args.device.viewportRect.y += deviceType.actionBarHeight;
326+
args.device.viewportRect.height -= deviceType.actionBarHeight;
326327
}
327328
} catch (error) { }
328329
}

‎lib/device-manager.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ export class DeviceManager implements IDeviceManager {
202202
args.device.config = { "density": args.device.deviceScreenDensity || args.device.config.density, "offsetPixels": +sessionInfoDetails.statBarHeight || args.device.config.offsetPixels };
203203
} else {
204204
args.device.apiLevel = sessionInfoDetails.platformVersion;
205-
args.device.deviceScreenDensity = sessionInfoDetails.pixelRatio;
205+
args.device.deviceScreenDensity = sessionInfoDetails.pixelRatio||args.device.config.density;
206206
const offsetPixels = +sessionInfoDetails.viewportRect.top - +sessionInfoDetails.statBarHeight;
207207
args.device.config = { "density": sessionInfoDetails.pixelRatio || args.device.config.density, "offsetPixels": isNumber(offsetPixels) ? offsetPixels : args.device.config.offsetPixels };
208208
}
@@ -272,11 +272,11 @@ export class DeviceManager implements IDeviceManager {
272272
// }
273273

274274
public static async applyDeviceAdditionsSettings(driver, args: INsCapabilities, sessionInfo: any) {
275-
if ((!args.device.viewportRect || !args.device.viewportRect.x) && (!args.device.config || !args.device.config.offsetPixels)) {
275+
if ((!args.device.viewportRect || !args.device.viewportRect.x) && (!args.device.config || !isNumber(args.device.config.offsetPixels))) {
276276
args.device.config = {};
277277
let density: number;
278-
if (sessionInfo && sessionInfo.length >= 1) {
279-
density = sessionInfo[1].deviceScreenDensity ? sessionInfo[1].deviceScreenDensity/100 : undefined;
278+
if (sessionInfo && Object.getOwnPropertyNames(sessionInfo).length >= 1) {
279+
density = sessionInfo.pixelRatio ? sessionInfo.pixelRatio : undefined;
280280
}
281281

282282
if (density) {

‎lib/ui-element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ export class UIElement {
268268
*/
269269
public async getActualRectangle() {
270270
const actRect = await this.getRectangle();
271-
const density = this._args.device.config.density;
271+
const density = this._args.device.deviceScreenDensity;
272272
if (this._args.isIOS) {
273273
if (density) {
274274
actRect.x *= density;

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /