aw/surf
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hiding the loading indicator when it is not used. Based on a patch from

Browse Source 
http://xteddy.org/surf.html#toc5. Thanks!
This commit is contained in:
Christoph Lohmann 2012-10-28 14:16:22 +01:00
parent 161247eaf4
commit 25ba840e4d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -9,6 +9,8 @@ static char *cookiefile = ".surf/cookies.txt";
static time_t sessiontime = 3600; static time_t sessiontime = 3600;
static char *cafile = "/etc/ssl/certs/ca-certificates.crt"; static char *cafile = "/etc/ssl/certs/ca-certificates.crt";
static char *strictssl = FALSE; /* Refuse untrusted SSL connections */ static char *strictssl = FALSE; /* Refuse untrusted SSL connections */
static int indicator_thickness = 2;
#define HIDE_BACKGROUND FALSE #define HIDE_BACKGROUND FALSE
#define SPATIAL_BROWSING TRUE #define SPATIAL_BROWSING TRUE

8
surf.c
View File

@ -341,11 +341,12 @@ drawindicator(Client *c) {
w = c->indicator; w = c->indicator;
width = c->progress * w->allocation.width / 100; width = c->progress * w->allocation.width / 100;
gc = gdk_gc_new(w->window); gc = gdk_gc_new(w->window);
if(strstr(uri, "https://") == uri) if(strstr(uri, "https://") == uri) {
gdk_color_parse(c->sslfailed ? gdk_color_parse(c->sslfailed ?
progress_untrust : progress_trust, &fg); progress_untrust : progress_trust, &fg);
else } else {
gdk_color_parse(progress, &fg); gdk_color_parse(progress, &fg);
}
gdk_gc_set_rgb_fg_color(gc, &fg); gdk_gc_set_rgb_fg_color(gc, &fg);
gdk_draw_rectangle(w->window, gdk_draw_rectangle(w->window,
w->style->bg_gc[GTK_WIDGET_STATE(w)], w->style->bg_gc[GTK_WIDGET_STATE(w)],
@ -554,7 +555,7 @@ newclient(void) {
/* Indicator */ /* Indicator */
c->indicator = gtk_drawing_area_new(); c->indicator = gtk_drawing_area_new();
gtk_widget_set_size_request(c->indicator, 0, 2); gtk_widget_set_size_request(c->indicator, 0, indicator_thickness);
g_signal_connect (G_OBJECT (c->indicator), "expose_event", g_signal_connect (G_OBJECT (c->indicator), "expose_event",
G_CALLBACK (exposeindicator), c); G_CALLBACK (exposeindicator), c);
@ -569,7 +570,6 @@ newclient(void) {
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 0, GTK_PACK_START); gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 0, GTK_PACK_START);
gtk_widget_grab_focus(GTK_WIDGET(c->view)); gtk_widget_grab_focus(GTK_WIDGET(c->view));
gtk_widget_show(c->vbox); gtk_widget_show(c->vbox);
gtk_widget_show(c->indicator);
gtk_widget_show(c->scroll); gtk_widget_show(c->scroll);
gtk_widget_show(GTK_WIDGET(c->view)); gtk_widget_show(GTK_WIDGET(c->view));
gtk_widget_show(c->win); gtk_widget_show(c->win);