mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-28 15:23:51 +00:00
ee23efc9b5
In bug 1773342 I made OS text scale factor behave like a full zoom factor which applies to all pages (including the browser chrome). That's generally straight forward but it makes some callsites that use unzoomed CSS coordinates misbehave (or behave correctly accidentally actually in some other cases). The main fix here is making nsIBaseWindow::UnscaledDevicePixelsPerCSSPixel() and nsIScreen::GetDefaultCSSScaleFactor() account for OS zoom as necessary. However, I also went through the relevant code and cleaned it up to use typed units and operations when possible. The setup means: * nsIWidget::GetDefaultScale() doesn't account for OS full zoom. * nsIBaseWindow and nsIScreen does. These are the places where this should matter and stuff can get confused, but this works surprisingly well for all callers (except one nsDeviceContext one which we use only for PuppetWidget and we can remove by falling back to 1.0 like all other widgets until the update comes). Differential Revision: https://phabricator.services.mozilla.com/D149033
163 lines
5.2 KiB
C++
163 lines
5.2 KiB
C++
/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 2; -*- */
|
|
/* vim: set sw=2 ts=8 et tw=80 : */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "Screen.h"
|
|
|
|
#include "mozilla/dom/DOMTypes.h"
|
|
#include "mozilla/Hal.h"
|
|
#include "mozilla/LookAndFeel.h"
|
|
#include "mozilla/StaticPrefs_layout.h"
|
|
|
|
namespace mozilla::widget {
|
|
|
|
NS_IMPL_ISUPPORTS(Screen, nsIScreen)
|
|
|
|
static hal::ScreenOrientation EffectiveOrientation(
|
|
hal::ScreenOrientation aOrientation, const LayoutDeviceIntRect& aRect) {
|
|
if (aOrientation == hal::ScreenOrientation::None) {
|
|
return aRect.Width() >= aRect.Height()
|
|
? hal::ScreenOrientation::LandscapePrimary
|
|
: hal::ScreenOrientation::PortraitPrimary;
|
|
}
|
|
return aOrientation;
|
|
}
|
|
|
|
Screen::Screen(LayoutDeviceIntRect aRect, LayoutDeviceIntRect aAvailRect,
|
|
uint32_t aPixelDepth, uint32_t aColorDepth,
|
|
uint32_t aRefreshRate, DesktopToLayoutDeviceScale aContentsScale,
|
|
CSSToLayoutDeviceScale aDefaultCssScale, float aDPI,
|
|
IsPseudoDisplay aIsPseudoDisplay,
|
|
hal::ScreenOrientation aOrientation,
|
|
OrientationAngle aOrientationAngle)
|
|
: mRect(aRect),
|
|
mAvailRect(aAvailRect),
|
|
mRectDisplayPix(RoundedToInt(aRect / aContentsScale)),
|
|
mAvailRectDisplayPix(RoundedToInt(aAvailRect / aContentsScale)),
|
|
mPixelDepth(aPixelDepth),
|
|
mColorDepth(aColorDepth),
|
|
mRefreshRate(aRefreshRate),
|
|
mContentsScale(aContentsScale),
|
|
mDefaultCssScale(aDefaultCssScale),
|
|
mDPI(aDPI),
|
|
mScreenOrientation(EffectiveOrientation(aOrientation, aRect)),
|
|
mOrientationAngle(aOrientationAngle),
|
|
mIsPseudoDisplay(aIsPseudoDisplay == IsPseudoDisplay::Yes) {}
|
|
|
|
Screen::Screen(const dom::ScreenDetails& aScreen)
|
|
: mRect(aScreen.rect()),
|
|
mAvailRect(aScreen.availRect()),
|
|
mRectDisplayPix(aScreen.rectDisplayPix()),
|
|
mAvailRectDisplayPix(aScreen.availRectDisplayPix()),
|
|
mPixelDepth(aScreen.pixelDepth()),
|
|
mColorDepth(aScreen.colorDepth()),
|
|
mRefreshRate(aScreen.refreshRate()),
|
|
mContentsScale(aScreen.contentsScaleFactor()),
|
|
mDefaultCssScale(aScreen.defaultCSSScaleFactor()),
|
|
mDPI(aScreen.dpi()),
|
|
mScreenOrientation(aScreen.orientation()),
|
|
mOrientationAngle(aScreen.orientationAngle()),
|
|
mIsPseudoDisplay(aScreen.isPseudoDisplay()) {}
|
|
|
|
Screen::Screen(const Screen& aOther)
|
|
: mRect(aOther.mRect),
|
|
mAvailRect(aOther.mAvailRect),
|
|
mRectDisplayPix(aOther.mRectDisplayPix),
|
|
mAvailRectDisplayPix(aOther.mAvailRectDisplayPix),
|
|
mPixelDepth(aOther.mPixelDepth),
|
|
mColorDepth(aOther.mColorDepth),
|
|
mRefreshRate(aOther.mRefreshRate),
|
|
mContentsScale(aOther.mContentsScale),
|
|
mDefaultCssScale(aOther.mDefaultCssScale),
|
|
mDPI(aOther.mDPI),
|
|
mScreenOrientation(aOther.mScreenOrientation),
|
|
mOrientationAngle(aOther.mOrientationAngle),
|
|
mIsPseudoDisplay(aOther.mIsPseudoDisplay) {}
|
|
|
|
dom::ScreenDetails Screen::ToScreenDetails() const {
|
|
return dom::ScreenDetails(
|
|
mRect, mRectDisplayPix, mAvailRect, mAvailRectDisplayPix, mPixelDepth,
|
|
mColorDepth, mRefreshRate, mContentsScale, mDefaultCssScale, mDPI,
|
|
mScreenOrientation, mOrientationAngle, mIsPseudoDisplay);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
Screen::GetRect(int32_t* aOutLeft, int32_t* aOutTop, int32_t* aOutWidth,
|
|
int32_t* aOutHeight) {
|
|
mRect.GetRect(aOutLeft, aOutTop, aOutWidth, aOutHeight);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
Screen::GetRectDisplayPix(int32_t* aOutLeft, int32_t* aOutTop,
|
|
int32_t* aOutWidth, int32_t* aOutHeight) {
|
|
mRectDisplayPix.GetRect(aOutLeft, aOutTop, aOutWidth, aOutHeight);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
Screen::GetAvailRect(int32_t* aOutLeft, int32_t* aOutTop, int32_t* aOutWidth,
|
|
int32_t* aOutHeight) {
|
|
mAvailRect.GetRect(aOutLeft, aOutTop, aOutWidth, aOutHeight);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
Screen::GetAvailRectDisplayPix(int32_t* aOutLeft, int32_t* aOutTop,
|
|
int32_t* aOutWidth, int32_t* aOutHeight) {
|
|
mAvailRectDisplayPix.GetRect(aOutLeft, aOutTop, aOutWidth, aOutHeight);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
Screen::GetPixelDepth(int32_t* aPixelDepth) {
|
|
*aPixelDepth = mPixelDepth;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
Screen::GetColorDepth(int32_t* aColorDepth) {
|
|
*aColorDepth = mColorDepth;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
Screen::GetContentsScaleFactor(double* aOutScale) {
|
|
*aOutScale = mContentsScale.scale;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
Screen::GetDefaultCSSScaleFactor(double* aOutScale) {
|
|
double scale = StaticPrefs::layout_css_devPixelsPerPx();
|
|
if (scale > 0.0) {
|
|
*aOutScale = scale;
|
|
} else {
|
|
*aOutScale = mDefaultCssScale.scale;
|
|
}
|
|
*aOutScale *= LookAndFeel::SystemZoomSettings().mFullZoom;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
Screen::GetDpi(float* aDPI) {
|
|
*aDPI = mDPI;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
Screen::GetRefreshRate(int32_t* aRefreshRate) {
|
|
*aRefreshRate = mRefreshRate;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
Screen::GetIsPseudoDisplay(bool* aIsPseudoDisplay) {
|
|
*aIsPseudoDisplay = mIsPseudoDisplay;
|
|
return NS_OK;
|
|
}
|
|
|
|
} // namespace mozilla::widget
|