eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

draw from imagerep directly

This commit is contained in:
anthony 2020-11-26 20:03:15 +00:00
parent 6df756888f
commit b5e0a05292
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
frontends/gnustep/PlotView.m
View File

@ -189,9 +189,6 @@ static nserror plot_bitmap(const struct redraw_context *ctx, struct bitmap *bitm
NSBitmapImageRep *bmp = (id)bitmap; NSBitmapImageRep *bmp = (id)bitmap;
NSRect rect = NSMakeRect(x, y, width, height ); NSRect rect = NSMakeRect(x, y, width, height );
NSImage *image = [[NSImage alloc] init];
[image addRepresentation: bmp];
NSAffineTransform *tf = [GSCurrentContext() GSCurrentCTM]; NSAffineTransform *tf = [GSCurrentContext() GSCurrentCTM];
int offset = (y + (height / 2)); int offset = (y + (height / 2));
@ -199,33 +196,34 @@ static nserror plot_bitmap(const struct redraw_context *ctx, struct bitmap *bitm
[tf scaleXBy: 1.0 yBy: -1.0]; [tf scaleXBy: 1.0 yBy: -1.0];
[tf translateXBy: 0 yBy: -offset]; [tf translateXBy: 0 yBy: -offset];
[GSCurrentContext() GSSetCTM: tf]; [GSCurrentContext() GSSetCTM: tf];
[image drawRepresentation: bmp inRect: rect]; if ([bmp isOpaque]) {
[image release]; NSLog(@"Opaque!!!!!");
} else {
NSLog(@"Not opaque!!!");
}
if ([bmp hasAlpha]) {
NSLog(@"hasAlpha!!!!!");
} else {
NSLog(@"Not hasAlpha!!!");
}
[[NSColor redColor] set];
[GSCurrentContext() setCompositingOperation: NSCompositeSourceOver];
[bmp drawInRect: rect];
[NSGraphicsContext restoreGraphicsState]; [NSGraphicsContext restoreGraphicsState];
return NSERROR_OK; return NSERROR_OK;
} }
void testfn(int x, int y, const char *txt, size_t len) {
NSLog(@"plot_text len %d", len);
NSLog(@"plot_text val %s", txt);
}
NSLayoutManager *cocoa_prepare_layout_manager( const char *bytes, size_t length, const plot_font_style_t *style ); NSLayoutManager *cocoa_prepare_layout_manager( const char *bytes, size_t length, const plot_font_style_t *style );
extern NSTextStorage *cocoa_text_storage; extern NSTextStorage *cocoa_text_storage;
extern NSTextContainer *cocoa_text_container; extern NSTextContainer *cocoa_text_container;
void test_draw_string( CGFloat x, CGFloat y, const char *bytes, size_t length, const plot_font_style_t *style ) void test_draw_string( CGFloat x, CGFloat y, const char *bytes, size_t length, const plot_font_style_t *style )
{ {
NSLog(@"pre prep layout");
NSLog(@"plot_text val %s", bytes);
NSLayoutManager *layout = cocoa_prepare_layout_manager( bytes, length, style ); NSLayoutManager *layout = cocoa_prepare_layout_manager( bytes, length, style );
if (layout == nil) return; if (layout == nil) return;
NSLog(@"post prep layout");
NSFont *font = [cocoa_text_storage attribute: NSFontAttributeName atIndex: 0 effectiveRange: NULL]; NSFont *font = [cocoa_text_storage attribute: NSFontAttributeName atIndex: 0 effectiveRange: NULL];
NSLog(@"post font");
CGFloat baseline = [font defaultLineHeightForFont] * 3.0 / 4.0; CGFloat baseline = [font defaultLineHeightForFont] * 3.0 / 4.0;
@ -234,11 +232,8 @@ void test_draw_string( CGFloat x, CGFloat y, const char *bytes, size_t length, c
} }
static nserror plot_text(const struct redraw_context *ctx, const plot_font_style_t *fstyle, int x, int y, const char *text, size_t length) { static nserror plot_text(const struct redraw_context *ctx, const plot_font_style_t *fstyle, int x, int y, const char *text, size_t length) {
NSLog(@"plot_text len %d", length);
NSLog(@"plot_text val %s", text);
[NSGraphicsContext saveGraphicsState]; [NSGraphicsContext saveGraphicsState];
[NSBezierPath clipRect: cocoa_plot_clip_rect]; [NSBezierPath clipRect: cocoa_plot_clip_rect];
testfn(x, y, text, length);
test_draw_string(x, y, text, length, fstyle); test_draw_string(x, y, text, length, fstyle);
[NSGraphicsContext restoreGraphicsState]; [NSGraphicsContext restoreGraphicsState];