Differential D8388 Diff 21029 effects/presentwindows/presentwindows.cpp

Changeset View

Standalone View

View Options

effects/presentwindows/presentwindows.cpp

Context not available.
162 m_leftButtonDesktop = (DesktopMouseAction)PresentWindowsConfig::leftButtonDesktop(); 162​ m_leftButtonDesktop = (DesktopMouseAction)PresentWindowsConfig::leftButtonDesktop();
163 m_middleButtonDesktop = (DesktopMouseAction)PresentWindowsConfig::middleButtonDesktop(); 163​ m_middleButtonDesktop = (DesktopMouseAction)PresentWindowsConfig::middleButtonDesktop();
164 m_rightButtonDesktop = (DesktopMouseAction)PresentWindowsConfig::rightButtonDesktop(); 164​ m_rightButtonDesktop = (DesktopMouseAction)PresentWindowsConfig::rightButtonDesktop();
165​ m_unhoverBright = PresentWindowsConfig::unhoverBright();
165 166​
166 // touch screen edges 167​ // touch screen edges
167 const QVector<ElectricBorder> relevantBorders{ElectricLeft, ElectricTop, ElectricRight, ElectricBottom}; 168​ const QVector<ElectricBorder> relevantBorders{ElectricLeft, ElectricTop, ElectricRight, ElectricBottom};
Context not available.
313 if (w == m_highlightedWindow || w == m_closeWindow || !m_activated) 314​ if (w == m_highlightedWindow || w == m_closeWindow || !m_activated)
314 winData->highlight = qMin(1.0, winData->highlight + time / m_fadeDuration); 315​ winData->highlight = qMin(1.0, winData->highlight + time / m_fadeDuration);
315 else if (!isInMotion && w->isDesktop()) 316​ else if (!isInMotion && w->isDesktop())
316 winData->highlight = 0.3; 317​ winData->highlight = m_unhoverBright;
ZrenUnsubmitted
Not Done

There's code in PresentWindowsEffect::postPaintScreen() that fires if it's using the magic number 0.3.

if (i.value().highlight != 0.3)

winData->highlight is used to tell us how far into a "scale + brightness" tween we're in.

data.multiplyBrightness(interpolate(0.4, 1.0, winData->highlight));
const qreal scale = interpolate(1.0, tScale, winData->highlight);
tx = qRound((tx-rect.x())*winData->highlight);
ty = qRound((ty-rect.y())*winData->highlight);
rect.setWidth(rect.width()*scale);
rect.setHeight(rect.height()*scale);

So it controls more than just the brightness.

We could change the code to:

data.multiplyBrightness(interpolate(m_unhoverBright, 1.0, winData->highlight));

Which I know works: https://www.youtube.com/watch?v=QEHC43zMIMc#t=6m00

Zren: There's code in `PresentWindowsEffect::postPaintScreen()` that fires if it's using the magic…
317 else 318​ else
318 winData->highlight = qMax(0.0, winData->highlight - time / m_fadeDuration); 319​ winData->highlight = qMax(0.0, winData->highlight - time / m_fadeDuration);
319 320​
Context not available.
2055} 2056​}
2056 2057​
2057} // namespace 2058​} // namespace
2058 ​
Context not available.