From d1ebb20c884239fcbd0d25af07a955d92a6bc5ea Mon Sep 17 00:00:00 2001 From: donghualin Date: Wed, 16 Nov 2022 11:25:33 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dwayland=E4=B8=8B?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87=E7=82=B9=E5=87=BB=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=A0=8F=E5=9B=BE=E6=A0=87=E6=9C=80=E5=B0=8F=E5=8C=96?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 原因:获取当前窗口是否最小化的状态的时候返回值始终为true,引起无法最小化 修改:获取窗口最小化的状态通过com.deepin.daemon.KWayland.PlasmaWindow对象的IsMinimized()接口来获取即可 Log: 修复wayland下无法通过点击任务栏图标最小化窗口的问题 Influence: 进入wayland,打开一个窗口,从任务栏点击图标观察是否可以最小化 Bug: https://pms.uniontech.com/bug-view-167011.html Change-Id: I3ab3c38e25cc5ad3efb94257ebd0cc473702a6fe --- src/modules/dock/windowinfok.cpp | 3 +-- src/modules/dock/windowinfok.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/modules/dock/windowinfok.cpp b/src/modules/dock/windowinfok.cpp index 165eb1b..9a8254b 100644 --- a/src/modules/dock/windowinfok.cpp +++ b/src/modules/dock/windowinfok.cpp @@ -32,7 +32,6 @@ WindowInfoK::WindowInfoK(PlasmaWindow *window, XWindow _xid) , m_internalId(0) , m_demaningAttention(false) , m_closeable(true) - , m_minimized(true) , m_plasmaWindow(window) { xid = _xid; @@ -116,7 +115,7 @@ void WindowInfoK::minimize() bool WindowInfoK::isMinimized() { - return m_minimized; + return m_plasmaWindow->IsMinimized(); } bool WindowInfoK::changeXid(XWindow _xid) diff --git a/src/modules/dock/windowinfok.h b/src/modules/dock/windowinfok.h index fbe1b45..fa65473 100644 --- a/src/modules/dock/windowinfok.h +++ b/src/modules/dock/windowinfok.h @@ -74,7 +74,6 @@ private: uint32_t m_internalId; bool m_demaningAttention; bool m_closeable; - bool m_minimized; PlasmaWindow *m_plasmaWindow; DockRect m_geometry; };