diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-01-29 17:19:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-01-29 17:19:44 (GMT) |
| commit | 1a6d62c5dca9ce2df6bbbc80a421ab57a9b08d74 (patch) | |
| tree | 53040e8f6024cafa32bb61391bc131bd032e521d /generic | |
| parent | 37b3e1480269a92d70a9719e209de5d97915ec09 (diff) | |
| parent | da25a7797c2973374084e2d355ac41ae55146902 (diff) | |
| download | tk-1a6d62c5dca9ce2df6bbbc80a421ab57a9b08d74.zip tk-1a6d62c5dca9ce2df6bbbc80a421ab57a9b08d74.tar.gz tk-1a6d62c5dca9ce2df6bbbc80a421ab57a9b08d74.tar.bz2 | |
Bug-3480634: PNG Images missing in menus on Mac
FossilOrigin-Name: 584ec155fe6ab0766124d7b3e06e807b348cc206
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkImgPhInstance.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/generic/tkImgPhInstance.c b/generic/tkImgPhInstance.c index 04f65e2..5429ee3 100644 --- a/generic/tkImgPhInstance.c +++ b/generic/tkImgPhInstance.c @@ -635,7 +635,8 @@ TkImgPhotoDisplay( (unsigned int)width, (unsigned int)height, AllPlanes, ZPixmap); if (bgImg == NULL) { Tk_DeleteErrorHandler(handler); - return; + /* We failed to get the image so draw without blending alpha. It's the best we can do */ + goto fallBack; } BlendComplexAlpha(bgImg, instancePtr, imageX, imageY, width, height); @@ -657,6 +658,7 @@ TkImgPhotoDisplay( * origin appropriately, and use it when drawing the image. */ + fallBack: TkSetRegion(display, instancePtr->gc, instancePtr->masterPtr->validRegion); XSetClipOrigin(display, instancePtr->gc, drawableX - imageX, |