diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-21 12:07:37 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-21 12:17:06 +0200 |
| commit | 61d5cd0b75acc0ca3bfe2b6addc052c4aae8e6f2 (patch) | |
| tree | b9cd23a2b71f8461a7492b28c6cd8d91c9c7d07d /nx-X11/programs/Xserver/hw/nxagent/Render.c | |
| parent | f3d406109310404f14c9f489e89e70dfe8ed1119 (diff) | |
| download | nx-libs-61d5cd0b75acc0ca3bfe2b6addc052c4aae8e6f2.tar.gz nx-libs-61d5cd0b75acc0ca3bfe2b6addc052c4aae8e6f2.tar.bz2 nx-libs-61d5cd0b75acc0ca3bfe2b6addc052c4aae8e6f2.zip | |
Revert "NXpicturestr_PictSolidFill.h: Drop file and revert db8705. Not an issue anymore nowadays."
This reverts commit 6c8c950258cf0da0cf24c5e80c2216914ac282a4.
Fixes ArcticaProject/nx-libs#433.
This patch is still a candidate for being re-implemented without extending the
_PictSolidFill struct, but for now, we'll have to re-introduce commit db8705
for the sake of having fonts readable after resumption of remote NX sessions.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Render.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Render.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index bab6b7989..753134eb3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -2662,11 +2662,17 @@ void nxagentReconnectPicture(void * p0, XID x1, void *p2) #endif } - if (!pForm) - { - *pBool = False; - - return; + if (!pForm && pPicture->pSourcePict) + { + /*possible we need to add support for other picture types, for example gradients...*/ + switch(pPicture->pSourcePict->type) + { + case SourcePictTypeSolidFill: + nxagentPicturePriv(pPicture) -> picture = XRenderCreateSolidFill(nxagentDisplay, + (const XRenderColor*) &pPicture->pSourcePict->solidFill.fullColor); + break; + } + return; } #ifdef TEST |