From be703385249bafd679a125efc1477ff166e2c9e2 Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: ćšć, 21 12æ 2023 17:08:40 +0800 Subject: [PATCH] minor tweaks --- src/core/contexts/abstractwindowcontext.cpp | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp index 193cae2..d110fff 100644 --- a/src/core/contexts/abstractwindowcontext.cpp +++ b/src/core/contexts/abstractwindowcontext.cpp @@ -19,25 +19,31 @@ m_host = host; m_delegate.reset(delegate); - m_windowHandle = m_delegate->window(m_host); + m_windowHandle = m_delegate->hostWindow(m_host); if (m_windowHandle) { winIdChanged(); } } - void AbstractWindowContext::setWindowAttribute(const QString &key, const QVariant &var) { + bool AbstractWindowContext::setWindowAttribute(const QString &key, const QVariant &attribute) { auto it = m_windowAttributes.find(key); - if (it.value() == var) - return; + if (it.value() == attribute) + return true; - auto newVar = var; + auto newVar = attribute; auto oldVar = it.value(); + bool res = false; void *args[] = { &const_cast<QString &>(key), &newVar, &oldVar, + &res, }; virtual_hook(WindowAttributeChangedHook, args); + if (res) { + it.value() = newVar; + } + return res; } bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) { @@ -198,7 +204,7 @@ void AbstractWindowContext::notifyWinIdChange() { auto oldWindow = m_windowHandle; - m_windowHandle = m_delegate->window(m_host); + m_windowHandle = m_delegate->hostWindow(m_host); if (oldWindow == m_windowHandle) return; winIdChanged(); -- Gitblit v1.9.1