yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.19'

Browse source
This commit is contained in:
Nate Graham 2020-06-22 07:49:27 -06:00
commit 2af16f1ee0
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
kcmkwin/kwincompositing/main.cpp
View file

@ -70,11 +70,6 @@ private:
OrgKdeKwinCompositingInterface *m_compositingInterface; OrgKdeKwinCompositingInterface *m_compositingInterface;
KWinCompositingSetting *m_settings; KWinCompositingSetting *m_settings;
// unmanaged states
int m_backend;
bool m_glCore;
double m_animationDurationFactor;
}; };
static const QVector<qreal> s_animationMultipliers = {8, 4, 2, 1, 0.5, 0.25, 0.125, 0}; static const QVector<qreal> s_animationMultipliers = {8, 4, 2, 1, 0.5, 0.25, 0.125, 0};
@ -215,10 +210,10 @@ void KWinCompositingKCM::updateUnmanagedItemStatus()
const bool inPlasma = isRunningPlasma(); const bool inPlasma = isRunningPlasma();
bool changed = glCore != m_glCore; bool changed = glCore != m_settings->glCore();
changed |= backend != m_backend; changed |= backend != m_settings->backend();
if (!inPlasma) { if (!inPlasma) {
changed |= (animationDuration != m_animationDurationFactor); changed |= (animationDuration != m_settings->animationDurationFactor());
} }
unmanagedWidgetChangeState(changed); unmanagedWidgetChangeState(changed);
@ -244,10 +239,9 @@ void KWinCompositingKCM::load()
m_settings->findItem("Backend")->readConfig(m_settings->config()); m_settings->findItem("Backend")->readConfig(m_settings->config());
m_settings->findItem("glCore")->readConfig(m_settings->config()); m_settings->findItem("glCore")->readConfig(m_settings->config());
m_backend = m_settings->backend();
m_glCore = m_settings->glCore(); if (m_settings->backend() == KWinCompositingSetting::EnumBackend::OpenGL) {
if (m_backend == KWinCompositingSetting::EnumBackend::OpenGL) { if (m_settings->glCore()) {
if (m_glCore) {
m_form.backend->setCurrentIndex(CompositingTypeIndex::OPENGL31_INDEX); m_form.backend->setCurrentIndex(CompositingTypeIndex::OPENGL31_INDEX);
} else { } else {
m_form.backend->setCurrentIndex(CompositingTypeIndex::OPENGL20_INDEX); m_form.backend->setCurrentIndex(CompositingTypeIndex::OPENGL20_INDEX);