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

Merge branch 'KDE/4.10'

Browse source
This commit is contained in:
Martin Gräßlin 2012-12-22 11:46:45 +01:00
commit 07e12d174d
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene_opengl.cpp
View file

@ -462,7 +462,9 @@ bool SceneOpenGL2::supported(OpenGLBackend *backend)
} }
if (GLPlatform::instance()->recommendedCompositor() < OpenGL2Compositing) { if (GLPlatform::instance()->recommendedCompositor() < OpenGL2Compositing) {
kDebug(1212) << "Driver does not recommend OpenGL 2 compositing"; kDebug(1212) << "Driver does not recommend OpenGL 2 compositing";
#ifndef KWIN_HAVE_OPENGLES
return false; return false;
#endif
} }
if (options->isGlLegacy()) { if (options->isGlLegacy()) {
kDebug(1212) << "OpenGL 2 disabled by config option"; kDebug(1212) << "OpenGL 2 disabled by config option";

7
useractions.cpp
View file

@ -127,7 +127,7 @@ bool UserActionsMenu::isShown() const
bool UserActionsMenu::hasClient() const bool UserActionsMenu::hasClient() const
{ {
return !m_client.isNull(); return !m_client.isNull() && isShown();
} }
void UserActionsMenu::close() void UserActionsMenu::close()
@ -136,7 +136,7 @@ void UserActionsMenu::close()
return; return;
} }
m_menu->close(); m_menu->close();
m_client.clear();; m_client.clear();
} }
bool UserActionsMenu::isMenuClient(const Client *c) const bool UserActionsMenu::isMenuClient(const Client *c) const
@ -153,7 +153,7 @@ void UserActionsMenu::show(const QRect &pos, const QWeakPointer<Client> &cl)
return; return;
if (cl.isNull()) if (cl.isNull())
return; return;
if (!m_client.isNull()) // recursion if (isShown()) // recursion
return; return;
if (cl.data()->isDesktop() if (cl.data()->isDesktop()
|| cl.data()->isDock()) || cl.data()->isDock())
@ -175,7 +175,6 @@ void UserActionsMenu::show(const QRect &pos, const QWeakPointer<Client> &cl)
else else
m_menu->exec(QPoint(x, pos.top() - popupHeight)); m_menu->exec(QPoint(x, pos.top() - popupHeight));
} }
m_client.clear();;
} }
void UserActionsMenu::helperDialog(const QString& message, const QWeakPointer<Client> &c) void UserActionsMenu::helperDialog(const QString& message, const QWeakPointer<Client> &c)