From d566addbce2dc8814ff6d5e1afd534477521b50e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=9D=92?= Date: Tue, 7 Jul 2015 10:12:16 +0800 Subject: [PATCH] Fix item add after init can't show --- dde-dock/src/Controller/appmanager.cpp | 2 ++ dde-dock/src/Panel/panel.cpp | 3 ++- dde-dock/src/Widgets/docklayout.cpp | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dde-dock/src/Controller/appmanager.cpp b/dde-dock/src/Controller/appmanager.cpp index 9e0e0681b..67d07c99e 100644 --- a/dde-dock/src/Controller/appmanager.cpp +++ b/dde-dock/src/Controller/appmanager.cpp @@ -28,6 +28,8 @@ void AppManager::slotEntryAdded(const QDBusObjectPath &path) DBusEntryProxyer *entryProxyer = new DBusEntryProxyer(path.path()); if (entryProxyer->isValid()) { + if (entryProxyer->data().value("title") == "dde-dock") + return; AppItem *item = new AppItem(); item->setEntryProxyer(entryProxyer); emit entryAdded(item); diff --git a/dde-dock/src/Panel/panel.cpp b/dde-dock/src/Panel/panel.cpp index 6df49c51a..146e26541 100644 --- a/dde-dock/src/Panel/panel.cpp +++ b/dde-dock/src/Panel/panel.cpp @@ -141,10 +141,11 @@ void Panel::slotRemoveAppItem(const QString &id) if (tmpItem->itemId() == id) { //TODO,remove from layout + leftLayout->removeItem(i); + qWarning() << "=====" << leftLayout->getItemCount(); return; } } - qWarning() << "=====" << leftLayout->getItemCount(); } void Panel::mousePressEvent(QMouseEvent *event) diff --git a/dde-dock/src/Widgets/docklayout.cpp b/dde-dock/src/Widgets/docklayout.cpp index 30beb40c1..391640e3d 100644 --- a/dde-dock/src/Widgets/docklayout.cpp +++ b/dde-dock/src/Widgets/docklayout.cpp @@ -15,6 +15,7 @@ void DockLayout::addItem(AbstractDockItem *item) void DockLayout::insertItem(AbstractDockItem *item, int index) { item->setParent(this); + item->show(); int appCount = appList.count(); index = index > appCount ? appCount : (index < 0 ? 0 : index);