forked from github_mirror/framelesshelper
Remove some leftover.
Amends last commit. Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
parent
807dda608e
commit
d0e03bf19c
|
@ -1770,7 +1770,7 @@ void WinNativeEventFilter::moveWindowToDesktopCenter(const HWND handle)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void WinNativeEventFilter::updateQtFrame(QWindow *const window, const int titleBarHeight)
|
void WinNativeEventFilter::updateQtFrame(QWindow *window, const int titleBarHeight)
|
||||||
{
|
{
|
||||||
if (window && (titleBarHeight > 0)) {
|
if (window && (titleBarHeight > 0)) {
|
||||||
// Reduce top frame to zero since we paint it ourselves. Use
|
// Reduce top frame to zero since we paint it ourselves. Use
|
||||||
|
@ -1781,7 +1781,7 @@ void WinNativeEventFilter::updateQtFrame(QWindow *const window, const int titleB
|
||||||
// window.
|
// window.
|
||||||
window->setProperty("_q_windowsCustomMargins", marginsVar);
|
window->setProperty("_q_windowsCustomMargins", marginsVar);
|
||||||
// If a platform window exists, change via native interface.
|
// If a platform window exists, change via native interface.
|
||||||
QPlatformWindow *const platformWindow = window->handle();
|
QPlatformWindow *platformWindow = window->handle();
|
||||||
if (platformWindow) {
|
if (platformWindow) {
|
||||||
QGuiApplication::platformNativeInterface()
|
QGuiApplication::platformNativeInterface()
|
||||||
->setWindowProperty(platformWindow,
|
->setWindowProperty(platformWindow,
|
||||||
|
@ -1797,16 +1797,16 @@ void WinNativeEventFilter::updateQtFrame_internal(const HWND handle)
|
||||||
if (handle && m_lpIsWindow(handle)) {
|
if (handle && m_lpIsWindow(handle)) {
|
||||||
const int tbh = getSystemMetric(handle, SystemMetric::TitleBarHeight);
|
const int tbh = getSystemMetric(handle, SystemMetric::TitleBarHeight);
|
||||||
#ifdef QT_WIDGETS_LIB
|
#ifdef QT_WIDGETS_LIB
|
||||||
const QWidget *const widget = QWidget::find(reinterpret_cast<WId>(handle));
|
const QWidget *widget = QWidget::find(reinterpret_cast<WId>(handle));
|
||||||
if (widget && widget->isTopLevel()) {
|
if (widget && widget->isTopLevel()) {
|
||||||
QWindow *const window = widget->windowHandle();
|
QWindow *window = widget->windowHandle();
|
||||||
if (window) {
|
if (window) {
|
||||||
updateQtFrame(window, tbh);
|
updateQtFrame(window, tbh);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
QWindow *const window = findQWindowFromRawHandle(handle);
|
QWindow *window = findQWindowFromRawHandle(handle);
|
||||||
if (window) {
|
if (window) {
|
||||||
updateQtFrame(window, tbh);
|
updateQtFrame(window, tbh);
|
||||||
}
|
}
|
||||||
|
|
|
@ -131,7 +131,7 @@ public:
|
||||||
// Update Qt's internal data about the window frame, otherwise Qt will
|
// Update Qt's internal data about the window frame, otherwise Qt will
|
||||||
// take the size of the window frame into account when anyone is trying to
|
// take the size of the window frame into account when anyone is trying to
|
||||||
// change the geometry of the window. That's not what we want.
|
// change the geometry of the window. That's not what we want.
|
||||||
static void updateQtFrame(QWindow *const window, const int titleBarHeight);
|
static void updateQtFrame(QWindow *window, const int titleBarHeight);
|
||||||
|
|
||||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
||||||
bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
|
bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
|
||||||
|
|
Loading…
Reference in New Issue