Mentalflow
/
framelesshelper
forked from github_mirror/framelesshelper
1
0
Fork 0
Code Pull Requests Activity

minor code tidies 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2022-12-20 11:59:25 +08:00
parent 16501e9bd7
commit 62527f4f88
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/micamaterial.cpp
View File

@ -35,7 +35,6 @@
#include <QtGui/qscreen.h> #include <QtGui/qscreen.h>
#include <QtGui/qguiapplication.h> #include <QtGui/qguiapplication.h>
#ifndef FRAMELESSHELPER_CORE_NO_PRIVATE #ifndef FRAMELESSHELPER_CORE_NO_PRIVATE
# include <QtGui/private/qguiapplication_p.h>
# include <QtGui/private/qmemrotate_p.h> # include <QtGui/private/qmemrotate_p.h>
#endif // FRAMELESSHELPER_CORE_NO_PRIVATE #endif // FRAMELESSHELPER_CORE_NO_PRIVATE
@ -87,14 +86,7 @@ struct MicaMaterialData
Q_GLOBAL_STATIC(MicaMaterialData, g_micaMaterialData) Q_GLOBAL_STATIC(MicaMaterialData, g_micaMaterialData)
#ifdef FRAMELESSHELPER_CORE_NO_PRIVATE #ifndef FRAMELESSHELPER_CORE_NO_PRIVATE
[[nodiscard]] static inline Qt::Alignment visualAlignment
(const Qt::LayoutDirection direction, const Qt::Alignment alignment)
{
Q_UNUSED(direction);
return alignment;
}
#else // !FRAMELESSHELPER_CORE_NO_PRIVATE
template<const int shift> template<const int shift>
[[nodiscard]] static inline constexpr int qt_static_shift(const int value) [[nodiscard]] static inline constexpr int qt_static_shift(const int value)
{ {
@ -437,6 +429,7 @@ static inline void expblur(QImage &img, qreal radius, const bool improvedQuality
expblur<12, 10, false>(blurImage, radius, quality, transposed); expblur<12, 10, false>(blurImage, radius, quality, transposed);
} }
} }
#endif // FRAMELESSHELPER_CORE_NO_PRIVATE
/*! /*!
Transforms an \a alignment of Qt::AlignLeft or Qt::AlignRight Transforms an \a alignment of Qt::AlignLeft or Qt::AlignRight
@ -450,11 +443,19 @@ static inline void expblur(QImage &img, qreal radius, const bool improvedQuality
\sa QWidget::layoutDirection \sa QWidget::layoutDirection
*/ */
[[nodiscard]] static inline Qt::Alignment visualAlignment [[nodiscard]] static inline Qt::Alignment visualAlignment
(const Qt::LayoutDirection direction, const Qt::Alignment alignment) (const Qt::LayoutDirection direction, Qt::Alignment alignment)
{ {
return QGuiApplicationPrivate::visualAlignment(direction, alignment); if (!(alignment & Qt::AlignHorizontal_Mask)) {
alignment |= Qt::AlignLeft;
}
if (!(alignment & Qt::AlignAbsolute) && (alignment & (Qt::AlignLeft | Qt::AlignRight))) {
if (direction == Qt::RightToLeft) {
alignment ^= (Qt::AlignLeft | Qt::AlignRight);
}
alignment |= Qt::AlignAbsolute;
}
return alignment;
} }
#endif // FRAMELESSHELPER_CORE_NO_PRIVATE
/*! /*!
Returns a new rectangle of the specified \a size that is aligned to the given Returns a new rectangle of the specified \a size that is aligned to the given

2
src/core/utils_linux.cpp
View File

@ -413,7 +413,7 @@ bool Utils::setBlurBehindWindowEnabled(const WId windowId, const BlurMode mode,
return false; return false;
} }
static const xcb_atom_t deepinAtom = internAtom(ATOM_NET_WM_DEEPIN_BLUR_REGION_MASK); static const xcb_atom_t deepinAtom = internAtom(ATOM_NET_WM_DEEPIN_BLUR_REGION_MASK);
if (deepinAtom != XCB_NONE) { if ((deepinAtom != XCB_NONE) && isSupportedByWindowManager(deepinAtom)) {
clearWindowProperty(windowId, deepinAtom); clearWindowProperty(windowId, deepinAtom);
} }
const auto blurMode = [mode]() -> BlurMode { const auto blurMode = [mode]() -> BlurMode {