always return all the actuions
it's task of the visualization(the toolbox) to show or hide them BUG:345788 Change-Id: I267ba99d7300b52c03877868204d628098d3c2aa
This commit is contained in:
parent
b2583a9368
commit
48dd5963d3
@ -167,6 +167,11 @@ void ContainmentInterface::init()
|
|||||||
connect(m_containment.data(), &Plasma::Containment::containmentTypeChanged,
|
connect(m_containment.data(), &Plasma::Containment::containmentTypeChanged,
|
||||||
this, &ContainmentInterface::containmentTypeChanged);
|
this, &ContainmentInterface::containmentTypeChanged);
|
||||||
|
|
||||||
|
connect(m_containment.data()->actions(), &KActionCollection::inserted,
|
||||||
|
this, &ContainmentInterface::actionsChanged);
|
||||||
|
connect(m_containment.data()->actions(), &KActionCollection::removed,
|
||||||
|
this, &ContainmentInterface::actionsChanged);
|
||||||
|
|
||||||
if (m_containment->corona()) {
|
if (m_containment->corona()) {
|
||||||
connect(m_containment->corona(), &Plasma::Corona::availableScreenRegionChanged,
|
connect(m_containment->corona(), &Plasma::Corona::availableScreenRegionChanged,
|
||||||
this, &ContainmentInterface::availableScreenRegionChanged);
|
this, &ContainmentInterface::availableScreenRegionChanged);
|
||||||
@ -797,7 +802,7 @@ QList<QObject *> ContainmentInterface::actions() const
|
|||||||
|
|
||||||
foreach (const QString &name, actionOrder) {
|
foreach (const QString &name, actionOrder) {
|
||||||
QAction *a = orderedActions.value(name);
|
QAction *a = orderedActions.value(name);
|
||||||
if (a && a->isVisible() && !a->menu()) {
|
if (a && !a->menu()) {
|
||||||
actionList << a;
|
actionList << a;
|
||||||
}
|
}
|
||||||
++i;
|
++i;
|
||||||
|
Loading…
Reference in New Issue
Block a user