diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-02-27 02:56:01 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-27 02:56:01 +0100 |
| commit | 3fffa5bd81650ffae994df1158d17c9e1d9410d2 (patch) | |
| tree | 6cf8e93ad29709867617cb03b89bfbc6356126c5 /nx-X11/programs/Xserver/mi/mivaltree.c | |
| parent | eaae96101dfb2b341c61060e7cf280bf3b9084e0 (diff) | |
| parent | 7368b45408690620b8a9c051670888b684e44637 (diff) | |
| download | nx-libs-3fffa5bd81650ffae994df1158d17c9e1d9410d2.tar.gz nx-libs-3fffa5bd81650ffae994df1158d17c9e1d9410d2.tar.bz2 nx-libs-3fffa5bd81650ffae994df1158d17c9e1d9410d2.zip | |
Merge branch 'uli42-pr/update_mi' into 3.6.x
Attributes GH PR #650: https://github.com/ArcticaProject/nx-libs/pull/650
Diffstat (limited to 'nx-X11/programs/Xserver/mi/mivaltree.c')
| -rw-r--r-- | nx-X11/programs/Xserver/mi/mivaltree.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/nx-X11/programs/Xserver/mi/mivaltree.c b/nx-X11/programs/Xserver/mi/mivaltree.c index 0435925ed..21534cee0 100644 --- a/nx-X11/programs/Xserver/mi/mivaltree.c +++ b/nx-X11/programs/Xserver/mi/mivaltree.c @@ -237,6 +237,18 @@ miComputeClips ( dy = 32767; borderSize.y2 = dy; +#ifdef COMPOSITE + /* + * In redirected drawing case, reset universe to borderSize + */ + if (pParent->redirectDraw) + { + if (miSetRedirectBorderClipProc) + (*miSetRedirectBorderClipProc) (pParent, universe); + RegionCopy(universe, &pParent->borderSize); + } +#endif + oldVis = pParent->visibility; switch (RegionContainsRect(universe, &borderSize)) { @@ -276,18 +288,6 @@ miComputeClips ( ((pParent->eventMask | wOtherEventMasks(pParent)) & VisibilityChangeMask)) SendVisibilityNotify(pParent); -#ifdef COMPOSITE - /* - * In redirected drawing case, reset universe to borderSize - */ - if (pParent->redirectDraw) - { - if (miSetRedirectBorderClipProc) - (*miSetRedirectBorderClipProc) (pParent, universe); - RegionCopy(universe, &pParent->borderSize); - } -#endif - dx = pParent->drawable.x - pParent->valdata->before.oldAbsCorner.x; dy = pParent->drawable.y - pParent->valdata->before.oldAbsCorner.y; |