Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: [dock] add active status. #1940

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions src/external/dde-dock-plugins/disk-mount/diskmountplugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#include <DApplication>
#include <QGSettings>
#include <QJsonObject>
#include <QJsonDocument>

Q_DECLARE_LOGGING_CATEGORY(logAppDock)

Expand Down Expand Up @@ -141,6 +143,25 @@ void DiskMountPlugin::setDockEntryVisible(bool visible)
proxyInter()->itemRemoved(this, kDiskMountKey);
}

void DiskMountPlugin::onAppletVisibilityChanged(bool visible)
{
#ifdef USE_DOCK_NEW_INTERFACE
qWarning() << ">>>>> callback is valid? " << messageCallback;
if (!messageCallback)
return;

QJsonObject msg;
msg[Dock::MSG_TYPE] = Dock::MSG_ITEM_ACTIVE_STATE;
msg[Dock::MSG_DATA] = visible;
QJsonDocument doc;
doc.setObject(msg);

qWarning() << ">>>>> plugin to dock message: " << doc.toJson(QJsonDocument::Compact);

qWarning() << "<<<<< ret:" << messageCallback(this, doc.toJson());
#endif
}

void DiskMountPlugin::loadTranslator()
{
QString &&applicationName = qApp->applicationName();
Expand All @@ -156,6 +177,9 @@ void DiskMountPlugin::initCompoments()
diskControlApplet = new DeviceList();
diskControlApplet->setObjectName("disk-mount");
diskControlApplet->setVisible(false);

connect(diskControlApplet, &DeviceList::visibilityChanged,
this, &DiskMountPlugin::onAppletVisibilityChanged);
}

void DiskMountPlugin::displayModeChanged(const Dock::DisplayMode mode)
Expand Down
9 changes: 9 additions & 0 deletions src/external/dde-dock-plugins/disk-mount/diskmountplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ class DiskMountPlugin : public QObject, PluginsItemInterface
{
return Dock::Type_Tray | Dock::Attribute_CanDrag | Dock::Attribute_CanInsert;
}

virtual void setMessageCallback(MessageCallbackFunc cb) override { messageCallback = cb; }
#endif

const QString pluginName() const override;
Expand All @@ -72,6 +74,9 @@ class DiskMountPlugin : public QObject, PluginsItemInterface
public slots:
void setDockEntryVisible(bool visible);

private slots:
void onAppletVisibilityChanged(bool visible);

private:
void loadTranslator();
void initCompoments();
Expand All @@ -86,6 +91,10 @@ public slots:
TipsWidget *tipsLabel { nullptr };
DiskPluginItem *diskPluginItem { nullptr };
DeviceList *diskControlApplet { nullptr };

#ifdef USE_DOCK_NEW_INTERFACE
MessageCallbackFunc messageCallback = nullptr;
#endif
};

#endif // DISKMOUNTPLUGIN_H
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ void DeviceList::showEvent(QShowEvent *event)
{
updateHeight();
QScrollArea::showEvent(event);
Q_EMIT visibilityChanged(true);
qWarning() << ">>>>> dfm plugin show";
}

void DeviceList::hideEvent(QHideEvent *event)
{
qWarning() << ">>>>> dfm plugin hide";
Q_EMIT visibilityChanged(false);
QScrollArea::hideEvent(event);
}

void DeviceList::addDevice(const DockItemData &item)
Expand Down
4 changes: 4 additions & 0 deletions src/external/dde-dock-plugins/disk-mount/widgets/devicelist.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@ class DeviceList : public QScrollArea
public:
explicit DeviceList(QWidget *parent = nullptr);

Q_SIGNALS:
void visibilityChanged(bool visible);

protected:
void showEvent(QShowEvent *event) override;
void hideEvent(QHideEvent *event) override;

private Q_SLOTS:
void addDevice(const DockItemData &item);
Expand Down
Loading