mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[project @ 2005-04-20 23:22:49 by rjw] 

Remove background blending option, fix tree menu bug.

svn path=/import/netsurf/; revision=1675
This commit is contained in:
Richard Wilson 2005-04-20 23:22:49 +00:00
parent 05869d79be
commit d736b3d3e5
5 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
riscos/gui.h
View File

@ -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;

19
riscos/menus.c
View File

@ -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,

2
riscos/menus.h
View File

@ -10,7 +10,6 @@
#include <stdbool.h>
#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,

3
riscos/options.h
View File

@ -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 }, \

4
riscos/window.c
View File

@ -5,8 +5,8 @@
* Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
* Copyright 2004 James Bursa <bursa@users.sourceforge.net>
* Copyright 2003 John M Bell <jmb202@ecs.soton.ac.uk>
* Copyright 2004 Richard Wilson <not_ginger_matt@users.sourceforge.net>
* Copyright 2004 Andrew Timmins <atimmins@blueyonder.co.uk>
* Copyright 2005 Richard Wilson <info@tinct.net>
*/
/** \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;