From e0b5244420054e03589e39a358ab0307b6dfc6c1 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Tue, 1 Jun 2021 13:10:05 +0800 Subject: [PATCH] Rename function Signed-off-by: Yuhang Zhao <2546789017@qq.com> --- examples/mainwindow/mainwindow.cpp | 10 +++++----- examples/quick/qml/main.qml | 6 +++--- examples/widget/widget.cpp | 6 +++--- framelesshelper.cpp | 4 ++-- framelesshelper_global.h | 2 +- framelesshelper_win32.cpp | 2 +- framelessquickhelper.cpp | 4 ++-- framelessquickhelper.h | 2 +- framelesswindowsmanager.cpp | 4 ++-- framelesswindowsmanager.h | 2 +- utilities.cpp | 4 ++-- utilities.h | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp index 2c19ae4..3e63cad 100644 --- a/examples/mainwindow/mainwindow.cpp +++ b/examples/mainwindow/mainwindow.cpp @@ -79,11 +79,11 @@ void MainWindow::showEvent(QShowEvent *event) const auto win = windowHandle(); if (win) { FramelessWindowsManager::addWindow(win); - FramelessWindowsManager::setHitTestVisible(win, titleBarWidget->iconButton, true); - FramelessWindowsManager::setHitTestVisible(win, titleBarWidget->minimizeButton, true); - FramelessWindowsManager::setHitTestVisible(win, titleBarWidget->maximizeButton, true); - FramelessWindowsManager::setHitTestVisible(win, titleBarWidget->closeButton, true); - FramelessWindowsManager::setHitTestVisible(win, appMainWindow->menubar, true); + FramelessWindowsManager::setHitTestVisibleInChrome(win, titleBarWidget->iconButton, true); + FramelessWindowsManager::setHitTestVisibleInChrome(win, titleBarWidget->minimizeButton, true); + FramelessWindowsManager::setHitTestVisibleInChrome(win, titleBarWidget->maximizeButton, true); + FramelessWindowsManager::setHitTestVisibleInChrome(win, titleBarWidget->closeButton, true); + FramelessWindowsManager::setHitTestVisibleInChrome(win, appMainWindow->menubar, true); inited = true; } } diff --git a/examples/quick/qml/main.qml b/examples/quick/qml/main.qml index d2c1f7c..2768ab3 100644 --- a/examples/quick/qml/main.qml +++ b/examples/quick/qml/main.qml @@ -79,7 +79,7 @@ Window { MinimizeButton { id: minimizeButton onClicked: window.showMinimized() - Component.onCompleted: framelessHelper.setHitTestVisible(minimizeButton, true) + Component.onCompleted: framelessHelper.setHitTestVisibleInChrome(minimizeButton, true) } MaximizeButton { @@ -92,13 +92,13 @@ Window { window.showMaximized() } } - Component.onCompleted: framelessHelper.setHitTestVisible(maximizeButton, true) + Component.onCompleted: framelessHelper.setHitTestVisibleInChrome(maximizeButton, true) } CloseButton { id: closeButton onClicked: window.close() - Component.onCompleted: framelessHelper.setHitTestVisible(closeButton, true) + Component.onCompleted: framelessHelper.setHitTestVisibleInChrome(closeButton, true) } } } diff --git a/examples/widget/widget.cpp b/examples/widget/widget.cpp index d6d1678..b7fdd18 100644 --- a/examples/widget/widget.cpp +++ b/examples/widget/widget.cpp @@ -48,9 +48,9 @@ void Widget::showEvent(QShowEvent *event) if (!inited) { QWindow *win = windowHandle(); FramelessWindowsManager::addWindow(win); - FramelessWindowsManager::setHitTestVisible(win, m_minimizeButton, true); - FramelessWindowsManager::setHitTestVisible(win, m_maximizeButton, true); - FramelessWindowsManager::setHitTestVisible(win, m_closeButton, true); + FramelessWindowsManager::setHitTestVisibleInChrome(win, m_minimizeButton, true); + FramelessWindowsManager::setHitTestVisibleInChrome(win, m_maximizeButton, true); + FramelessWindowsManager::setHitTestVisibleInChrome(win, m_closeButton, true); inited = true; } } diff --git a/framelesshelper.cpp b/framelesshelper.cpp index e8e7f95..7985c97 100644 --- a/framelesshelper.cpp +++ b/framelesshelper.cpp @@ -157,7 +157,7 @@ bool FramelessHelper::eventFilter(QObject *object, QEvent *event) if (!window) { return false; } - return (point.y() <= m_titleBarHeight) && !Utilities::isHitTestVisible(window); + return (point.y() <= m_titleBarHeight) && !Utilities::isHitTestVisibleInChrome(window); }; const auto moveOrResize = [this, &getWindowEdges, &isInTitlebarArea](const QPointF &point, QWindow *window) { @@ -175,7 +175,7 @@ bool FramelessHelper::eventFilter(QObject *object, QEvent *event) } } else { if ((window->windowState() == Qt::WindowState::WindowNoState) - && !Utilities::isHitTestVisible(window) && getResizable(window)) { + && !Utilities::isHitTestVisibleInChrome(window) && getResizable(window)) { if (!window->startSystemResize(edges)) { // ### FIXME: TO BE IMPLEMENTED! qWarning() << "Current OS doesn't support QWindow::startSystemResize()."; diff --git a/framelesshelper_global.h b/framelesshelper_global.h index 88e65f4..0bb78fd 100644 --- a/framelesshelper_global.h +++ b/framelesshelper_global.h @@ -63,7 +63,7 @@ namespace _flh_global { [[maybe_unused]] const char _flh_borderWidth_flag[] = "_FRAMELESSHELPER_WINDOW_BORDER_WIDTH"; [[maybe_unused]] const char _flh_borderHeight_flag[] = "_FRAMELESSHELPER_WINDOW_BORDER_HEIGHT"; [[maybe_unused]] const char _flh_titleBarHeight_flag[] = "_FRAMELESSHELPER_WINDOW_TITLE_BAR_HEIGHT"; -[[maybe_unused]] const char _flh_hitTestVisible_flag[] = "_FRAMELESSHELPER_HIT_TEST_VISIBLE"; +[[maybe_unused]] const char _flh_hitTestVisibleInChrome_flag[] = "_FRAMELESSHELPER_HIT_TEST_VISIBLE_IN_CHROME"; [[maybe_unused]] const char _flh_useNativeTitleBar_flag[] = "_FRAMELESSHELPER_USE_NATIVE_TITLE_BAR"; [[maybe_unused]] const char _flh_preserveNativeFrame_flag[] = "_FRAMELESSHELPER_PRESERVE_NATIVE_WINDOW_FRAME"; [[maybe_unused]] const char _flh_forcePreserveNativeFrame_flag[] = "_FRAMELESSHELPER_FORCE_PRESERVE_NATIVE_WINDOW_FRAME"; diff --git a/framelesshelper_win32.cpp b/framelesshelper_win32.cpp index f3625be..2239d56 100644 --- a/framelesshelper_win32.cpp +++ b/framelesshelper_win32.cpp @@ -528,7 +528,7 @@ bool FramelessHelperWin::nativeEventFilter(const QByteArray &eventType, void *me const QPointF localMouse = {static_cast(winLocalMouse.x), static_cast(winLocalMouse.y)}; const int bh = getSystemMetric(window, Utilities::SystemMetric::BorderHeight, true); const int tbh = getSystemMetric(window, Utilities::SystemMetric::TitleBarHeight, true); - const bool isTitleBar = (localMouse.y() <= tbh) && !Utilities::isHitTestVisible(window); + const bool isTitleBar = (localMouse.y() <= tbh) && !Utilities::isHitTestVisibleInChrome(window); const bool isTop = localMouse.y() <= bh; if (shouldHaveWindowFrame()) { // This will handle the left, right and bottom parts of the frame diff --git a/framelessquickhelper.cpp b/framelessquickhelper.cpp index e1c5ae6..b49f1a8 100644 --- a/framelessquickhelper.cpp +++ b/framelessquickhelper.cpp @@ -97,11 +97,11 @@ void FramelessQuickHelper::removeWindowFrame() FramelessWindowsManager::addWindow(window()); } -void FramelessQuickHelper::setHitTestVisible(QQuickItem *item, const bool visible) +void FramelessQuickHelper::setHitTestVisibleInChrome(QQuickItem *item, const bool visible) { Q_ASSERT(item); if (!item) { return; } - FramelessWindowsManager::setHitTestVisible(window(), item, visible); + FramelessWindowsManager::setHitTestVisibleInChrome(window(), item, visible); } diff --git a/framelessquickhelper.h b/framelessquickhelper.h index 8945e9c..a5b4c04 100644 --- a/framelessquickhelper.h +++ b/framelessquickhelper.h @@ -60,7 +60,7 @@ public: public Q_SLOTS: void removeWindowFrame(); - void setHitTestVisible(QQuickItem *item, const bool visible); + void setHitTestVisibleInChrome(QQuickItem *item, const bool visible); Q_SIGNALS: void borderWidthChanged(); diff --git a/framelesswindowsmanager.cpp b/framelesswindowsmanager.cpp index 9ed6066..a823830 100644 --- a/framelesswindowsmanager.cpp +++ b/framelesswindowsmanager.cpp @@ -57,7 +57,7 @@ void FramelessWindowsManager::addWindow(QWindow *window) #endif } -void FramelessWindowsManager::setHitTestVisible(QWindow *window, QObject *object, const bool value) +void FramelessWindowsManager::setHitTestVisibleInChrome(QWindow *window, QObject *object, const bool value) { Q_ASSERT(window); Q_ASSERT(object); @@ -74,7 +74,7 @@ void FramelessWindowsManager::setHitTestVisible(QWindow *window, QObject *object return; } window->setProperty(_flh_global::_flh_nativeParent_flag, QVariant::fromValue(nativeParent)); - object->setProperty(_flh_global::_flh_hitTestVisible_flag, value); + object->setProperty(_flh_global::_flh_hitTestVisibleInChrome_flag, value); } int FramelessWindowsManager::getBorderWidth(const QWindow *window) diff --git a/framelesswindowsmanager.h b/framelesswindowsmanager.h index 20ec23a..b8483c8 100644 --- a/framelesswindowsmanager.h +++ b/framelesswindowsmanager.h @@ -42,7 +42,7 @@ public: static void addWindow(QWindow *window); - static void setHitTestVisible(QWindow *window, QObject *object, const bool value = true); + static void setHitTestVisibleInChrome(QWindow *window, QObject *object, const bool value = true); static int getBorderWidth(const QWindow *window); static void setBorderWidth(QWindow *window, const int value); diff --git a/utilities.cpp b/utilities.cpp index d07a81e..32224a6 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -77,7 +77,7 @@ QPointF Utilities::getGlobalMousePosition(const QWindow *window) } } -bool Utilities::isHitTestVisible(const QWindow *window) +bool Utilities::isHitTestVisibleInChrome(const QWindow *window) { Q_ASSERT(window); if (!window) { @@ -93,7 +93,7 @@ bool Utilities::isHitTestVisible(const QWindow *window) if (!obj || !(obj->isWidgetType() || obj->inherits("QQuickItem"))) { continue; } - if (!obj->property(_flh_global::_flh_hitTestVisible_flag).toBool() || !obj->property("visible").toBool()) { + if (!obj->property(_flh_global::_flh_hitTestVisibleInChrome_flag).toBool() || !obj->property("visible").toBool()) { continue; } const QPointF originPoint = mapOriginPointToWindow(obj); diff --git a/utilities.h b/utilities.h index 56a74b3..a89543b 100644 --- a/utilities.h +++ b/utilities.h @@ -51,7 +51,7 @@ FRAMELESSHELPER_API bool isWindowFixedSize(const QWindow *window); FRAMELESSHELPER_API QPointF getGlobalMousePosition(const QWindow *window); -FRAMELESSHELPER_API bool isHitTestVisible(const QWindow *window); +FRAMELESSHELPER_API bool isHitTestVisibleInChrome(const QWindow *window); FRAMELESSHELPER_API QColor getNativeWindowFrameColor(const bool isActive = true);