From d736b3d3e58107293d95f94492ce3c8e281291a6 Mon Sep 17 00:00:00 2001 From: Richard Wilson Date: Wed, 20 Apr 2005 23:22:49 +0000 Subject: [project @ 2005-04-20 23:22:49 by rjw] Remove background blending option, fix tree menu bug. svn path=/import/netsurf/; revision=1675 --- riscos/gui.h | 1 - riscos/menus.c | 19 ++++--------------- riscos/menus.h | 2 -- riscos/options.h | 3 --- riscos/window.c | 4 +--- 5 files changed, 5 insertions(+), 24 deletions(-) (limited to 'riscos') diff --git a/riscos/gui.h b/riscos/gui.h index 9293046bb..4b4c056c5 100644 --- a/riscos/gui.h +++ b/riscos/gui.h @@ -75,7 +75,6 @@ struct gui_window { struct { float scale; /**< Scale, 1.0 = 100%. */ bool background_images; /**< Display background images. */ - bool background_blending; /**< Perform background blending on text. */ bool buffer_animations; /**< Use screen buffering for animations. */ bool buffer_everything; /**< Use screen buffering for everything. */ } option; diff --git a/riscos/menus.c b/riscos/menus.c index f8ab3f34e..ef1514977 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -191,7 +191,6 @@ void ro_gui_menu_init(void) { { "View.Toolbars.ToolStatus_", TOOLBAR_STATUS_BAR, 0 }, { "View.Toolbars.EditToolbar", TOOLBAR_EDIT, 0 }, { "View.Render_", NO_ACTION, 0 }, - { "View.Render.RenderText_", BROWSER_BLEND_TEXT, 0 }, { "View.Render.RenderAnims", BROWSER_BUFFER_ANIMS, 0 }, { "View.Render.RenderAll", BROWSER_BUFFER_ALL, 0 }, { "View.OptDefault", BROWSER_SAVE_VIEW, 0 }, @@ -1428,11 +1427,6 @@ bool ro_gui_menu_handle_action(wimp_w owner, menu_action action, g->option.background_images = !g->option.background_images; gui_window_redraw_window(g); return true; - case BROWSER_BLEND_TEXT: - if (!g) - return false; - g->option.background_blending = !g->option.background_blending; - break; case BROWSER_BUFFER_ANIMS: if (!g) return false; @@ -1483,13 +1477,13 @@ bool ro_gui_menu_handle_action(wimp_w owner, menu_action action, /* tree actions */ case TREE_NEW_FOLDER: ro_gui_menu_prepare_action(owner, action, true); - ro_gui_dialog_open_persistant(g->window, dialog_folder, - windows_at_pointer); + ro_gui_dialog_open_persistant((wimp_w)tree->handle, + dialog_folder, windows_at_pointer); return true; case TREE_NEW_LINK: ro_gui_menu_prepare_action(owner, action, true); - ro_gui_dialog_open_persistant(g->window, dialog_entry, - windows_at_pointer); + ro_gui_dialog_open_persistant((wimp_w)tree->handle, + dialog_entry, windows_at_pointer); return true; case TREE_EXPAND_ALL: case TREE_EXPAND_FOLDERS: @@ -1799,11 +1793,6 @@ void ro_gui_menu_prepare_action(wimp_w owner, menu_action action, bool windows) ro_gui_menu_set_entry_ticked(current_menu, action, g->option.background_images); break; - case BROWSER_BLEND_TEXT: - if (g) - ro_gui_menu_set_entry_ticked(current_menu, action, - g->option.background_blending); - break; case BROWSER_BUFFER_ANIMS: if (g) { ro_gui_menu_set_entry_shaded(current_menu, action, diff --git a/riscos/menus.h b/riscos/menus.h index 2f3e6f9d4..4f7cb80bb 100644 --- a/riscos/menus.h +++ b/riscos/menus.h @@ -10,7 +10,6 @@ #include #include "oslib/wimp.h" -#include "netsurf/desktop/gui.h" extern wimp_menu *iconbar_menu, *browser_menu, *hotlist_menu, *global_history_menu, *image_quality_menu, @@ -82,7 +81,6 @@ typedef enum { BROWSER_FIND_TEXT, BROWSER_IMAGES_FOREGROUND, BROWSER_IMAGES_BACKGROUND, - BROWSER_BLEND_TEXT, BROWSER_BUFFER_ANIMS, BROWSER_BUFFER_ALL, BROWSER_SAVE_VIEW, diff --git a/riscos/options.h b/riscos/options.h index 2f1b76229..e0e32f8cf 100644 --- a/riscos/options.h +++ b/riscos/options.h @@ -44,7 +44,6 @@ extern int option_window_screen_height; extern bool option_window_stagger; extern bool option_window_size_clone; extern bool option_background_images; -extern bool option_background_blending; extern bool option_buffer_animations; extern bool option_buffer_everything; extern char *option_homepage_url; @@ -89,7 +88,6 @@ int option_window_screen_height = 0; \ bool option_window_stagger = true; \ bool option_window_size_clone = true; \ bool option_background_images = true; \ -bool option_background_blending = true; \ bool option_buffer_animations = true; \ bool option_buffer_everything = false; \ char *option_homepage_url = 0; \ @@ -131,7 +129,6 @@ bool option_url_suggestion = true; { "window_stagger", OPTION_BOOL, &option_window_stagger }, \ { "window_size_clone", OPTION_BOOL, &option_window_size_clone }, \ { "background_images", OPTION_BOOL, &option_background_images }, \ -{ "background_blending", OPTION_BOOL, &option_background_blending }, \ { "buffer_animations", OPTION_BOOL, &option_buffer_animations }, \ { "buffer_everything", OPTION_BOOL, &option_buffer_everything }, \ { "homepage_url", OPTION_STRING, &option_homepage_url }, \ diff --git a/riscos/window.c b/riscos/window.c index 5bf5a1edd..4dda96926 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -5,8 +5,8 @@ * Copyright 2003 Phil Mellor * Copyright 2004 James Bursa * Copyright 2003 John M Bell - * Copyright 2004 Richard Wilson * Copyright 2004 Andrew Timmins + * Copyright 2005 Richard Wilson */ /** \file @@ -2200,7 +2200,6 @@ void ro_gui_window_clone_options(struct browser_window *new_bw, if (!old_gui) { new_gui->option.scale = ((float)option_scale) / 100; new_gui->option.background_images = option_background_images; - new_gui->option.background_blending = option_background_blending; new_gui->option.buffer_animations = option_buffer_animations; new_gui->option.buffer_everything = option_buffer_everything; } else { @@ -2248,7 +2247,6 @@ void ro_gui_window_default_options(struct browser_window *bw) { /* Save the basic options */ option_scale = gui->option.scale * 100; - option_background_blending = gui->option.background_blending; option_buffer_animations = gui->option.buffer_animations; option_buffer_everything = gui->option.buffer_everything; -- cgit v1.2.3