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

break showingDesktop w/ tabbox/PW/DG

Browse source 
This is now crucial, because while before
(the minimized) windows were conditionally
shown, but are now always behind the desktop.
Also, it makes the tabbox more consistent.

BUG: 344083
REVIEW: 122679
This commit is contained in:
Thomas Lübking 2015-02-18 02:09:00 +01:00
parent cbfcd3b096
commit 0b6a804701
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
effects/desktopgrid/desktopgrid.cpp
View file

@ -1039,9 +1039,11 @@ void DesktopGridEffect::setActive(bool active)
return; // Already in that state return; // Already in that state
activated = active; activated = active;
if (activated && timeline.currentValue() == 0) if (activated) {
setup(); effects->setShowingDesktop(false);
if (!activated) { if (timeline.currentValue() == 0)
setup();
} else {
if (isUsingPresentWindows()) { if (isUsingPresentWindows()) {
QList<WindowMotionManager>::iterator it; QList<WindowMotionManager>::iterator it;
for (it = m_managers.begin(); it != m_managers.end(); ++it) { for (it = m_managers.begin(); it != m_managers.end(); ++it) {

1
effects/presentwindows/presentwindows.cpp
View file

@ -1422,6 +1422,7 @@ void PresentWindowsEffect::setActive(bool active)
return; return;
m_activated = active; m_activated = active;
if (m_activated) { if (m_activated) {
effects->setShowingDesktop(false);
m_needInitialSelection = true; m_needInitialSelection = true;
m_closeButtonCorner = (Qt::Corner)effects->kwinOption(KWin::CloseButtonCorner).toInt(); m_closeButtonCorner = (Qt::Corner)effects->kwinOption(KWin::CloseButtonCorner).toInt();
m_decalOpacity = 0.0; m_decalOpacity = 0.0;

1
tabbox/tabbox.cpp
View file

@ -730,6 +730,7 @@ void TabBox::show()
m_isShown = false; m_isShown = false;
return; return;
} }
workspace()->setShowingDesktop(false);
reference(); reference();
m_isShown = true; m_isShown = true;
m_tabBox->show(); m_tabBox->show();