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

Rename function 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2021-06-01 13:10:05 +08:00
parent 2a10b0f7c8
commit e0b5244420
12 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/mainwindow/mainwindow.cpp
View File

@ -79,11 +79,11 @@ void MainWindow::showEvent(QShowEvent *event)
const auto win = windowHandle(); const auto win = windowHandle();
if (win) { if (win) {
FramelessWindowsManager::addWindow(win); FramelessWindowsManager::addWindow(win);
FramelessWindowsManager::setHitTestVisible(win, titleBarWidget->iconButton, true); FramelessWindowsManager::setHitTestVisibleInChrome(win, titleBarWidget->iconButton, true);
FramelessWindowsManager::setHitTestVisible(win, titleBarWidget->minimizeButton, true); FramelessWindowsManager::setHitTestVisibleInChrome(win, titleBarWidget->minimizeButton, true);
FramelessWindowsManager::setHitTestVisible(win, titleBarWidget->maximizeButton, true); FramelessWindowsManager::setHitTestVisibleInChrome(win, titleBarWidget->maximizeButton, true);
FramelessWindowsManager::setHitTestVisible(win, titleBarWidget->closeButton, true); FramelessWindowsManager::setHitTestVisibleInChrome(win, titleBarWidget->closeButton, true);
FramelessWindowsManager::setHitTestVisible(win, appMainWindow->menubar, true); FramelessWindowsManager::setHitTestVisibleInChrome(win, appMainWindow->menubar, true);
inited = true; inited = true;
} }
} }

6
examples/quick/qml/main.qml
View File

@ -79,7 +79,7 @@ Window {
MinimizeButton { MinimizeButton {
id: minimizeButton id: minimizeButton
onClicked: window.showMinimized() onClicked: window.showMinimized()
Component.onCompleted: framelessHelper.setHitTestVisible(minimizeButton, true) Component.onCompleted: framelessHelper.setHitTestVisibleInChrome(minimizeButton, true)
} }
MaximizeButton { MaximizeButton {
@ -92,13 +92,13 @@ Window {
window.showMaximized() window.showMaximized()
} }
} }
Component.onCompleted: framelessHelper.setHitTestVisible(maximizeButton, true) Component.onCompleted: framelessHelper.setHitTestVisibleInChrome(maximizeButton, true)
} }
CloseButton { CloseButton {
id: closeButton id: closeButton
onClicked: window.close() onClicked: window.close()
Component.onCompleted: framelessHelper.setHitTestVisible(closeButton, true) Component.onCompleted: framelessHelper.setHitTestVisibleInChrome(closeButton, true)
} }
} }
} }

6
examples/widget/widget.cpp
View File

@ -48,9 +48,9 @@ void Widget::showEvent(QShowEvent *event)
if (!inited) { if (!inited) {
QWindow *win = windowHandle(); QWindow *win = windowHandle();
FramelessWindowsManager::addWindow(win); FramelessWindowsManager::addWindow(win);
FramelessWindowsManager::setHitTestVisible(win, m_minimizeButton, true); FramelessWindowsManager::setHitTestVisibleInChrome(win, m_minimizeButton, true);
FramelessWindowsManager::setHitTestVisible(win, m_maximizeButton, true); FramelessWindowsManager::setHitTestVisibleInChrome(win, m_maximizeButton, true);
FramelessWindowsManager::setHitTestVisible(win, m_closeButton, true); FramelessWindowsManager::setHitTestVisibleInChrome(win, m_closeButton, true);
inited = true; inited = true;
} }
} }

4
framelesshelper.cpp
View File

