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

Move common code out of if/else

Browse source 
Summary: Less duplication is better.

Reviewers: #kwin, romangg

Reviewed By: #kwin, romangg

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D23101
This commit is contained in:
Frederik Gladhorn 2019-08-11 22:15:38 +02:00
parent 12886cf442
commit 75e96010a3
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
useractions.cpp
View file

@ -152,18 +152,15 @@ void UserActionsMenu::show(const QRect &pos, AbstractClient *client)
int x = pos.left();
int y = pos.bottom();
const bool needsPopup = kwinApp()->shouldUseWaylandForCompositing();
m_client->blockActivityUpdates(true);
if (y == pos.top()) {
m_client->blockActivityUpdates(true);
if (needsPopup) {
m_menu->popup(QPoint(x, y));
} else {
m_menu->exec(QPoint(x, y));
}
if (m_client) {
m_client->blockActivityUpdates(false);
}
} else {
m_client->blockActivityUpdates(true);
QRect area = ws->clientArea(ScreenArea, QPoint(x, y), VirtualDesktopManager::self()->current());
menuAboutToShow(); // needed for sizeHint() to be correct :-/
int popupHeight = m_menu->sizeHint().height();
@ -180,9 +177,9 @@ void UserActionsMenu::show(const QRect &pos, AbstractClient *client)
m_menu->exec(QPoint(x, pos.top() - popupHeight));
}
}
if (m_client) {
m_client->blockActivityUpdates(false);
}
}
if (m_client) {
m_client->blockActivityUpdates(false);
}
}