Skip to content

Commit 8f80bac

Browse files
author
Denys Zaiats
committed
[master] - made retina scale factor customizable
1 parent 82de68e commit 8f80bac

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

src/main/java/net/itarray/automotion/internal/ResponsiveUIValidatorBase.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
import java.io.*;
1212
import java.nio.charset.StandardCharsets;
1313

14-
import static net.itarray.automotion.tools.environment.EnvironmentFactory.*;
15-
import static net.itarray.automotion.tools.general.SystemHelper.isRetinaDisplay;
1614
import static net.itarray.automotion.validation.Constants.*;
1715

1816
public abstract class ResponsiveUIValidatorBase {
@@ -111,16 +109,16 @@ private SimpleTransform getTransform() {
111109
}
112110

113111
private double getScaleFactor() {
114-
double factor;
115-
if (getDriver().isAppiumContext()) {
116-
factor = getReport().getRetinaScaleFactor();
117-
} else {
118-
factor = zoomFactor;
119-
if (isRetinaDisplay() && isChrome()) {
120-
factor = factor * 2;
121-
}
122-
}
123-
return factor;
112+
// double factor;
113+
// if (getDriver().isAppiumContext()) {
114+
// factor = getReport().getRetinaScaleFactor();
115+
// } else {
116+
// factor = zoomFactor;
117+
// if (isChrome()) {
118+
// factor = factor * 2;
119+
// }
120+
// }
121+
return getReport().getRetinaScaleFactor();
124122
}
125123

126124
private int getYOffset() {

src/main/java/net/itarray/automotion/tools/general/SystemHelper.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package net.itarray.automotion.tools.general;
22

3-
import javafx.stage.Screen;
4-
53
import java.awt.*;
64
import java.io.File;
75
import java.lang.reflect.Field;
@@ -30,17 +28,21 @@ public static boolean isRetinaDisplay() {
3028
}
3129
}
3230
} catch (Exception e) {
33-
isRetina = getDisplayScaleFactor() > 140;
31+
try {
32+
isRetina = getDisplayScaleFactor() > 140;
33+
} catch (Exception e1) {e1.printStackTrace();}
3434
}
3535
} catch (Exception e) {
36-
isRetina = getDisplayScaleFactor() > 140;
36+
try {
37+
isRetina = getDisplayScaleFactor() > 140;
38+
} catch (Exception e1) {e1.printStackTrace();}
3739
}
3840
return isRetina;
3941
}
4042

4143
private static double getDisplayScaleFactor() {
42-
double screenHeight = Toolkit.getDefaultToolkit().getScreenSize().getHeight();
43-
double screenWidth = Toolkit.getDefaultToolkit().getScreenSize().getWidth();
44+
//double screenHeight = Toolkit.getDefaultToolkit().getScreenSize().getHeight();
45+
//double screenWidth = Toolkit.getDefaultToolkit().getScreenSize().getWidth();
4446
int screenResolution = Toolkit.getDefaultToolkit().getScreenResolution();
4547

4648
return screenResolution;

src/main/java/net/itarray/automotion/validation/ResponsiveUIValidator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public void setTopBarMobileOffset(boolean state, double offset) {
154154
}
155155

156156
/**
157-
* Set retina scale factor. Current usage only for native mobile
157+
* Set retina scale factor. By default is 1
158158
*
159159
* @param factor
160160
*/
@@ -163,7 +163,7 @@ public void setRetinaScaleFactor(double factor) {
163163
}
164164

165165
/**
166-
* Get retina scale factor. Current usage only for native mobile
166+
* Get retina scale factor. By default is 1
167167
*
168168
*/
169169
public double getRetinaScaleFactor() {

0 commit comments

Comments
 (0)