Commit e6bfe5d4 authored by David Edmundson's avatar David Edmundson

Fix system tray settings if placed on desktop

The DesktopView replaces the default ConfigView for itself with a
specialised ContainmentConfigView. It's only loaded by the desktop, and
is more of a Desktop-ConfigView than generic containment.

The system tray applet doesn't show it's own config, but instead shows a
config of its internal system tray containment by overriding the
configure action.

This causes the desktop view to mistakenly shows it's specialised
desktop config view when the system tray is configured.

This patch adds an explicit check on the containment type.

Test Plan:
Clicked on sys tray settings on desktop
Clicked on normal desktop settings
Clicked on sys tray settings on panel

Reviewers: #plasma, broulik

Reviewed By: #plasma, broulik

Subscribers: plasma-devel

Tags: #plasma

Differential Revision:
parent 8352711f
......@@ -264,7 +264,7 @@ void DesktopView::showConfigurationInterface(Plasma::Applet *applet)
Plasma::Containment *cont = qobject_cast<Plasma::Containment *>(applet);
if (cont && cont->isContainment()) {
if (cont && cont->isContainment() && cont->containmentType() == Plasma::Types::DesktopContainment) {
m_configView = new ContainmentConfigView(cont);
//if we changed containment with the config open, relaunch the config dialog but for the new containment
//third arg is used to disconnect when the config closes
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment