Skip to content

fix(ios): apply getActualRectangle #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2019
Merged

fix(ios): apply getActualRectangle #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/appium-driver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ export class AppiumDriver {
logInfo("Current version of appium doesn't support appium settings!");
}

await DeviceManager.applyDeviceAdditionsSettings(driver, args, appiumCapsFromConfig);
await DeviceManager.applyDeviceAdditionsSettings(driver, args, sessionInfoDetails);

hasStarted = true;
} catch (error) {
Expand Down
8 changes: 4 additions & 4 deletions lib/device-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ export class DeviceManager implements IDeviceManager {
args.device.config = { "density": args.device.deviceScreenDensity || args.device.config.density, "offsetPixels": +sessionInfoDetails.statBarHeight || args.device.config.offsetPixels };
} else {
args.device.apiLevel = sessionInfoDetails.platformVersion;
args.device.deviceScreenDensity = sessionInfoDetails.pixelRatio;
args.device.deviceScreenDensity = sessionInfoDetails.pixelRatio || args.device.config.density;
const offsetPixels = +sessionInfoDetails.viewportRect.top - +sessionInfoDetails.statBarHeight;
args.device.config = { "density": sessionInfoDetails.pixelRatio || args.device.config.density, "offsetPixels": isNumber(offsetPixels) ? offsetPixels : args.device.config.offsetPixels };
}
Expand Down Expand Up @@ -272,11 +272,11 @@ export class DeviceManager implements IDeviceManager {
// }

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

if (density) {
Expand Down
2 changes: 1 addition & 1 deletion lib/ui-element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ export class UIElement {
*/
public async getActualRectangle() {
const actRect = await this.getRectangle();
const density = this._args.device.config.density;
const density = this._args.device.deviceScreenDensity;
if (this._args.isIOS) {
if (density) {
actRect.x *= density;
Expand Down