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

Spellchecking

Browse source 
SVN_SILENT
This commit is contained in:
Martin Gräßlin 2012-08-16 08:03:07 +02:00
parent 628fb7f79d
commit 2c23c6e864
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activation.cpp
View file

@ -414,7 +414,7 @@ Client *Workspace::clientUnderMouse(int screen) const
} }
// rule out clients which are not really visible. // rule out clients which are not really visible.
// the screen test is rather superflous for xrandr & twinview since the geometry would differ -> TODO: might be dropped // the screen test is rather superfluous for xrandr & twinview since the geometry would differ -> TODO: might be dropped
if (!(client->isShown(false) && client->isOnCurrentDesktop() && if (!(client->isShown(false) && client->isOnCurrentDesktop() &&
client->isOnCurrentActivity() && client->isOnScreen(screen))) client->isOnCurrentActivity() && client->isOnScreen(screen)))
continue; continue;

2
composite.cpp
View file

@ -181,7 +181,7 @@ void Workspace::slotCompositingOptionsInitialized()
fpsInterval = qMax((fpsInterval / vBlankInterval) * vBlankInterval, vBlankInterval); fpsInterval = qMax((fpsInterval / vBlankInterval) * vBlankInterval, vBlankInterval);
} else } else
vBlankInterval = 1 << 10; // no sync - DO NOT set "0", would cause div-by-zero segfaults. vBlankInterval = 1 << 10; // no sync - DO NOT set "0", would cause div-by-zero segfaults.
m_timeSinceLastVBlank = fpsInterval - 1; // means "start now" - we dont't have even a slight idea when the first vsync will occur m_timeSinceLastVBlank = fpsInterval - 1; // means "start now" - we don't have even a slight idea when the first vsync will occur
checkCompositeTimer(); checkCompositeTimer();
XCompositeRedirectSubwindows(display(), rootWindow(), CompositeRedirectManual); XCompositeRedirectSubwindows(display(), rootWindow(), CompositeRedirectManual);
new EffectsHandlerImpl(scene->compositingType()); // sets also the 'effects' pointer new EffectsHandlerImpl(scene->compositingType()); // sets also the 'effects' pointer

2
scene_opengl_glx.cpp
View file

@ -633,7 +633,7 @@ void SceneOpenGL::screenGeometryChanged(const QSize &size)
m_overlayWindow->setup(buffer); m_overlayWindow->setup(buffer);
XSync(display(), false); // ensure X11 stuff has applied //// XSync(display(), false); // ensure X11 stuff has applied ////
glXMakeCurrent(display(), glxbuffer, ctxbuffer); // reactivate context //// glXMakeCurrent(display(), glxbuffer, ctxbuffer); // reactivate context ////
glViewport(0,0, size.width(), size.height()); // adjust viewport last - should btw. be superflous on the Pixmap buffer - iirc glXCreatePixmap sets the context anyway. //// glViewport(0,0, size.width(), size.height()); // adjust viewport last - should btw. be superfluous on the Pixmap buffer - iirc glXCreatePixmap sets the context anyway. ////
} }
ShaderManager::instance()->resetAllShaders(); ShaderManager::instance()->resetAllShaders();
m_resetModelViewProjectionMatrix = true; m_resetModelViewProjectionMatrix = true;

4
tabgroup.cpp
View file

@ -276,7 +276,7 @@ void TabGroup::updateMinMaxSize()
m_maxSize = m_maxSize.boundedTo((*i)->maxSize()); m_maxSize = m_maxSize.boundedTo((*i)->maxSize());
} }
// TODO: this actually resolves a conflict that should be catched when adding? // TODO: this actually resolves a conflict that should be caught when adding?
m_maxSize = m_maxSize.expandedTo(m_minSize); m_maxSize = m_maxSize.expandedTo(m_minSize);
// calculate this _once_ to get a common size. // calculate this _once_ to get a common size.
@ -294,7 +294,7 @@ void TabGroup::blockStateUpdates(bool more) {
more ? ++m_stateUpdatesBlocked : --m_stateUpdatesBlocked; more ? ++m_stateUpdatesBlocked : --m_stateUpdatesBlocked;
if (m_stateUpdatesBlocked < 0) { if (m_stateUpdatesBlocked < 0) {
m_stateUpdatesBlocked = 0; m_stateUpdatesBlocked = 0;
qWarning("TabGroup: Something is messed up with TabGroup::blockStateUpdates() invokation\nReleased more than blocked!"); qWarning("TabGroup: Something is messed up with TabGroup::blockStateUpdates() invocation\nReleased more than blocked!");
} }
} }