Skip to content
This repository has been archived by the owner on Dec 19, 2023. It is now read-only.

Commit

Permalink
mica material: fix high dpi scaling
Browse files Browse the repository at this point in the history
  • Loading branch information
@wangwenx190
wangwenx190 committed Aug 19, 2023
1 parent 8ac3d74 commit 54e3f62
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 113 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "cmake"]
path = cmake
url = https://github.com/wangwenx190/cmake-utils.git
url = ../cmake-utils.git
11 changes: 1 addition & 10 deletions include/FramelessHelper/Core/private/micamaterial_p.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE

class MicaMaterial;

struct Transform
{
qreal Horizontal = 0;
qreal Vertical = 0;
};

class FRAMELESSHELPER_CORE_API MicaMaterialPrivate : public QObject
{
Q_OBJECT
Expand All @@ -52,9 +46,6 @@ class FRAMELESSHELPER_CORE_API MicaMaterialPrivate : public QObject

Q_NODISCARD static QColor systemFallbackColor();

Q_NODISCARD static QSize monitorSize();
Q_NODISCARD static QSize wallpaperSize();

Q_NODISCARD QPoint mapToWallpaper(const QPoint &pos) const;
Q_NODISCARD QSize mapToWallpaper(const QSize &size) const;
Q_NODISCARD QRect mapToWallpaper(const QRect &rect) const;
Expand All @@ -78,7 +69,7 @@ public Q_SLOTS:
bool fallbackEnabled = true;
QBrush micaBrush = {};
bool initialized = false;
Transform transform = {};
QSize wallpaperSize = {};
};

FRAMELESSHELPER_END_NAMESPACE
125 changes: 23 additions & 102 deletions src/core/micamaterial.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,7 @@ struct ImageData
QMutex mutex{};
};

struct MetricsData
{
std::optional<QSize> monitorSize = std::nullopt;
std::optional<QSize> wallpaperSize = std::nullopt;
QMutex mutex{};
};

Q_GLOBAL_STATIC(ImageData, g_imageData)
Q_GLOBAL_STATIC(MetricsData, g_metricsData)

#ifndef FRAMELESSHELPER_CORE_NO_PRIVATE
template<const int shift>
Expand Down Expand Up @@ -500,20 +492,11 @@ class WallpaperThread : public QThread
~WallpaperThread() override = default;

Q_SIGNALS:
void imageUpdated(const Transform &);
void imageUpdated();

protected:
void run() override
{
Transform transform = {};
const QSize monitorSize = MicaMaterialPrivate::monitorSize();
const QSize imageSize = MicaMaterialPrivate::wallpaperSize();
// If we scaled the image size, record the scale factor and we need it to map our clip rect
// to the real (unscaled) rect.
if (imageSize != monitorSize) {
transform.Horizontal = (qreal(imageSize.width()) / qreal(monitorSize.width()));
transform.Vertical = (qreal(imageSize.height()) / qreal(monitorSize.height()));
}
const QString wallpaperFilePath = Utils::getWallpaperFilePath();
if (wallpaperFilePath.isEmpty()) {
WARNING << "Failed to retrieve the wallpaper file path.";
Expand Down Expand Up @@ -546,7 +529,8 @@ class WallpaperThread : public QThread
return;
}
WallpaperAspectStyle aspectStyle = Utils::getWallpaperAspectStyle();
QImage buffer(imageSize, kDefaultImageFormat);
const QSize wallpaperSize = QGuiApplication::primaryScreen()->size();
QImage buffer(wallpaperSize, kDefaultImageFormat);
#ifdef Q_OS_WINDOWS
if (aspectStyle == WallpaperAspectStyle::Center) {
buffer.fill(kDefaultBlackColor);
Expand All @@ -562,11 +546,11 @@ class WallpaperThread : public QThread
mode = Qt::KeepAspectRatio;
}
QSize newSize = image.size();
newSize.scale(imageSize, mode);
newSize.scale(wallpaperSize, mode);
image = image.scaled(newSize);
}
static constexpr const QPoint desktopOriginPoint = {0, 0};
const QRect desktopRect = {desktopOriginPoint, imageSize};
const QRect desktopRect = {desktopOriginPoint, wallpaperSize};
if (aspectStyle == WallpaperAspectStyle::Tile) {
QPainter bufferPainter(&buffer);
// Same as above, we prefer speed than quality here.
Expand All @@ -585,7 +569,7 @@ class WallpaperThread : public QThread
}
{
const QMutexLocker locker(&g_imageData()->mutex);
g_imageData()->blurredWallpaper = QPixmap(imageSize);
g_imageData()->blurredWallpaper = QPixmap(wallpaperSize);
g_imageData()->blurredWallpaper.fill(kDefaultTransparentColor);
QPainter painter(&g_imageData()->blurredWallpaper);
// Same here.
Expand All @@ -598,7 +582,7 @@ class WallpaperThread : public QThread
qt_blurImage(&painter, buffer, kDefaultBlurRadius, false, false);
#endif // FRAMELESSHELPER_CORE_NO_PRIVATE
}
Q_EMIT imageUpdated(transform);
Q_EMIT imageUpdated();
}
};

