mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 05:11:16 +00:00
dd06dd9130
This fixes screen sizes when using mutter with fractional scaling, and shouldn't change behavior otherwise. Without this patch, mutter with scale at 150% reports: [screen.width, screen.height] == [ 1920, 1080 ] With this it reports the proper [ 2560, 1440 ]. The bug that caused us to introduce it was long fixed in gtk itself, as I understand it, and ScreenGetterGtk is also what's used everywhere else on Wayland. Re-implement GetScreenForWindow in a way that works for ScreenGetterGtk too, to avoid regressing any functionality on mutter. Depends on D186341 Differential Revision: https://phabricator.services.mozilla.com/D186342
67 lines
1.8 KiB
C++
67 lines
1.8 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 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/. */
|
|
|
|
#ifndef mozilla_widget_ScreenManager_h
|
|
#define mozilla_widget_ScreenManager_h
|
|
|
|
#include "nsIScreenManager.h"
|
|
|
|
#include "mozilla/RefPtr.h"
|
|
#include "mozilla/UniquePtr.h"
|
|
#include "mozilla/widget/Screen.h"
|
|
#include "nsTArray.h"
|
|
|
|
namespace mozilla {
|
|
namespace dom {
|
|
class ContentParent;
|
|
class ScreenDetails;
|
|
} // namespace dom
|
|
} // namespace mozilla
|
|
|
|
namespace mozilla::widget {
|
|
|
|
class ScreenManager final : public nsIScreenManager {
|
|
public:
|
|
class Helper {
|
|
public:
|
|
virtual ~Helper() = default;
|
|
};
|
|
|
|
public:
|
|
NS_DECL_ISUPPORTS
|
|
NS_DECL_NSISCREENMANAGER
|
|
|
|
static ScreenManager& GetSingleton();
|
|
static already_AddRefed<ScreenManager> GetAddRefedSingleton();
|
|
|
|
void SetHelper(UniquePtr<Helper> aHelper);
|
|
static void Refresh(nsTArray<RefPtr<Screen>>&& aScreens);
|
|
void Refresh(nsTArray<mozilla::dom::ScreenDetails>&& aScreens);
|
|
void CopyScreensToRemote(mozilla::dom::ContentParent* aContentParent);
|
|
already_AddRefed<Screen> GetPrimaryScreen();
|
|
already_AddRefed<Screen> ScreenForRect(const DesktopIntRect& aRect);
|
|
|
|
const nsTArray<RefPtr<Screen>>& CurrentScreenList() const {
|
|
return mScreenList;
|
|
}
|
|
|
|
private:
|
|
ScreenManager();
|
|
virtual ~ScreenManager();
|
|
|
|
void RefreshInternal(nsTArray<RefPtr<Screen>>&& aScreens);
|
|
template <class Range>
|
|
void CopyScreensToRemoteRange(Range aRemoteRange);
|
|
void CopyScreensToAllRemotesIfIsParent();
|
|
|
|
AutoTArray<RefPtr<Screen>, 4> mScreenList;
|
|
UniquePtr<Helper> mHelper;
|
|
};
|
|
|
|
} // namespace mozilla::widget
|
|
|
|
#endif // mozilla_widget_ScreenManager_h
|