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

keep + track m_closeWindow to keep m_winData alive

Browse source 
BUG: 259640
FIXED-IN: 4.10.2
REVIEW: 109509
This commit is contained in:
Thomas Lübking 2013-03-11 16:19:16 +01:00
parent 25fa3aac8c
commit 4babec9991
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
effects/presentwindows/presentwindows.cpp
View file

@ -64,6 +64,7 @@ PresentWindowsEffect::PresentWindowsEffect()
, m_highlightedWindow(NULL) , m_highlightedWindow(NULL)
, m_filterFrame(NULL) , m_filterFrame(NULL)
, m_closeView(NULL) , m_closeView(NULL)
, m_closeWindow(NULL)
, m_dragInProgress(false) , m_dragInProgress(false)
, m_dragWindow(NULL) , m_dragWindow(NULL)
, m_highlightedDropTarget(NULL) , m_highlightedDropTarget(NULL)
@ -217,7 +218,7 @@ void PresentWindowsEffect::postPaintScreen()
{ {
if (m_motionManager.areWindowsMoving()) if (m_motionManager.areWindowsMoving())
effects->addRepaintFull(); effects->addRepaintFull();
else if (!m_activated && m_motionManager.managingWindows()) { else if (!m_activated && m_motionManager.managingWindows() && !m_closeWindow) {
// We have finished moving them back, stop processing // We have finished moving them back, stop processing
m_motionManager.unmanageAll(); m_motionManager.unmanageAll();
@ -261,7 +262,7 @@ void PresentWindowsEffect::prePaintWindow(EffectWindow *w, WindowPrePaintData &d
{ {
// TODO: We should also check to see if any windows are fading just in case fading takes longer // TODO: We should also check to see if any windows are fading just in case fading takes longer
// than moving the windows when the effect is deactivated. // than moving the windows when the effect is deactivated.
if (m_activated || m_motionManager.areWindowsMoving()) { if (m_activated || m_motionManager.areWindowsMoving() || m_closeWindow) {
DataHash::iterator winData = m_windowData.find(w); DataHash::iterator winData = m_windowData.find(w);
if (winData == m_windowData.end()) { if (winData == m_windowData.end()) {
effects->prePaintWindow(w, data, time); effects->prePaintWindow(w, data, time);
@ -306,6 +307,9 @@ void PresentWindowsEffect::prePaintWindow(EffectWindow *w, WindowPrePaintData &d
// we have to keep the window in the list to prevent flickering // we have to keep the window in the list to prevent flickering
winData->referenced = false; winData->referenced = false;
w->unrefWindow(); w->unrefWindow();
if (w == m_closeWindow) {
m_closeWindow = NULL;
}
} else } else
w->enablePainting(EffectWindow::PAINT_DISABLED_BY_DELETE); w->enablePainting(EffectWindow::PAINT_DISABLED_BY_DELETE);
} }
@ -437,6 +441,15 @@ void PresentWindowsEffect::slotWindowAdded(EffectWindow *w)
rearrangeWindows(); rearrangeWindows();
} }
if (m_closeView && w == effects->findWindow(m_closeView->winId())) { if (m_closeView && w == effects->findWindow(m_closeView->winId())) {
if (m_closeWindow != w) {
DataHash::iterator winDataIt = m_windowData.find(m_closeWindow);
if (winDataIt != m_windowData.end()) {
if (winDataIt->referenced) {
m_closeWindow->unrefWindow();
}
m_windowData.erase(winDataIt);
}
}
winData->visible = true; winData->visible = true;
winData->highlight = 1.0; winData->highlight = 1.0;
m_closeWindow = w; m_closeWindow = w;
@ -452,13 +465,14 @@ void PresentWindowsEffect::slotWindowClosed(EffectWindow *w)
if (winData == m_windowData.end()) if (winData == m_windowData.end())
return; return;
winData->deleted = true; winData->deleted = true;
winData->referenced = true; if (!winData->referenced) {
w->refWindow(); winData->referenced = true;
w->refWindow();
}
if (m_highlightedWindow == w) if (m_highlightedWindow == w)
setHighlightedWindow(findFirstWindow()); setHighlightedWindow(findFirstWindow());
if (m_closeWindow == w) { if (m_closeWindow == w) {
m_closeWindow = 0; return; // don't rearrange, get's nulled when unref'd
return; // don't rearrange
} }
rearrangeWindows(); rearrangeWindows();