diff options
author | Ole Loots <ole@monochrom.net> | 2011-10-14 20:56:52 +0000 |
---|---|---|
committer | Ole Loots <ole@monochrom.net> | 2011-10-14 20:56:52 +0000 |
commit | ee7b223ecac4db1e30e4b0fcbe08eababe9f51ff (patch) | |
tree | 327d72c4c9e184f9d1dde42959d792b23d2a107d /atari/gui.c | |
parent | c69e75220da584284b58783e4c7a9e520776fc75 (diff) | |
download | netsurf-ee7b223ecac4db1e30e4b0fcbe08eababe9f51ff.tar.gz netsurf-ee7b223ecac4db1e30e4b0fcbe08eababe9f51ff.tar.bz2 |
Draw favicon when iconyfied
svn path=/trunk/netsurf/; revision=13049
Diffstat (limited to 'atari/gui.c')
-rwxr-xr-x | atari/gui.c | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/atari/gui.c b/atari/gui.c index ff7c034c4..47100aa0f 100755 --- a/atari/gui.c +++ b/atari/gui.c @@ -175,7 +175,7 @@ void gui_poll(bool active) }
if( evnt.timer != 0 && !active ){
/* this suits for stuff with lower priority */
- //hotlist_redraw(); + //hotlist_redraw();
atari_treeview_redraw( hl.tv );
}
}
@@ -246,14 +246,14 @@ void gui_window_destroy(struct gui_window *w) }
if( w->next != NULL ) {
w->next->prev = w->prev;
- } + }
free(w);
- w = NULL; - - w = window_list; - int dummy=0; + w = NULL;
+
+ w = window_list;
+ int dummy=0;
while( w != NULL ) {
- if( w->root ) { + if( w->root ) {
input_window = w;
break;
}
@@ -539,7 +539,6 @@ void gui_window_place_caret(struct gui_window *w, int x, int y, int height) CMP_BROWSER b = w->browser;
if( w->browser->caret.current.g_w > 0 )
gui_window_remove_caret( w );
-
w->browser->caret.requested.g_x = x;
w->browser->caret.requested.g_y = y;
w->browser->caret.requested.g_w = 2;
@@ -577,17 +576,15 @@ gui_window_remove_caret(struct gui_window *w) void
gui_window_set_icon(struct gui_window *g, hlcache_handle *icon)
-{ - /* Untestet, favicon support has been dropped, so this is dead code. */ -
-/* - struct bitmap *icon_bitmap; - icon_bitmap = (icon != NULL) ? content_get_bitmap(icon) : NULL; - if (icon_bitmap != NULL) { - window_set_icon( g, icon_bitmap ); +{
+ /* Untestet, favicon support has been dropped, so this is dead code. */
+ LOG((""));
+ struct bitmap *icon_bitmap;
+ icon_bitmap = (icon != NULL) ? content_get_bitmap(icon) : NULL;
+ if (icon_bitmap != NULL) {
+ window_set_icon( g, icon_bitmap );
}
-*/ - +
}
void
@@ -962,16 +959,16 @@ nsurl *gui_get_resource_url(const char *path) {
char buf[PATH_MAX];
char *raw;
- nsurl *url = NULL; - + nsurl *url = NULL;
+
atari_find_resource((char*)&buf, path, path);
raw = path_to_url((char*)&buf);
- if (raw != NULL) { - nsurl_create(raw, &url); - free(raw); - } - - return url; + if (raw != NULL) {
+ nsurl_create(raw, &url);
+ free(raw);
+ }
+
+ return url;
}
static void gui_init(int argc, char** argv)
|