Expand Down Expand Up @@ -704,7 +688,7 @@ void MicaMaterialPrivate::paint(QPainter *painter, const QRect &rect, const bool
}
prepareGraphicsResources();
static constexpr const QPoint originPoint = {0, 0};
const QRect wallpaperRect = { originPoint, wallpaperSize() };
const QRect wallpaperRect = { originPoint, wallpaperSize };
const QRect mappedRect = mapToWallpaper(rect);
painter->save();
// Same as above. Speed is more important here.
Expand Down Expand Up @@ -762,10 +746,7 @@ void MicaMaterialPrivate::paint(QPainter *painter, const QRect &rect, const bool

void MicaMaterialPrivate::forceRebuildWallpaper()
{
g_metricsData()->mutex.lock();
g_metricsData()->monitorSize = std::nullopt;
g_metricsData()->wallpaperSize = std::nullopt;
g_metricsData()->mutex.unlock();
wallpaperSize = QGuiApplication::primaryScreen()->size();
maybeGenerateBlurredWallpaper(true);
}

Expand All @@ -776,15 +757,16 @@ void MicaMaterialPrivate::initialize()
g_threadData()->thread = std::make_unique<WallpaperThread>();
qAddPostRoutine(threadCleaner);
}
connect(g_threadData()->thread.get(), &WallpaperThread::imageUpdated, this, [this](const Transform &t){
transform = t;
connect(g_threadData()->thread.get(), &WallpaperThread::imageUpdated, this, [this](){
if (initialized) {
Q_Q(MicaMaterial);
Q_EMIT q->shouldRedraw();
}
});
g_threadData()->mutex.unlock();

wallpaperSize = QGuiApplication::primaryScreen()->size();

tintColor = kDefaultTransparentColor;
tintOpacity = kDefaultTintOpacity;
// Leave fallbackColor invalid, we need to use this state to judge
Expand Down Expand Up @@ -824,76 +806,24 @@ QColor MicaMaterialPrivate::systemFallbackColor()
return ((FramelessManager::instance()->systemTheme() == SystemTheme::Dark) ? kDefaultFallbackColorDark : kDefaultFallbackColorLight);
}

QSize MicaMaterialPrivate::monitorSize()
{
g_metricsData()->mutex.lock();
if (!g_metricsData()->monitorSize.has_value()) {
g_metricsData()->mutex.unlock();
const QScreen * const monitor = QGuiApplication::primaryScreen();
Q_ASSERT(monitor);
// We do not use the virtual desktop size here, instead, we only calculate the primary
// monitor size to simplify the logic, otherwise we will need a lot more code to take
// every case into account.
QSize size = (monitor ? monitor->size() : kMaximumPictureSize);
if (Q_UNLIKELY(size.isEmpty())) {
WARNING << "Failed to retrieve the monitor size. Using default size (1920x1080) instead ...";
size = kMaximumPictureSize;
}
g_metricsData()->mutex.lock();
g_metricsData()->monitorSize = size;
// Don't unlock the mutex here, we'll unlock it from outside.
DEBUG << "Primary monitor size:" << size * (monitor ? monitor->devicePixelRatio() : qreal(1));
}
const QSize result = g_metricsData()->monitorSize.value();
g_metricsData()->mutex.unlock();
return result;
}

QSize MicaMaterialPrivate::wallpaperSize()
{
g_metricsData()->mutex.lock();
if (!g_metricsData()->wallpaperSize.has_value()) {
g_metricsData()->mutex.unlock();
const QSize desktopSize = monitorSize();
// It's observed that QImage consumes too much memory if the image resolution is very large.
const QSize size = (desktopSize > kMaximumPictureSize ? kMaximumPictureSize : desktopSize);
g_metricsData()->mutex.lock();
g_metricsData()->wallpaperSize = size;
// Don't unlock the mutex here, we'll unlock it from outside.
DEBUG << "Wallpaper size:" << size;
}
const QSize result = g_metricsData()->wallpaperSize.value();
g_metricsData()->mutex.unlock();
return result;
}

QPoint MicaMaterialPrivate::mapToWallpaper(const QPoint &pos) const
{
if (pos.isNull()) {
return {};
}
QPointF result = pos;
if (!qFuzzyIsNull(transform.Horizontal) && (transform.Horizontal > qreal(0))
&& !qFuzzyCompare(transform.Horizontal, qreal(1))) {
result.setX(result.x() * transform.Horizontal);
}
if (!qFuzzyIsNull(transform.Vertical) && (transform.Vertical > qreal(0))
&& !qFuzzyCompare(transform.Vertical, qreal(1))) {
result.setY(result.y() * transform.Vertical);
}
const QSizeF imageSize = wallpaperSize();
// Make sure the position is always inside the wallpaper rectangle.
while (result.x() < qreal(0)) {
result.setX(result.x() + imageSize.width());
result.setX(result.x() + wallpaperSize.width());
}
while ((result.x() > imageSize.width()) || qFuzzyCompare(result.x(), imageSize.width())) {
result.setX(result.x() - imageSize.width());
while ((result.x() > wallpaperSize.width()) || qFuzzyCompare(result.x(), wallpaperSize.width())) {
result.setX(result.x() - wallpaperSize.width());
}
while (result.y() < qreal(0)) {
result.setY(result.y() + imageSize.height());
result.setY(result.y() + wallpaperSize.height());
}
while ((result.y() > imageSize.height()) || qFuzzyCompare(result.y(), imageSize.height())) {
result.setY(result.y() - imageSize.height());
while ((result.y() > wallpaperSize.height()) || qFuzzyCompare(result.y(), wallpaperSize.height())) {
result.setY(result.y() - wallpaperSize.height());
}
return result.toPoint();
}
Expand All @@ -904,28 +834,19 @@ QSize MicaMaterialPrivate::mapToWallpaper(const QSize &size) const
return {};
}
QSizeF result = size;
if (!qFuzzyIsNull(transform.Horizontal) && (transform.Horizontal > qreal(0))
&& !qFuzzyCompare(transform.Horizontal, qreal(1))) {
result.setWidth(result.width() * transform.Horizontal);
}
if (!qFuzzyIsNull(transform.Vertical) && (transform.Vertical > qreal(0))
&& !qFuzzyCompare(transform.Vertical, qreal(1))) {
result.setHeight(result.height() * transform.Vertical);
}
const QSizeF imageSize = wallpaperSize();
// Make sure we don't get a size larger than the wallpaper's size.
if (result.width() > imageSize.width()) {
result.setWidth(imageSize.width());
if (result.width() > wallpaperSize.width()) {
result.setWidth(wallpaperSize.width());
}
if (result.height() > imageSize.height()) {
result.setHeight(imageSize.height());
if (result.height() > wallpaperSize.height()) {
result.setHeight(wallpaperSize.height());
}
return result.toSize();
}

QRect MicaMaterialPrivate::mapToWallpaper(const QRect &rect) const
{
const auto wallpaperRect = QRectF{ QPointF{ 0, 0 }, wallpaperSize() };
const auto wallpaperRect = QRectF{ QPointF{ 0, 0 }, wallpaperSize };
const auto mappedRect = QRectF{ mapToWallpaper(rect.topLeft()), mapToWallpaper(rect.size()) };
if (!Utils::isValidGeometry(mappedRect)) {
WARNING << "The calculated mapped rectangle is not valid.";
Expand Down

0 comments on commit 54e3f62

Please sign in to comment.