diff options
| author | Vincent Sanders <vince@netsurf-browser.org> | 2012-03-22 09:34:34 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@netsurf-browser.org> | 2012-03-22 09:34:34 +0000 |
| commit | 1490b52a6b96b6a69a0c4fe9e0515dc717425128 (patch) | |
| tree | 8caba44a9da98e6cebf4f188e3232534b1596a4d /gtk/window.c | |
| parent | 0797bf5a5731b2c8d55105b453530584ea4e1f5b (diff) | |
| download | netsurf-1490b52a6b96b6a69a0c4fe9e0515dc717425128.tar.gz netsurf-1490b52a6b96b6a69a0c4fe9e0515dc717425128.tar.bz2 | |
NetSurf options rework (a=vince r=daniels,jmb)
svn path=/trunk/netsurf/; revision=13548
Diffstat (limited to 'gtk/window.c')
| -rw-r--r-- | gtk/window.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gtk/window.c b/gtk/window.c index 068da6fa7..14a17df40 100644 --- a/gtk/window.c +++ b/gtk/window.c @@ -34,7 +34,6 @@ #include "desktop/selection.h" #include "gtk/compat.h" #include "gtk/gui.h" -#include "gtk/options.h" #include "gtk/scaffolding.h" #include "gtk/plotters.h" #include "gtk/schedule.h" @@ -507,8 +506,9 @@ static gboolean nsgtk_window_size_allocate_event(GtkWidget *widget, /* TODO: Probably want to detect when the user adjusts the * status bar width, remember that proportion for the * window, and use that here. */ - gtk_paned_set_position(g->paned, (option_toolbar_status_width * - allocation->width) / 10000); + gtk_paned_set_position(g->paned, + (nsoption_int(toolbar_status_width) * + allocation->width) / 10000); } return TRUE; @@ -533,10 +533,11 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, g->paned = NULL; g->mouse.state = 0; g->current_pointer = GUI_POINTER_DEFAULT; - if (clone != NULL) + if (clone != NULL) { bw->scale = clone->scale; - else - bw->scale = (float) option_scale / 100; + } else { + bw->scale = (float) nsoption_int(scale) / 100.0; + } g->careth = 0; @@ -582,7 +583,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, bool tempback = true; switch (temp_open_background) { case -1: - tempback = !(option_focus_new); + tempback = !(nsoption_bool(focus_new)); break; case 0: tempback = false; |