summaryrefslogtreecommitdiff
path: root/cocoa/gui.m
diff options
context:
space:
mode:
Diffstat (limited to 'cocoa/gui.m')
-rw-r--r--cocoa/gui.m15
1 files changed, 14 insertions, 1 deletions
diff --git a/cocoa/gui.m b/cocoa/gui.m
index 03a9b1015..83c0cbd65 100644
--- a/cocoa/gui.m
+++ b/cocoa/gui.m
@@ -32,6 +32,8 @@
#import "desktop/401login.h"
#import "utils/utils.h"
+#import "image/ico.h"
+
char *default_stylesheet_url;
char *adblock_stylesheet_url;
char *quirks_stylesheet_url;
@@ -236,7 +238,18 @@ void gui_window_stop_throbber(struct gui_window *g)
void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon)
{
- // ignore
+ NSBitmapImageRep *bmp = icon != NULL ? (NSBitmapImageRep *)content_get_bitmap( icon ) : NULL;
+
+ NSImage *image = nil;
+ if (bmp != nil) {
+ image = [[NSImage alloc] initWithSize: NSMakeSize( 32, 32 )];
+ [image addRepresentation: bmp];
+ } else {
+ image = [[NSApp applicationIconImage] retain];
+ }
+
+ [(BrowserViewController *)g setFavicon: image];
+ [image release];
}
void gui_window_set_search_ico(hlcache_handle *ico)