Minor tweaks.

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2020-11-12 21:20:20 +08:00
parent 13e974a078
commit ddef1cab43
1 changed files with 6 additions and 3 deletions

View File

@ -1131,12 +1131,14 @@ HWND getHWNDFromQObject(QObject *object)
return reinterpret_cast<HWND>(wid); return reinterpret_cast<HWND>(wid);
} }
void updateQtFrame_internal(const HWND handle) void updateQtFrame_internal(const HWND handle, const bool resetToDefault = false)
{ {
Q_ASSERT(handle); Q_ASSERT(handle);
if (WNEF_EXECUTE_WINAPI_RETURN(IsWindow, FALSE, handle)) { if (WNEF_EXECUTE_WINAPI_RETURN(IsWindow, FALSE, handle)) {
const int tbh = WinNativeEventFilter::getSystemMetric( const int tbh = resetToDefault
handle, WinNativeEventFilter::SystemMetric::TitleBarHeight); ? 0
: WinNativeEventFilter::getSystemMetric(
handle, WinNativeEventFilter::SystemMetric::TitleBarHeight);
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
const QWidget *widget = QWidget::find(reinterpret_cast<WId>(handle)); const QWidget *widget = QWidget::find(reinterpret_cast<WId>(handle));
if (widget && widget->isTopLevel()) { if (widget && widget->isTopLevel()) {
@ -1297,6 +1299,7 @@ void WinNativeEventFilter::removeFramelessWindow(void *window)
if (data) { if (data) {
data->framelessModeEnabled = false; data->framelessModeEnabled = false;
} }
updateQtFrame_internal(hwnd, true);
UpdateFrameMarginsForWindow(hwnd, true); UpdateFrameMarginsForWindow(hwnd, true);
updateWindow(window, true, false); updateWindow(window, true, false);
} }