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

export clientpopup mapping state and use it to skip mouse driven focus changes

Browse source 
BUG: 81743
FIXED-IN: 4.9
REVIEW: 104620
This commit is contained in:
Thomas Lübking 2012-04-16 18:16:38 +02:00
parent 603eaca9d4
commit 7bdf96c2f3
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
events.cpp
View file

@ -879,7 +879,7 @@ void Client::enterNotifyEvent(XCrossingEvent* e)
} }
#undef MOUSE_DRIVEN_FOCUS #undef MOUSE_DRIVEN_FOCUS
if (options->focusPolicy() == Options::ClickToFocus) if (options->focusPolicy() == Options::ClickToFocus || workspace()->windowMenuShown())
return; return;
if (options->isAutoRaise() && !isDesktop() && if (options->isAutoRaise() && !isDesktop() &&

6
workspace.h
View file

@ -415,6 +415,7 @@ public:
*/ */
void showWindowMenu(int x, int y, Client* cl); void showWindowMenu(int x, int y, Client* cl);
void showWindowMenu(QPoint pos, Client* cl); void showWindowMenu(QPoint pos, Client* cl);
bool windowMenuShown();
void updateMinimizedOfTransients(Client*); void updateMinimizedOfTransients(Client*);
void updateOnAllDesktopsOfTransients(Client*); void updateOnAllDesktopsOfTransients(Client*);
@ -1039,6 +1040,11 @@ inline void Workspace::showWindowMenu(int x, int y, Client* cl)
showWindowMenu(QRect(QPoint(x, y), QPoint(x, y)), cl); showWindowMenu(QRect(QPoint(x, y), QPoint(x, y)), cl);
} }
inline bool Workspace::windowMenuShown()
{
return popup && ((QWidget*)popup)->isVisible();
}
inline void Workspace::setWasUserInteraction() inline void Workspace::setWasUserInteraction()
{ {
was_user_interaction = true; was_user_interaction = true;