From 8069305d52e0b9c63051af8a6ec8861ef020b0cf Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周五, 23 2月 2024 13:21:24 +0800
Subject: [PATCH] minor tweaks
---
src/core/contexts/abstractwindowcontext.cpp | 4 ++--
src/core/contexts/cocoawindowcontext.mm | 2 +-
qmsetup | 2 +-
src/core/contexts/win32windowcontext.cpp | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/qmsetup b/qmsetup
index d767a85..961f074 160000
--- a/qmsetup
+++ b/qmsetup
@@ -1 +1 @@
-Subproject commit d767a85676092f6b04d2485143b534141d53aef7
+Subproject commit 961f074a5bc9e6cfd0ecaf790be2734d08702a9f
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 3b441c0..2665ac4 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -185,7 +185,7 @@
void AbstractWindowContext::virtual_hook(int id, void *data) {
switch (id) {
case CentralizeHook: {
- if (!m_windowHandle)
+ if (!m_windowId)
return;
QRect windowGeometry = m_delegate->getGeometry(m_host);
@@ -199,7 +199,7 @@
}
case RaiseWindowHook: {
- if (!m_windowHandle)
+ if (!m_windowId)
return;
m_delegate->setWindowVisible(m_host, true);
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index a7e857e..61ad3b8 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -699,7 +699,7 @@
releaseWindowProxy(oldWinId);
}
- if (!m_windowHandle) {
+ if (!winId) {
return;
}
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index e9a6731..a10b3e0 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -631,7 +631,7 @@
}
case DrawWindows10BorderHook2: {
- if (!m_windowHandle)
+ if (!m_windowId)
return;
// https://github.com/microsoft/terminal/blob/71a6f26e6ece656084e87de1a528c4a8072eeabd/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp#L1025
@@ -663,7 +663,7 @@
QVariant Win32WindowContext::windowAttribute(const QString &key) const {
if (key == QStringLiteral("window-rect")) {
- if (!m_windowHandle)
+ if (!m_windowId)
return {};
RECT frame{};
@@ -686,7 +686,7 @@
}
if (key == QStringLiteral("border-thickness")) {
- return m_windowHandle
+ return m_windowId
? int(getWindowFrameBorderThickness(reinterpret_cast<HWND>(m_windowId)))
: 0;
}
@@ -704,7 +704,7 @@
removeManagedWindow(reinterpret_cast<HWND>(oldWinId));
}
- if (!m_windowHandle || !winId) {
+ if (!winId) {
return;
}
--
Gitblit v1.9.1