From 42fdc77f5e4929fd618ab63e600ed550d52a0326 Mon Sep 17 00:00:00 2001 From: Quentin Rameau Date: Fri, 20 Nov 2015 00:58:14 +0100 Subject: [PATCH] Remove togglescrollbars() We do not have access to scrollbars and will have to manipulate DOM to do that. --- config.def.h | 1 - surf.c | 44 -------------------------------------------- 2 files changed, 45 deletions(-) diff --git a/config.def.h b/config.def.h index 997aaab..dea8091 100644 --- a/config.def.h +++ b/config.def.h @@ -125,7 +125,6 @@ static Key keys[] = { { MODKEY|GDK_SHIFT_MASK, GDK_KEY_v, toggle, { .v = "enable-plugins" } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_a, togglecookiepolicy, { 0 } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_m, togglestyle, { 0 } }, - { MODKEY|GDK_SHIFT_MASK, GDK_KEY_b, togglescrollbars, { 0 } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_g, togglegeolocation, { 0 } }, }; diff --git a/surf.c b/surf.c index 3c17d17..8a98e74 100644 --- a/surf.c +++ b/surf.c @@ -178,7 +178,6 @@ static void titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c); static void toggle(Client *c, const Arg *arg); static void togglecookiepolicy(Client *c, const Arg *arg); static void togglegeolocation(Client *c, const Arg *arg); -static void togglescrollbars(Client *c, const Arg *arg); static void togglestyle(Client *c, const Arg *arg); static void updatetitle(Client *c); static void updatewinid(Client *c); @@ -1328,49 +1327,6 @@ togglegeolocation(Client *c, const Arg *arg) reload(c, &a); } -void -twitch(Client *c, const Arg *arg) -{ - GtkAdjustment *a; - gdouble v; - - a = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW( - c->scroll)); - - v = gtk_adjustment_get_value(a); - - v += arg->i; - - v = MAX(v, 0.0); - v = MIN(v, gtk_adjustment_get_upper(a) - - gtk_adjustment_get_page_size(a)); - gtk_adjustment_set_value(a, v); -} - -void -togglescrollbars(Client *c, const Arg *arg) -{ - GtkPolicyType vspolicy; - Arg a; - - gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(c->scroll), NULL, - &vspolicy); - - if (vspolicy == GTK_POLICY_AUTOMATIC) { - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll), - GTK_POLICY_NEVER, - GTK_POLICY_NEVER); - } else { - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - a.i = +1; - twitch(c, &a); - a.i = -1; - twitch(c, &a); - } -} - void togglestyle(Client *c, const Arg *arg) { -- 2.20.1