From 1490b52a6b96b6a69a0c4fe9e0515dc717425128 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 22 Mar 2012 09:34:34 +0000 Subject: NetSurf options rework (a=vince r=daniels,jmb) svn path=/trunk/netsurf/; revision=13548 --- desktop/tree.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'desktop/tree.c') diff --git a/desktop/tree.c b/desktop/tree.c index bab474ded..8facdfd42 100644 --- a/desktop/tree.c +++ b/desktop/tree.c @@ -186,29 +186,30 @@ void tree_set_icon_dir(char *icon_dir) static void tree_setup_colours(void) { /* Background colour */ - plot_style_fill_tree_background.fill_colour = option_gui_colour_bg_1; + plot_style_fill_tree_background.fill_colour = nsoption_colour(gui_colour_bg_1); /* Selection background colour */ - plot_style_fill_tree_selected.fill_colour = option_gui_colour_fg_1; + plot_style_fill_tree_selected.fill_colour = nsoption_colour(gui_colour_fg_1); /* Furniture line colour */ plot_style_stroke_tree_furniture.stroke_colour = blend_colour( - option_gui_colour_bg_1, option_gui_colour_fg_1); + nsoption_colour(gui_colour_bg_1), + nsoption_colour(gui_colour_fg_1)); /* Furniture fill colour */ - plot_style_fill_tree_furniture.fill_colour = option_gui_colour_fg_2; + plot_style_fill_tree_furniture.fill_colour = nsoption_colour(gui_colour_fg_2); /* Text colour */ - plot_fstyle.foreground = option_gui_colour_fg_1; - plot_fstyle.background = option_gui_colour_bg_1; - plot_fstyle_def_folder.foreground = option_gui_colour_fg_1; - plot_fstyle_def_folder.background = option_gui_colour_bg_1; + plot_fstyle.foreground = nsoption_colour(gui_colour_fg_1); + plot_fstyle.background = nsoption_colour(gui_colour_bg_1); + plot_fstyle_def_folder.foreground = nsoption_colour(gui_colour_fg_1); + plot_fstyle_def_folder.background = nsoption_colour(gui_colour_bg_1); /* Selected text colour */ - plot_fstyle_selected.foreground = option_gui_colour_fg_2; - plot_fstyle_selected.background = option_gui_colour_fg_1; - plot_fstyle_selected_def_folder.foreground = option_gui_colour_fg_2; - plot_fstyle_selected_def_folder.background = option_gui_colour_fg_1; + plot_fstyle_selected.foreground = nsoption_colour(gui_colour_fg_2); + plot_fstyle_selected.background = nsoption_colour(gui_colour_fg_1); + plot_fstyle_selected_def_folder.foreground = nsoption_colour(gui_colour_fg_2); + plot_fstyle_selected_def_folder.background = nsoption_colour(gui_colour_fg_1); } -- cgit v1.2.3