Bug 1131978 - Acknowledge GDK's scale factor in scale calculation. r=karlt

This commit is contained in:
Andrew Comminos 2015-06-26 10:19:00 +02:00
parent 0e941eb46e
commit dc28f4581f
2 changed files with 2 additions and 6 deletions

View File

@ -86,7 +86,7 @@ nsScreenGtk :: GetDPIScale()
{
double dpiScale = nsIWidget::DefaultScaleOverride();
if (dpiScale <= 0.0) {
dpiScale = gfxPlatformGtk::GetDPIScale();
dpiScale = GetGtkMonitorScaleFactor() * gfxPlatformGtk::GetDPIScale();
}
return dpiScale;
}

View File

@ -718,11 +718,7 @@ nsWindow::GetDPI()
double
nsWindow::GetDefaultScaleInternal()
{
#if (MOZ_WIDGET_GTK == 3)
return GdkScaleFactor();
#else
return gfxPlatformGtk::GetDPIScale();
#endif
return GdkScaleFactor() * gfxPlatformGtk::GetDPIScale();
}
NS_IMETHODIMP