@ -157,7 +157,7 @@ bool FramelessHelper::eventFilter(QObject *object, QEvent *event)
if (!window) { if (!window) {
return false; return false;
} }
return (point.y() <= m_titleBarHeight) && !Utilities::isHitTestVisible(window); return (point.y() <= m_titleBarHeight) && !Utilities::isHitTestVisibleInChrome(window);
}; };
const auto moveOrResize = const auto moveOrResize =
[this, &getWindowEdges, &isInTitlebarArea](const QPointF &point, QWindow *window) { [this, &getWindowEdges, &isInTitlebarArea](const QPointF &point, QWindow *window) {
@ -175,7 +175,7 @@ bool FramelessHelper::eventFilter(QObject *object, QEvent *event)
} }
} else { } else {
if ((window->windowState() == Qt::WindowState::WindowNoState) if ((window->windowState() == Qt::WindowState::WindowNoState)
&& !Utilities::isHitTestVisible(window) && getResizable(window)) { && !Utilities::isHitTestVisibleInChrome(window) && getResizable(window)) {
if (!window->startSystemResize(edges)) { if (!window->startSystemResize(edges)) {
// ### FIXME: TO BE IMPLEMENTED! // ### FIXME: TO BE IMPLEMENTED!
qWarning() << "Current OS doesn't support QWindow::startSystemResize()."; qWarning() << "Current OS doesn't support QWindow::startSystemResize().";

2
framelesshelper_global.h
View File

@ -63,7 +63,7 @@ namespace _flh_global {
[[maybe_unused]] const char _flh_borderWidth_flag[] = "_FRAMELESSHELPER_WINDOW_BORDER_WIDTH"; [[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_borderHeight_flag[] = "_FRAMELESSHELPER_WINDOW_BORDER_HEIGHT";
[[maybe_unused]] const char _flh_titleBarHeight_flag[] = "_FRAMELESSHELPER_WINDOW_TITLE_BAR_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_useNativeTitleBar_flag[] = "_FRAMELESSHELPER_USE_NATIVE_TITLE_BAR";
[[maybe_unused]] const char _flh_preserveNativeFrame_flag[] = "_FRAMELESSHELPER_PRESERVE_NATIVE_WINDOW_FRAME"; [[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"; [[maybe_unused]] const char _flh_forcePreserveNativeFrame_flag[] = "_FRAMELESSHELPER_FORCE_PRESERVE_NATIVE_WINDOW_FRAME";

2
framelesshelper_win32.cpp
View File

@ -528,7 +528,7 @@ bool FramelessHelperWin::nativeEventFilter(const QByteArray &eventType, void *me
const QPointF localMouse = {static_cast<qreal>(winLocalMouse.x), static_cast<qreal>(winLocalMouse.y)}; const QPointF localMouse = {static_cast<qreal>(winLocalMouse.x), static_cast<qreal>(winLocalMouse.y)};
const int bh = getSystemMetric(window, Utilities::SystemMetric::BorderHeight, true); const int bh = getSystemMetric(window, Utilities::SystemMetric::BorderHeight, true);
const int tbh = getSystemMetric(window, Utilities::SystemMetric::TitleBarHeight, 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; const bool isTop = localMouse.y() <= bh;
if (shouldHaveWindowFrame()) { if (shouldHaveWindowFrame()) {
// This will handle the left, right and bottom parts of the frame // This will handle the left, right and bottom parts of the frame

4
framelessquickhelper.cpp
View File

@ -97,11 +97,11 @@ void FramelessQuickHelper::removeWindowFrame()
FramelessWindowsManager::addWindow(window()); FramelessWindowsManager::addWindow(window());
} }
void FramelessQuickHelper::setHitTestVisible(QQuickItem *item, const bool visible) void FramelessQuickHelper::setHitTestVisibleInChrome(QQuickItem *item, const bool visible)
{ {
Q_ASSERT(item); Q_ASSERT(item);
if (!item) { if (!item) {
return; return;
} }
FramelessWindowsManager::setHitTestVisible(window(), item, visible); FramelessWindowsManager::setHitTestVisibleInChrome(window(), item, visible);
} }

2
framelessquickhelper.h
View File

@ -60,7 +60,7 @@ public:
public Q_SLOTS: public Q_SLOTS:
void removeWindowFrame(); void removeWindowFrame();
void setHitTestVisible(QQuickItem *item, const bool visible); void setHitTestVisibleInChrome(QQuickItem *item, const bool visible);
Q_SIGNALS: Q_SIGNALS:
void borderWidthChanged(); void borderWidthChanged();

4
framelesswindowsmanager.cpp
View File

@ -57,7 +57,7 @@ void FramelessWindowsManager::addWindow(QWindow *window)
#endif #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(window);
Q_ASSERT(object); Q_ASSERT(object);
@ -74,7 +74,7 @@ void FramelessWindowsManager::setHitTestVisible(QWindow *window, QObject *object
return; return;
} }
window->setProperty(_flh_global::_flh_nativeParent_flag, QVariant::fromValue(nativeParent)); 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) int FramelessWindowsManager::getBorderWidth(const QWindow *window)

2
framelesswindowsmanager.h
View File

@ -42,7 +42,7 @@ public:
static void addWindow(QWindow *window); 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 int getBorderWidth(const QWindow *window);
static void setBorderWidth(QWindow *window, const int value); static void setBorderWidth(QWindow *window, const int value);

4
utilities.cpp
View File

@ -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); Q_ASSERT(window);
if (!window) { if (!window) {
@ -93,7 +93,7 @@ bool Utilities::isHitTestVisible(const QWindow *window)
if (!obj || !(obj->isWidgetType() || obj->inherits("QQuickItem"))) { if (!obj || !(obj->isWidgetType() || obj->inherits("QQuickItem"))) {
continue; 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; continue;
} }
const QPointF originPoint = mapOriginPointToWindow(obj); const QPointF originPoint = mapOriginPointToWindow(obj);

2
utilities.h
View File

@ -51,7 +51,7 @@ FRAMELESSHELPER_API bool isWindowFixedSize(const QWindow *window);
FRAMELESSHELPER_API QPointF getGlobalMousePosition(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); FRAMELESSHELPER_API QColor getNativeWindowFrameColor(const bool isActive = true);