From 6e3c6d5d2f63ffb4c9f3a73b7f85e738c70c9481 Mon Sep 17 00:00:00 2001 From: Zhang Qipeng Date: Tue, 25 Aug 2020 18:56:55 +0800 Subject: [PATCH] fix: Overlapping icons in the taskbar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当应用图标区域上（左）边缘超出任务栏上规划的区域时，将应用图标区域上（左）边缘与规划区域对齐。 Log: 修复任务栏图标显示不下时重叠的问题。 Change-Id: I03ed43071772cb23d8e09834da180866d987e1b3 Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/2759 Reviewed-by: Reviewed-by: niecheng Reviewed-by: wangwei Tested-by: --- frame/panel/mainpanelcontrol.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frame/panel/mainpanelcontrol.cpp b/frame/panel/mainpanelcontrol.cpp index deb5c40f8..bdda3a640 100755 --- a/frame/panel/mainpanelcontrol.cpp +++ b/frame/panel/mainpanelcontrol.cpp @@ -824,7 +824,9 @@ void MainPanelControl::moveAppSonWidget() if (rect.right() > m_appAreaWidget->geometry().right()) { rect.moveRight(m_appAreaWidget->geometry().right()); } - + if (rect.left() < m_appAreaWidget->geometry().left()) { + rect.moveLeft(m_appAreaWidget->geometry().left()); + } break; case Right: case Left: @@ -832,7 +834,9 @@ void MainPanelControl::moveAppSonWidget() if (rect.bottom() > m_appAreaWidget->geometry().bottom()) { rect.moveBottom(m_appAreaWidget->geometry().bottom()); } - + if (rect.top() < m_appAreaWidget->geometry().top()) { + rect.moveTop(m_appAreaWidget->geometry().top()); + } break; } }