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

wip 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2022-03-23 10:59:24 +08:00
parent d94f8221d3
commit 059b8d7982
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/framelesshelper_qt.cpp
View File

@ -115,7 +115,7 @@ bool FramelessHelperQt::eventFilter(QObject *object, QEvent *event)
} }
const Options options = g_qtHelper()->options.value(window); const Options options = g_qtHelper()->options.value(window);
g_qtHelper()->mutex.unlock(); g_qtHelper()->mutex.unlock();
if (Utils::isWindowFixedSize(window) || (options & Option::DisableResizing)) { if (Utils::isWindowFixedSize(window)) {
return false; return false;
} }
const auto mouseEvent = static_cast<QMouseEvent *>(event); const auto mouseEvent = static_cast<QMouseEvent *>(event);

2
src/core/framelesshelper_win.cpp
View File

@ -473,7 +473,7 @@ bool FramelessHelperWin::nativeEventFilter(const QByteArray &eventType, void *me
// another branch, if you are interested in it, you can give it a // another branch, if you are interested in it, you can give it a
// try. // try.
if (Utils::isWindowFixedSize(window) || (options & Option::DisableResizing)) { if (Utils::isWindowFixedSize(window)) {
*result = HTCLIENT; *result = HTCLIENT;
return true; return true;
} }

4
src/core/utils.cpp
View File

@ -98,6 +98,10 @@ bool Utils::isWindowFixedSize(const QWindow *window)
if (!window) { if (!window) {
return false; return false;
} }
const auto options = qvariant_cast<Options>(window->property(kInternalOptionsFlag));
if (options & Option::DisableResizing) {
return true;
}
if (window->flags() & Qt::MSWindowsFixedSizeDialogHint) { if (window->flags() & Qt::MSWindowsFixedSizeDialogHint) {
return true; return true;
} }

2
src/core/utils_win.cpp
View File

@ -520,8 +520,8 @@ void Utils::showSystemMenu(const QWindow *window, const QPoint &pos)
return true; return true;
}; };
const bool maxOrFull = (IsMaximized(hWnd) || isFullScreen(reinterpret_cast<WId>(hWnd))); const bool maxOrFull = (IsMaximized(hWnd) || isFullScreen(reinterpret_cast<WId>(hWnd)));
const bool fixedSize = isWindowFixedSize(window);
const auto options = qvariant_cast<Options>(window->property(kInternalOptionsFlag)); const auto options = qvariant_cast<Options>(window->property(kInternalOptionsFlag));
const bool fixedSize = (isWindowFixedSize(window) || (options & Option::DisableResizing));
if (!setState(SC_RESTORE, (maxOrFull && !fixedSize), true)) { if (!setState(SC_RESTORE, (maxOrFull && !fixedSize), true)) {
return; return;
} }