Merge branch 'fanpengcheng/uos_buffix' into 'uos'

fix: (自测)启动后报错问题处理

See merge request dde-v20/dde-dock!603
This commit is contained in:
范朋程 2020-06-15 11:39:57 +08:00
commit 66093fb14b

View File

@ -897,14 +897,14 @@ void MainPanelControl::resizeDockIcon()
if (trashPlugin) totalLength += trashPlugin->width();
if (shutdownPlugin) totalLength += shutdownPlugin->width();
if (keyboardPlugin) totalLength += keyboardPlugin->width();
if (notificationPlugin) totalLength += keyboardPlugin->width();
if (notificationPlugin) totalLength += notificationPlugin->width();
totalLength -= m_desktopWidget->width();
} else {
totalLength -= m_pluginAreaWidget->height();
if (trashPlugin) totalLength += trashPlugin->height();
if (shutdownPlugin) totalLength += shutdownPlugin->height();
if (keyboardPlugin) totalLength += keyboardPlugin->height();
if (notificationPlugin) totalLength += keyboardPlugin->height();
if (notificationPlugin) totalLength += notificationPlugin->height();
totalLength -= m_desktopWidget->height();
}