Skip to content

[sailfish-components-webview] updated DPR calculating mechanism JB#57542 #153

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[sailfish-components-webview] updated DPR calculating mechanism JB#57542 #153

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
37 changes: 22 additions & 15 deletions lib/webenginesettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,24 +127,31 @@ void SailfishOS::WebEngineSettings::initialize()

Silica::Theme *silicaTheme = Silica::Theme::instance();

qreal pixelRatio = SAILFISH_WEBENGINE_DEFAULT_PIXEL_RATIO * silicaTheme->pixelRatio();
// Round to nearest even rounding factor
pixelRatio = qRound(pixelRatio / 0.5) * 0.5;

int screenWidth = QGuiApplication::primaryScreen()->size().width();

// Do not floor the pixel ratio if the pixel ratio less than 2.0 (1.5 is minimum).
if (pixelRatio >= 2.0 && !testScreenDimensions(pixelRatio)) {
qreal tempPixelRatio = qFloor(pixelRatio);
if (testScreenDimensions(tempPixelRatio)) {
pixelRatio = tempPixelRatio;
}
} else if (screenWidth >= 1080) {
pixelRatio = qRound(pixelRatio);
qreal pixelRatio;
//DPI ranges and DPRs are taken from Android (lpdi, mdpi, hdpi etc.)
qreal dpi = QGuiApplication::primaryScreen()->physicalDotsPerInch();
if(dpi < 140) {
pixelRatio = 0.75;
} else if(dpi < 200) {
pixelRatio = 1.0;
} else if(dpi < 280) {
pixelRatio = 1.5;
} else if(dpi < 400) {
pixelRatio = 2.0;
} else if(dpi < 560) {
pixelRatio = 3.0;
} else {
pixelRatio = 4.0;
}


//reduce pR until screen dimensions can be divivded by it, but not lower than 1.0.
while (!testScreenDimensions(pixelRatio) && pixelRatio > 1.0) {
pixelRatio -= 0.5;
}

engineSettings->setPixelRatio(pixelRatio);

int screenWidth = QGuiApplication::primaryScreen()->size().width();
int tileSize = screenWidth;

// With bigger than FullHD screen fill with two tiles in row (portrait).
Expand Down