diff options
| author |  Robert Manea <gotmor@gmail.com> | 2009-10-24 13:57:46 +0200 |
|---|---|---|
| committer | Robert Manea <gotmor@gmail.com> | 2009-10-24 13:57:46 +0200 |
| commit | 3898202c2f062a5f76a44bfff47f0216254f9fc7 (patch) | |
| tree | de746e2e26ec313daa6ce0557936d2c77bd977f4 | |
| parent | d4409d97defceb8113ed1fc3a7b2614ab3f66fce (diff) | |
restore original scroll bahviour
| -rw-r--r-- | examples/config/uzbl/config | 2 | ||||
| -rw-r--r-- | uzbl-core.c | 18 |
2 files changed, 8 insertions, 12 deletions
diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config index a1fc9c1..0ee9318 100644 --- a/examples/config/uzbl/config +++ b/examples/config/uzbl/config @@ -32,7 +32,7 @@ set scheme_handler = spawn @scripts_dir/scheme.py #set new_window = sh 'echo uri "$8" > $4' # open in same window set new_window = sh 'uzbl-browser -u $8' # equivalent to the default behaviour -# Load start handler +# Load start handlers @on_event LOAD_START @set_status <span foreground="khaki">wait</span> # Load commit handler diff --git a/uzbl-core.c b/uzbl-core.c index 1097710..1480491 100644 --- a/uzbl-core.c +++ b/uzbl-core.c @@ -2308,16 +2308,7 @@ initialize(int argc, char *argv[]) { create_var_to_name_hash(); create_mainbar(); - create_browser(); - - uzbl.gui.scbar_v = (GtkScrollbar*) gtk_vscrollbar_new (NULL); - uzbl.gui.bar_v = gtk_range_get_adjustment((GtkRange*) uzbl.gui.scbar_v); - - uzbl.gui.scbar_h = (GtkScrollbar*) gtk_hscrollbar_new (NULL); - uzbl.gui.bar_h = gtk_range_get_adjustment((GtkRange*) uzbl.gui.scbar_h); - - gtk_widget_set_scroll_adjustments ((GtkWidget*) uzbl.gui.web_view, uzbl.gui.bar_h, uzbl.gui.bar_v); } void @@ -2360,9 +2351,8 @@ main (int argc, char* argv[]) { initialize(argc, argv); uzbl.gui.scrolled_win = gtk_scrolled_window_new (NULL, NULL); - //main_window_ref = g_object_ref(scrolled_window); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (uzbl.gui.scrolled_win), - GTK_POLICY_NEVER, GTK_POLICY_NEVER); //todo: some sort of display of position/total length. like what emacs does + GTK_POLICY_NEVER, GTK_POLICY_NEVER); gtk_container_add (GTK_CONTAINER (uzbl.gui.scrolled_win), GTK_WIDGET (uzbl.gui.web_view)); @@ -2384,6 +2374,12 @@ main (int argc, char* argv[]) { uzbl.xwin = GDK_WINDOW_XID (GTK_WIDGET (uzbl.gui.main_window)->window); } + uzbl.gui.scbar_v = (GtkScrollbar*) gtk_vscrollbar_new (NULL); + uzbl.gui.bar_v = gtk_range_get_adjustment((GtkRange*) uzbl.gui.scbar_v); + uzbl.gui.scbar_h = (GtkScrollbar*) gtk_hscrollbar_new (NULL); + uzbl.gui.bar_h = gtk_range_get_adjustment((GtkRange*) uzbl.gui.scbar_h); + gtk_widget_set_scroll_adjustments ((GtkWidget*) uzbl.gui.web_view, uzbl.gui.bar_h, uzbl.gui.bar_v); + if(!uzbl.state.instance_name) uzbl.state.instance_name = itos((int)uzbl.xwin); |