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

resolve merge conflict

Browse source
This commit is contained in:
Thomas Lübking 2012-03-07 22:02:26 +01:00
commit 357b6b5338
3 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manage.cpp
View file

@ -207,7 +207,7 @@ bool Client::manage(Window w, bool isMapped)
}
}
if (desk == 0) // Assume window wants to be visible on the current desktop
desk = workspace()->currentDesktop();
desk = isDesktop() ? NET::OnAllDesktops : workspace()->currentDesktop();
desk = rules()->checkDesktop(desk, !isMapped);
if (desk != NET::OnAllDesktops) // Do range check
desk = qMax(1, qMin(workspace()->numberOfDesktops(), desk));

10
scene_xrender.cpp
View file

@ -653,10 +653,12 @@ XRenderComposite(display(), PictOpOver, m_xrenderShadow->shadowPixmap(SceneXRend
#undef RENDER_SHADOW_TILE
// Paint the window contents
Picture clientAlpha = opaque ? None : alphaMask(data.opacity);
XRenderComposite(display(), clientRenderOp, pic, clientAlpha, renderTarget, cr.x(), cr.y(), 0, 0, dr.x(), dr.y(), dr.width(), dr.height());
if (!opaque)
transformed_shape = QRegion();
if (!(client && client->isShade())) {
Picture clientAlpha = opaque ? None : alphaMask(data.opacity);
XRenderComposite(display(), clientRenderOp, pic, clientAlpha, renderTarget, cr.x(), cr.y(), 0, 0, dr.x(), dr.y(), dr.width(), dr.height());
if (!opaque)
transformed_shape = QRegion();
}
#define RENDER_DECO_PART(_PART_, _RECT_) \
XRenderComposite(display(), PictOpOver, _PART_->x11PictureHandle(), decorationAlpha, renderTarget,\

13
useractions.cpp
View file

@ -799,7 +799,7 @@ bool Client::performMouseCommand(Options::MouseCommand command, const QPoint &gl
workspace()->lowerClient(this);
// used to be activateNextClient(this), then topClientOnDesktop
// since this is a mouseOp it's however safe to use the client under the mouse instead
if (isActive()) {
if (isActive() && options->focusPolicyIsReasonable()) {
Client *next = workspace()->clientUnderMouse(screen());
if (next && next != this)
workspace()->requestFocus(next, false);
@ -1208,8 +1208,15 @@ void Workspace::slotWindowLower()
// As this most likely makes the window no longer visible change the
// keyboard focus to the next available window.
//activateNextClient( c ); // Doesn't work when we lower a child window
if (active_client->isActive())
activateClient(topClientOnDesktop(currentDesktop(), -1));
if (active_client->isActive() && options->focusPolicyIsReasonable()) {
if (options->nextFocusPrefersMouse) {
Client *next = clientUnderMouse(active_client->screen());
if (next && next != active_client)
requestFocus(next, false);
} else {
activateClient(topClientOnDesktop(currentDesktop(), -1));
}
}
}
}