Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed(tray):method and signal to tray item count

Browse Source
This commit is contained in:
shaojun 2019-10-30 09:42:09 +08:00
parent 357b141594
commit b616162d69
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/tray/fashiontray/containers/abstractcontainer.cpp
View File

@ -179,10 +179,7 @@ bool AbstractContainer::isEmpty()
int AbstractContainer::itemCount()
{
if(expand())
return m_wrapperList.count();
else
return 0;
return m_wrapperList.count();
}
bool AbstractContainer::containsWrapper(FashionTrayWidgetWrapper *wrapper)

2
plugins/tray/fashiontray/containers/abstractcontainer.h
View File

@ -23,12 +23,12 @@ public:
virtual void setDockPosition(const Dock::Position pos);
virtual void setExpand(const bool expand);
virtual QSize totalSize() const;
virtual int itemCount();
// QSize sizeHint() const Q_DECL_OVERRIDE;
void clearWrapper();
void saveCurrentOrderToConfig();
bool isEmpty();
int itemCount();
bool containsWrapper(FashionTrayWidgetWrapper *wrapper);
bool containsWrapperByTrayWidget(AbstractTrayWidget *trayWidget);
FashionTrayWidgetWrapper *wrapperByTrayWidget(AbstractTrayWidget *trayWidget);

8
plugins/tray/fashiontray/containers/normalcontainer.cpp
View File

@ -118,6 +118,14 @@ void NormalContainer::adjustMaxSize(const QSize size)
}
}
int NormalContainer::itemCount()
{
if(expand())
return AbstractContainer::itemCount();
else
return 0;
}
void NormalContainer::setExpand(const bool expand)
{
for (auto w : wrapperList()) {

2
plugins/tray/fashiontray/containers/normalcontainer.h
View File

@ -15,6 +15,7 @@ public:
void addWrapper(FashionTrayWidgetWrapper *wrapper) Q_DECL_OVERRIDE;
void refreshVisible() Q_DECL_OVERRIDE;
void setExpand(const bool expand) Q_DECL_OVERRIDE;
int itemCount() override;
QSize sizeHint() const override;
protected:
@ -30,6 +31,7 @@ private:
private:
mutable QVariantAnimation *m_sizeAnimation;
};
#endif // NORMALCONTAINER_H