Skip to content

solving wrong coordination issue with IOS driver #119

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

Open
alizelzele wants to merge 1 commit into
base: master
Choose a base branch
from
Open

solving wrong coordination issue with IOS driver #119

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
8 changes: 8 additions & 0 deletions src/main/java/ru/yandex/qatools/ashot/AShot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package ru.yandex.qatools.ashot;

import org.openqa.selenium.By;
import org.openqa.selenium.Dimension;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import ru.yandex.qatools.ashot.coordinates.*;
Expand Down Expand Up @@ -111,6 +112,13 @@ public AShot shootingStrategy(ShootingStrategy strategy) {
public Screenshot takeScreenshot(WebDriver driver, Collection<WebElement> elements) {
Set<Coords> elementCoords = coordsProvider.ofElements(driver, elements);
BufferedImage shot = shootingStrategy.getScreenshot(driver, elementCoords);
final Dimension windowSize = driver.manage().window().getSize();
if (shot.getWidth() != windowSize.width || shot.getHeight() != windowSize.height) {
for (Coords coord : elementCoords) {
coord.scale((float) shot.getHeight() / windowSize.height,
(float) shot.getWidth() / windowSize.width);
}
}
Screenshot screenshot = cropper.crop(shot, shootingStrategy.prepareCoords(elementCoords));
Set<Coords> ignoredAreas = compileIgnoredAreas(driver, intersectingWith(screenshot));
screenshot.setIgnoredAreas(shootingStrategy.prepareCoords(ignoredAreas));
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/ru/yandex/qatools/ashot/coordinates/Coords.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ public void reduceBy(int pixels) {
}
}

public void scale(float xFactor, float yFactor) {
this.x *= xFactor;
this.y *= yFactor;
this.width *= xFactor;
this.height *= yFactor;
}

@SuppressWarnings("NullableProblems")
@Override
Expand Down