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
19 changes: 18 additions & 1 deletion panels/dock/multitaskview/multitaskview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@
#include <DGuiApplicationHelper>

DGUI_USE_NAMESPACE
DCORE_USE_NAMESPACE

namespace dock {

constexpr int KWinOptimalPerformance = 4;
const QString windowEffectTypeKey = QStringLiteral("user_type");

MultiTaskView::MultiTaskView(QObject *parent)
: DApplet(parent)
, m_iconName("deepin-multitasking-view")
Expand All @@ -26,6 +30,19 @@ MultiTaskView::MultiTaskView(QObject *parent)
auto platformName = QGuiApplication::platformName();
if (QStringLiteral("wayland") == platformName) {
m_multitaskview.reset(new TreeLandMultitaskview);
} else {
m_kWinCompositingConfig = DConfig::create("org.kde.kwin", "org.kde.kwin.compositing", QString(), this);
m_kWinEffect = m_kWinCompositingConfig->value(windowEffectTypeKey).toInt() != KWinOptimalPerformance;

connect(m_kWinCompositingConfig, &DConfig::valueChanged, this, [=] (const QString &key) {
if (key == windowEffectTypeKey) {
bool kWinEffect = m_kWinCompositingConfig->value(windowEffectTypeKey).toInt() != KWinOptimalPerformance;
if (kWinEffect != m_kWinEffect) {
m_kWinEffect = kWinEffect;
Q_EMIT visibleChanged();
}
}
});
}
}

Expand Down Expand Up @@ -65,7 +82,7 @@ void MultiTaskView::setIconName(const QString& iconName)

bool MultiTaskView::visible() const
{
return m_visible && DWindowManagerHelper::instance()->hasComposite();
return m_kWinEffect && m_visible && DWindowManagerHelper::instance()->hasComposite();
}

DockItemInfo MultiTaskView::dockItemInfo()
Expand Down
6 changes: 5 additions & 1 deletion panels/dock/multitaskview/multitaskview.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include "dsglobal.h"
#include "treelandmultitaskview.h"

#include <DConfig>

namespace dock {

class MultiTaskView : public DS_NAMESPACE::DApplet
Expand Down Expand Up @@ -36,9 +38,11 @@ class MultiTaskView : public DS_NAMESPACE::DApplet
void visibleChanged();

private:
bool m_visible;
bool m_visible = true;
bool m_kWinEffect = true;
QString m_iconName;
QScopedPointer<TreeLandMultitaskview> m_multitaskview;
Dtk::Core::DConfig *m_kWinCompositingConfig = nullptr;
};

}