mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handling animations in apple_image.m. Loop counts are ignored for now 

svn path=/trunk/netsurf/; revision=12433
This commit is contained in:
Sven Weidauer 2011-05-19 13:18:01 +00:00
parent 658959bc88
commit 3cae7a7d86
1 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cocoa/apple_image.m
View File

@ -26,9 +26,13 @@
#include "desktop/plotters.h"
#include "utils/talloc.h"
#include "utils/utils.h"
#include "utils/schedule.h"
typedef struct apple_image_content {
struct content base;
NSUInteger frames;
NSUInteger currentFrame;
int *frameTimes;
} apple_image_content;
static nserror apple_image_create(const content_handler *handler,
@ -126,6 +130,28 @@ nserror apple_image_create(const content_handler *handler,
return NSERROR_OK;
}
static void animate_image_cb( void *ptr )
{
struct apple_image_content *ai = ptr;
++ai->currentFrame;
if (ai->currentFrame >= ai->frames) ai->currentFrame = 0;
[(NSBitmapImageRep *)ai->base.bitmap setProperty: NSImageCurrentFrame withValue: [NSNumber numberWithUnsignedInteger: ai->currentFrame]];
bitmap_modified( ai->base.bitmap );
union content_msg_data data;
data.redraw.full_redraw = true;
data.redraw.x = data.redraw.object_x = 0;
data.redraw.y = data.redraw.object_y = 0;
data.redraw.width = data.redraw.object_width = ai->base.width;
data.redraw.height = data.redraw.object_height = ai->base.height;
data.redraw.object = &ai->base;
content_broadcast( &ai->base, CONTENT_MSG_REDRAW, data );
schedule( ai->frameTimes[ai->currentFrame], animate_image_cb, ai );
}
/**
* Convert a CONTENT_APPLE_IMAGE for display.
*/
@ -156,6 +182,20 @@ bool apple_image_convert(struct content *c)
content_set_ready(c);
content_set_done(c);
content_set_status(c, "");
struct apple_image_content *ai = (struct apple_image_content *)c;
NSUInteger frames = [[image valueForProperty: NSImageFrameCount] unsignedIntegerValue];
if (frames > 1) {
ai->frames = frames;
ai->currentFrame = 0;
ai->frameTimes = talloc_zero_array( ai, int, ai->frames );
for (NSUInteger i = 0; i < frames; i++) {
[image setProperty: NSImageCurrentFrame withValue: [NSNumber numberWithUnsignedInteger: i]];
ai->frameTimes[i] = 100 * [[image valueForProperty: NSImageCurrentFrameDuration] floatValue];
}
[image setProperty: NSImageCurrentFrame withValue: [NSNumber numberWithUnsignedInteger: 0]];
schedule( ai->frameTimes[0], animate_image_cb, ai );
}
return true;
}
@ -165,6 +205,7 @@ void apple_image_destroy(struct content *c)
{
[(id)c->bitmap release];
c->bitmap = NULL;
schedule_remove( animate_image_cb, c );
}