Skip to content
Merged
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
7 changes: 7 additions & 0 deletions src/loader/pluginitem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -321,3 +321,10 @@ bool PluginItem::panelPopupExisted() const

return false;
}

void PluginItem::updatePluginContentMargin(int spacing)
{
if (spacing > 0) {
setContentsMargins(spacing, spacing, spacing, spacing);
}
}
2 changes: 2 additions & 0 deletions src/loader/pluginitem.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ class PluginItem : public QWidget
QString pluginId() const { return m_pluginsItemInterface->pluginName(); }
virtual QString itemKey() const { return m_itemKey; }

void updatePluginContentMargin(int spacing);

signals:
void recvMouseEvent(int type);

Expand Down
2 changes: 2 additions & 0 deletions src/loader/widgetplugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,8 @@ void WidgetPlugin::initConnections(Plugin::EmbedPlugin *plugin, PluginItem *plug
}
});

connect(plugin, &Plugin::EmbedPlugin::contentMarginChanged, pluginItem, &PluginItem::updatePluginContentMargin);

connect(pluginItem, &PluginItem::recvMouseEvent, plugin, &Plugin::EmbedPlugin::pluginRecvMouseEvent);
}

Expand Down
3 changes: 3 additions & 0 deletions src/protocol/plugin-manager-v1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@
<arg name="width" type="int"/>
<arg name="height" type="int"/>
</event>
<event name="margin">
<arg name="spacing" type="int"/>
</event>
<event name="raw_global_pos">
<arg name="x" type="int"/>
<arg name="y" type="int"/>
Expand Down
1 change: 1 addition & 0 deletions src/tray-wayland-integration/plugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class Q_DECL_EXPORT EmbedPlugin : public QObject
Q_SIGNALS:
void eventMessage(const QString &msg);
void eventGeometry(const QRect &geometry);
void contentMarginChanged(int32_t spacing);
void dockPositionChanged(uint32_t position);
void dockColorThemeChanged(uint32_t colorType);
void pluginSupportFlagChanged(bool);
Expand Down
7 changes: 7 additions & 0 deletions src/tray-wayland-integration/pluginsurface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@ void PluginSurface::plugin_geometry(int32_t x, int32_t y, int32_t width, int32_t
Q_EMIT m_plugin->eventGeometry(rect);
}

void PluginSurface::plugin_margin(int32_t spacing)
{
if (spacing > 0) {
Q_EMIT m_plugin->contentMarginChanged(spacing);
}
}

void PluginSurface::plugin_raw_global_pos(int32_t x, int32_t y)
{
m_plugin->setRawGlobalPos(QPoint(x, y));
Expand Down
1 change: 1 addition & 0 deletions src/tray-wayland-integration/pluginsurface_p.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class PluginSurface : public QtWaylandClient::QWaylandShellSurface, public QtWay
protected:
virtual void plugin_close() override;
virtual void plugin_geometry(int32_t x, int32_t y, int32_t width, int32_t height) override;
virtual void plugin_margin(int32_t spacing) override;
virtual void plugin_raw_global_pos(int32_t x, int32_t y) override;

private:
Expand Down