Merge branch 'zhaolong/uos_bug34814' into 'uos'

fix(bluetooth): tooltips一直显示正在连接

See merge request dde-v20/dde-dock!644
This commit is contained in:
王少君 2020-06-23 19:21:02 +08:00
commit 31aa41978d
3 changed files with 7 additions and 1 deletions

View File

@ -51,6 +51,11 @@ Device::Device(QObject *parent)
{
}
Device::~Device()
{
emit stateChanged(StateUnavailable);
}
void Device::setId(const QString &id)
{
m_id = id;

View File

@ -43,6 +43,7 @@ private:
public:
explicit Device(QObject *parent = nullptr);
~Device();
inline QString id() const { return m_id; }
void setId(const QString &id);

View File

@ -102,7 +102,7 @@ DeviceItem::DeviceItem(Device *d, QWidget *parent)
deviceLayout->addLayout(itemLayout);
setLayout(deviceLayout);
connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, themeChanged);
connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, themeChanged);
changeState(m_device->state());
}