diff options
author | Kristian Lyngstol <kristian@bohemians.org> | 2007-12-10 15:13:02 +0100 |
---|---|---|
committer | Kristian Lyngstol <kristian@windu.lyngstol.net> | 2007-12-10 15:13:02 +0100 |
commit | b1c0dd01268d7d5b38c0cbb04130dcf8e26cbafb (patch) | |
tree | 39009d2313de81bb7e459ddfa66b5cea2040eb23 /shelf.c | |
parent | ca754ce718f64795ffdf62b56fe4247c88be1297 (diff) | |
download | shelf-b1c0dd01268d7d5b38c0cbb04130dcf8e26cbafb.tar.gz shelf-b1c0dd01268d7d5b38c0cbb04130dcf8e26cbafb.tar.bz2 |
Further style cleanups
Diffstat (limited to 'shelf.c')
-rw-r--r-- | shelf.c | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -54,13 +54,13 @@ static int screenPrivateIndex; /* Initially triggered keybinding. */ static Bool -shelfTrigger(CompDisplay *d, - CompAction *action, - CompActionState state, - CompOption *option, - int nOption) +shelfTrigger (CompDisplay *d, + CompAction *action, + CompActionState state, + CompOption *option, + int nOption) { - CompWindow *w = findWindowAtDisplay(d, d->activeWindow); + CompWindow *w = findWindowAtDisplay (d, d->activeWindow); if (!w) return TRUE; SHELF_SCREEN (w->screen); @@ -119,12 +119,16 @@ shelfPaintWindow (CompWindow *w, { CompTransform mTransform = *transform; int xOrigin, yOrigin; + xOrigin = w->attrib.x - w->input.left; yOrigin = w->attrib.y - w->input.top; + matrixTranslate (&mTransform, xOrigin, yOrigin, 0); matrixScale (&mTransform, sw->scale, sw->scale, 0); matrixTranslate (&mTransform, -xOrigin, -yOrigin, 0); + mask |= PAINT_WINDOW_TRANSFORMED_MASK; + UNWRAP (ss, s, paintWindow); status = (*s->paintWindow) (w, attrib, &mTransform, region, mask); WRAP (ss, s, paintWindow, shelfPaintWindow); |