Differential D14973 Diff 40146 effects/diminactive/diminactive.cpp

Changeset View

Standalone View

View Options

effects/diminactive/diminactive.cpp

Show All 40 Lines
41 **/ 41​ **/
42static inline bool belongToSameGroup(const EffectWindow *w1, const EffectWindow *w2) 42​static inline bool belongToSameGroup(const EffectWindow *w1, const EffectWindow *w2)
43{ 43​{
44 return w1 && w2 && w1->group() && w1->group() == w2->group(); 44​ return w1 && w2 && w1->group() && w1->group() == w2->group();
45} 45​}
46 46​
47DimInactiveEffect::DimInactiveEffect() 47​DimInactiveEffect::DimInactiveEffect()
48{ 48​{
49 m_activeWindow = nullptr; ​
50 ​
51 initConfig<DimInactiveConfig>(); 49​ initConfig<DimInactiveConfig>();
52 reconfigure(ReconfigureAll); 50​ reconfigure(ReconfigureAll);
53 51​
54 connect(effects, &EffectsHandler::windowActivated, 52​ connect(effects, &EffectsHandler::windowActivated,
55 this, &DimInactiveEffect::windowActivated); 53​ this, &DimInactiveEffect::windowActivated);
56 connect(effects, &EffectsHandler::windowClosed, 54​ connect(effects, &EffectsHandler::windowClosed,
57 this, &DimInactiveEffect::windowClosed); 55​ this, &DimInactiveEffect::windowClosed);
58 connect(effects, &EffectsHandler::windowDeleted, 56​ connect(effects, &EffectsHandler::windowDeleted,
Show All 14 Lines67{
73 71​
74 // TODO: Use normalized strength param. 72​ // TODO: Use normalized strength param.
75 m_dimStrength = DimInactiveConfig::strength() / 100.0; 73​ m_dimStrength = DimInactiveConfig::strength() / 100.0;
76 m_dimPanels = DimInactiveConfig::dimPanels(); 74​ m_dimPanels = DimInactiveConfig::dimPanels();
77 m_dimDesktop = DimInactiveConfig::dimDesktop(); 75​ m_dimDesktop = DimInactiveConfig::dimDesktop();
78 m_dimKeepAbove = DimInactiveConfig::dimKeepAbove(); 76​ m_dimKeepAbove = DimInactiveConfig::dimKeepAbove();
79 m_dimByGroup = DimInactiveConfig::dimByGroup(); 77​ m_dimByGroup = DimInactiveConfig::dimByGroup();
80 78​
79​ // Need to reset m_activeWindow becase canDimWindow returns false
80​ // if m_activeWindow is equal to effects->activeWindow().
81​ m_activeWindow = nullptr;
82​
81 EffectWindow *activeWindow = effects->activeWindow(); 83​ EffectWindow *activeWindow = effects->activeWindow();
82 m_activeWindow = (activeWindow && canDimWindow(activeWindow)) 84​ m_activeWindow = (activeWindow && canDimWindow(activeWindow))
83 ? activeWindow 85​ ? activeWindow
84 : nullptr; 86​ : nullptr;
85 87​
86 m_activeWindowGroup = (m_dimByGroup && m_activeWindow) 88​ m_activeWindowGroup = (m_dimByGroup && m_activeWindow)
87 ? m_activeWindow->group() 89​ ? m_activeWindow->group()
88 : nullptr; 90​ : nullptr;
▲ Show 20 Lines • Show All 302 Lines • Show Last 20 Lines