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

misc: minor tweaks 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2022-04-16 10:09:51 +08:00
parent cd05b6ecdf
commit 859912ae25
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/FramelessHelper/Core/framelesshelpercore_global.h
View File

@ -161,6 +161,7 @@ Q_NAMESPACE_EXPORT(FRAMELESSHELPER_CORE_API)
[[maybe_unused]] static constexpr const int kDefaultTitleBarHeight = 30; [[maybe_unused]] static constexpr const int kDefaultTitleBarHeight = 30;
[[maybe_unused]] static constexpr const int kDefaultWindowFrameBorderThickness = 1; [[maybe_unused]] static constexpr const int kDefaultWindowFrameBorderThickness = 1;
[[maybe_unused]] static constexpr const int kDefaultTitleBarFontPointSize = 11; [[maybe_unused]] static constexpr const int kDefaultTitleBarFontPointSize = 11;
[[maybe_unused]] static constexpr const int kDefaultTitleBarTitleLabelMargin = 10;
[[maybe_unused]] static constexpr const QColor kDefaultBlackColor = {0, 0, 0}; // #000000 [[maybe_unused]] static constexpr const QColor kDefaultBlackColor = {0, 0, 0}; // #000000
[[maybe_unused]] static constexpr const QColor kDefaultWhiteColor = {255, 255, 255}; // #FFFFFF [[maybe_unused]] static constexpr const QColor kDefaultWhiteColor = {255, 255, 255}; // #FFFFFF

4
src/quick/CMakeLists.txt
View File

@ -22,8 +22,8 @@
SOFTWARE. SOFTWARE.
]] ]]
find_package(QT NAMES Qt6 Qt5 COMPONENTS QuickTemplates2) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS QuickTemplates2)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS QuickTemplates2) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS QuickTemplates2)
set(SUB_PROJ_NAME FramelessHelperQuick) set(SUB_PROJ_NAME FramelessHelperQuick)

8
src/quick/quickstandardtitlebar.cpp
View File

@ -83,19 +83,19 @@ void QuickStandardTitleBar::setTitleLabelAlignment(const Qt::Alignment value)
const QQuickItemPrivate * const titleBarPriv = QQuickItemPrivate::get(this); const QQuickItemPrivate * const titleBarPriv = QQuickItemPrivate::get(this);
if (m_labelAlignment & Qt::AlignTop) { if (m_labelAlignment & Qt::AlignTop) {
labelAnchors->setTop(titleBarPriv->top()); labelAnchors->setTop(titleBarPriv->top());
labelAnchors->setTopMargin(10); labelAnchors->setTopMargin(kDefaultTitleBarTitleLabelMargin);
} }
if (m_labelAlignment & Qt::AlignBottom) { if (m_labelAlignment & Qt::AlignBottom) {
labelAnchors->setBottom(titleBarPriv->bottom()); labelAnchors->setBottom(titleBarPriv->bottom());
labelAnchors->setBottomMargin(10); labelAnchors->setBottomMargin(kDefaultTitleBarTitleLabelMargin);
} }
if (m_labelAlignment & Qt::AlignLeft) { if (m_labelAlignment & Qt::AlignLeft) {
labelAnchors->setLeft(titleBarPriv->left()); labelAnchors->setLeft(titleBarPriv->left());
labelAnchors->setLeftMargin(10); labelAnchors->setLeftMargin(kDefaultTitleBarTitleLabelMargin);
} }
if (m_labelAlignment & Qt::AlignRight) { if (m_labelAlignment & Qt::AlignRight) {
labelAnchors->setRight(QQuickItemPrivate::get(m_row.data())->left()); labelAnchors->setRight(QQuickItemPrivate::get(m_row.data())->left());
labelAnchors->setRightMargin(10); labelAnchors->setRightMargin(kDefaultTitleBarTitleLabelMargin);
} }
if (m_labelAlignment & Qt::AlignVCenter) { if (m_labelAlignment & Qt::AlignVCenter) {
labelAnchors->setTopMargin(0); labelAnchors->setTopMargin(0);