Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-11 01:57:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1352773 - Take into account DefaultScaleOverride in Screen::GetDefaultCSSScaleFactor. r=kanru

Browse Source 
MozReview-Commit-ID: EJidy1NH3DX

--HG--
extra : rebase_source : d095c493de0acdd12cebc61b47d406a9547601ed
This commit is contained in:
Masatoshi Kimura 2017-04-05 22:11:34 +09:00
parent 32ef5678c1
commit 6d0441a40a
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
widget/Screen.cpp
View File

@ -136,7 +136,12 @@ Screen::GetContentsScaleFactor(double *aOutScale)
NS_IMETHODIMP
Screen::GetDefaultCSSScaleFactor(double *aOutScale)
{
*aOutScale = mDefaultCssScale.scale;
double scale = nsIWidget::DefaultScaleOverride();
if (scale > 0.0) {
*aOutScale = scale;
} else {
*aOutScale = mDefaultCssScale.scale;
}
return NS_OK;
}

12
widget/gtk/ScreenHelperGTK.cpp
View File

@ -145,17 +145,17 @@ ScreenHelperGTK::GetGTKMonitorScaleFactor()
static float
GetDefaultCssScale()
{
double scale = nsIWidget::DefaultScaleOverride();
if (scale <= 0.0) {
scale = ScreenHelperGTK::GetGTKMonitorScaleFactor() * gfxPlatformGtk::GetDPIScale();
}
return scale;
return ScreenHelperGTK::GetGTKMonitorScaleFactor() * gfxPlatformGtk::GetDPIScale();
}
float
ScreenHelperGTK::GetSystemDefaultScale()
{
return GetDefaultCssScale();
double scale = nsIWidget::DefaultScaleOverride();
if (scale <= 0.0) {
scale = GetDefaultCssScale();
}
return scale;
}
static uint32_t

5
widget/windows/ScreenHelperWin.cpp
View File

@ -34,10 +34,7 @@ CollectMonitors(HMONITOR aMon, HDC, LPRECT, LPARAM ioParam)
} else {
contentsScaleFactor.scale = scale;
}
CSSToLayoutDeviceScale defaultCssScaleFactor(nsIWidget::DefaultScaleOverride());
if (defaultCssScaleFactor.scale <= 0.0) {
defaultCssScaleFactor.scale = scale;
}
CSSToLayoutDeviceScale defaultCssScaleFactor(scale);
LayoutDeviceIntRect rect(info.rcMonitor.left, info.rcMonitor.top,
info.rcMonitor.right - info.rcMonitor.left,
info.rcMonitor.bottom - info.rcMonitor.top);