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

allow forcefull restacking

Browse source 
when restacking for shaded windows and uncomposited tabboxes
the group check should not be applied since we know better
eg. to restore a former order

CCBUG: 186206
REVIEW: 122469
This commit is contained in:
Thomas Lübking 2015-02-06 23:00:34 +01:00
parent 2a29324294
commit ea5a5f196d
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client.cpp
View file

@ -884,7 +884,7 @@ void Client::setShade(ShadeMode mode)
shade_geometry_change = false; shade_geometry_change = false;
if (was_shade_mode == ShadeHover) { if (was_shade_mode == ShadeHover) {
if (shade_below && workspace()->stackingOrder().indexOf(shade_below) > -1) if (shade_below && workspace()->stackingOrder().indexOf(shade_below) > -1)
workspace()->restack(this, shade_below); workspace()->restack(this, shade_below, true);
if (isActive()) if (isActive())
workspace()->activateNextClient(this); workspace()->activateNextClient(this);
} else if (isActive()) { } else if (isActive()) {

4
layers.cpp
View file

@ -432,10 +432,10 @@ void Workspace::lowerClientRequest(KWin::Client *c, NET::RequestSource src, xcb_
} }
void Workspace::restack(Client* c, Client* under) void Workspace::restack(Client* c, Client* under, bool force)
{ {
assert(unconstrained_stacking_order.contains(under)); assert(unconstrained_stacking_order.contains(under));
if (!Client::belongToSameApplication(under, c)) { if (!force && !Client::belongToSameApplication(under, c)) {
// put in the stacking order below _all_ windows belonging to the active application // put in the stacking order below _all_ windows belonging to the active application
for (int i = 0; i < unconstrained_stacking_order.size(); ++i) { for (int i = 0; i < unconstrained_stacking_order.size(); ++i) {
Client *other = qobject_cast<Client*>(unconstrained_stacking_order.at(i)); Client *other = qobject_cast<Client*>(unconstrained_stacking_order.at(i));

2
tabbox/tabbox.cpp
View file

@ -300,7 +300,7 @@ void TabBoxHandlerImpl::raiseClient(TabBoxClient* c) const
void TabBoxHandlerImpl::restack(TabBoxClient *c, TabBoxClient *under) void TabBoxHandlerImpl::restack(TabBoxClient *c, TabBoxClient *under)
{ {
Workspace::self()->restack(static_cast<TabBoxClientImpl*>(c)->client(), Workspace::self()->restack(static_cast<TabBoxClientImpl*>(c)->client(),
static_cast<TabBoxClientImpl*>(under)->client()); static_cast<TabBoxClientImpl*>(under)->client(), true);
} }
void TabBoxHandlerImpl::elevateClient(TabBoxClient *c, WId tabbox, bool b) const void TabBoxHandlerImpl::elevateClient(TabBoxClient *c, WId tabbox, bool b) const

2
workspace.h
View file

@ -176,7 +176,7 @@ public:
void raiseClientRequest(Client* c, NET::RequestSource src, xcb_timestamp_t timestamp); void raiseClientRequest(Client* c, NET::RequestSource src, xcb_timestamp_t timestamp);
void lowerClientRequest(Client* c, NET::RequestSource src, xcb_timestamp_t timestamp); void lowerClientRequest(Client* c, NET::RequestSource src, xcb_timestamp_t timestamp);
void restackClientUnderActive(Client*); void restackClientUnderActive(Client*);
void restack(Client *c, Client *under); void restack(Client *c, Client *under, bool force = false);
void updateClientLayer(Client* c); void updateClientLayer(Client* c);
void raiseOrLowerClient(Client*); void raiseOrLowerClient(Client*);
void resetUpdateToolWindowsTimer(); void resetUpdateToolWindowsTimer();