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

Fix closeview hiding: move it outside rootgeometry

Browse source 
The closeview is not hidden because that causes
invalid textures (apparently QML related) and
deleting/recreating causes massive I/O overhead
on effect invocation.

As last resort, the window is "hidden" by moving
it out of the root window geometry.

Jonathan, please RESPIN kwin - sorry for the trouble
... again.

BUG: 345159
REVIEW: 123035
CC: riddell@gmail.com
This commit is contained in:
Thomas Lübking 2015-03-20 22:34:42 +01:00
parent ff321a62e3
commit e26a3db030
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
effects/presentwindows/presentwindows.cpp
View file

@ -197,7 +197,7 @@ void PresentWindowsEffect::postPaintScreen()
{
if (m_motionManager.areWindowsMoving())
effects->addRepaintFull();
else if (!m_activated && m_motionManager.managingWindows() && !m_closeWindow) {
else if (!m_activated && m_motionManager.managingWindows() && !(m_closeWindow && m_closeView->isVisible())) {
// We have finished moving them back, stop processing
m_motionManager.unmanageAll();
@ -494,7 +494,8 @@ void PresentWindowsEffect::slotWindowGeometryShapeChanged(EffectWindow* w, const
return;
if (!m_windowData.contains(w))
return;
rearrangeWindows();
if (w != m_closeWindow)
rearrangeWindows();
}
bool PresentWindowsEffect::borderActivated(ElectricBorder border)
@ -1593,7 +1594,7 @@ bool PresentWindowsEffect::isSelectableWindow(EffectWindow *w)
bool PresentWindowsEffect::isVisibleWindow(EffectWindow *w)
{
if (w->isDesktop())
if (w->isDesktop() || w == m_closeWindow)
return true;
return isSelectableWindow(w);
}
@ -1620,7 +1621,7 @@ void PresentWindowsEffect::setHighlightedWindow(EffectWindow *w)
void PresentWindowsEffect::elevateCloseWindow()
{
if (!m_closeView)
if (!m_closeView || !m_activated)
return;
if (EffectWindow *cw = effects->findWindow(m_closeView->winId()))
effects->setElevatedWindow(cw, true);
@ -1630,7 +1631,8 @@ void PresentWindowsEffect::updateCloseWindow()
{
if (!m_closeView || m_doNotCloseWindows)
return;
if (!m_highlightedWindow || m_highlightedWindow->isDesktop()) {
if (!m_activated || !m_highlightedWindow || m_highlightedWindow->isDesktop()) {
m_closeView->hide();
return;
}
@ -1878,6 +1880,7 @@ CloseWindowView::CloseWindowView(QObject *parent)
, m_armTimer(new QElapsedTimer())
, m_window(new QQuickView())
, m_visible(false)
, m_posIsValid(false)
{
m_window->setFlags(Qt::X11BypassWindowManagerHint);
m_window->setColor(Qt::transparent);
@ -1913,12 +1916,21 @@ bool CloseWindowView::isVisible() const
void CloseWindowView::show()
{
if (!m_visible && m_posIsValid) {
m_window->setPosition(m_pos);
m_posIsValid = false;
}
m_visible = true;
m_window->show();
}
void CloseWindowView::hide()
{
if (!m_posIsValid) {
m_pos = m_window->position();
m_posIsValid = true;
m_window->setPosition(-m_window->width(), -m_window->height());
}
m_visible = false;
QEvent event(QEvent::Leave);
qApp->sendEvent(m_window.data(), &event);
@ -1940,6 +1952,7 @@ DELEGATE(WId, winId)
void CloseWindowView::setGeometry(const QRect &geometry)
{
m_posIsValid = false;
m_window->setGeometry(geometry);
}

2
effects/presentwindows/presentwindows.h
View file

@ -59,6 +59,8 @@ private:
QScopedPointer<QElapsedTimer> m_armTimer;
QScopedPointer<QQuickView> m_window;
bool m_visible;
QPoint m_pos;
bool m_posIsValid;
};
/**