changeset 2436:ab36fbb50fe5

iOS: Fixes to get cachedImage functionality working.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 06 Apr 2021 08:54:57 +0000
parents 7d6c8b7f41d9
children 929ce3cd18ea
files ios/dw.m
diffstat 1 files changed, 2 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/ios/dw.m	Tue Apr 06 08:24:28 2021 +0000
+++ b/ios/dw.m	Tue Apr 06 08:54:57 2021 +0000
@@ -808,7 +808,7 @@
 @end
 
 /* Subclass for a render area type */
-@interface DWRender : UIControl
+@interface DWRender : UIView
 {
     void *userdata;
     UIFont *font;
@@ -1202,7 +1202,6 @@
     while(rend = [enumerator nextObject])
         [rend setNeedsDisplay];
     [_DWDirtyDrawables removeAllObjects];
-    UIGraphicsEndImageContext();
 }
 -(void)doWindowFunc:(id)param
 {
@@ -5229,13 +5228,6 @@
 
         context = [image cgcontext];
     }
-    else if([source isMemberOfClass:[DWRender class]])
-    {
-        DWRender *render = source;
-
-        UIGraphicsBeginImageContext([render frame].size);
-        context = UIGraphicsGetCurrentContext();
-    }
     if(context)
         CGContextSetAllowsAntialiasing(context, antialiased);
     return context;
@@ -7077,7 +7069,7 @@
     bi = [NSValue valueWithPointer:bltinfo];
 
     /* Fill in the information */
-    bltinfo->dest = dest;
+    bltinfo->dest = _dw_dest_image(destp, dest);
     bltinfo->src = src;
     bltinfo->xdest = xdest;
     bltinfo->ydest = ydest;
@@ -7088,10 +7080,6 @@
     bltinfo->srcwidth = srcwidth;
     bltinfo->srcheight = srcheight;
 
-    if(destp)
-    {
-        bltinfo->dest = (id)destp->image;
-    }
     if(srcp)
     {
         id object = bltinfo->src = (id)srcp->image;