From 38683211fa047369261ad671a77b66d2b8ed5667 Mon Sep 17 00:00:00 2001 From: Zhang Qipeng Date: Thu, 17 Sep 2020 11:28:47 +0800 Subject: [PATCH] fix: Icon size adaptive abnormal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当特效模式关闭后,任务栏的“多任务视图”图标会隐藏,此时任务栏图标应重新计算图标大小,调整显示区域。 Log: 修复关闭特效后任务栏图标大小错误的问题。 Bug: https://pms.uniontech.com/zentao/bug-view-47755.html Change-Id: Ifbc697c4fa897953f8051eb3e86b73af5eb2f99a Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/5210 Reviewed-by: Reviewed-by: fanpengcheng Tested-by: --- frame/panel/mainpanelcontrol.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/frame/panel/mainpanelcontrol.cpp b/frame/panel/mainpanelcontrol.cpp index 146250de2..2432a1178 100755 --- a/frame/panel/mainpanelcontrol.cpp +++ b/frame/panel/mainpanelcontrol.cpp @@ -573,15 +573,17 @@ void MainPanelControl::dragMoveEvent(QDragMoveEvent *e) bool MainPanelControl::eventFilter(QObject *watched, QEvent *event) { if (watched == m_appAreaSonWidget) { - if (event->type() == QEvent::LayoutRequest) { + switch (event->type()) { + case QEvent::LayoutRequest: m_appAreaSonWidget->adjustSize(); resizeDockIcon(); - } else { - moveAppSonWidget(); - } - - if (event->type() == QEvent::Resize) { + break; + case QEvent::Paint: + resizeDockIcon(); + break; + default: moveAppSonWidget(); + break; } }