mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-22 06:21:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

make RISC OS specific window_screen_ options limited to that frontend

Browse Source
This commit is contained in:
Vincent Sanders 2019-12-20 12:55:54 +00:00
parent eba05b0d38
commit bacd8d229c
6 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
desktop/options.h
View File

@ -16,7 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/** \file
/**
* \file
* Option available on all platforms
*
* Non-platform specific options can be added by editing this file
@ -27,8 +28,8 @@
* with different macro definitions so there is no guard
*/
#ifndef _NETSURF_DESKTOP_OPTIONS_H_
#define _NETSURF_DESKTOP_OPTIONS_H_
#ifndef NETSURF_DESKTOP_OPTIONS_H_
#define NETSURF_DESKTOP_OPTIONS_H_
#include "netsurf/types.h"
@ -167,12 +168,6 @@ NSOPTION_INTEGER(window_width, 0)
/** default height of new windows */
NSOPTION_INTEGER(window_height, 0)
/** width of screen when above options were saved */
NSOPTION_INTEGER(window_screen_width, 0)
/** height of screen when above options were saved */
NSOPTION_INTEGER(window_screen_height, 0)
/** default size of status bar vs. h scroll bar */
NSOPTION_INTEGER(toolbar_status_size, 6667)

6
docs/netsurf-fb.1
View File

@ -146,12 +146,6 @@ The width of the initial window.
.B \-\-window_height
The height of the initial window.
.TP
.B \-\-window_screen_width
window screen width
.TP
.B \-\-window_screen_height
window screen height
.TP
.B \-\-toolbar_status_size
toolbar status size
.TP

4
docs/netsurf-gtk.1
View File

@ -101,10 +101,6 @@ The Y co-ordinate of the initial window.
The width of the initial window.
.It Fl -window_height
The height of the initial window.
.It Fl -window_screen_width
window screen width
.It Fl -window_screen_height
window screen height
.It Fl -toolbar_status_size
toolbar status size
.It Fl -scale

26
frontends/riscos/options.h
View File

@ -16,12 +16,20 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/** \file
* RISC OS specific options.
/**
* \file
* Option specific to RISC OS
*
* Platform specific options for RISC OS can be added by editing this file
*
* Global optionsshould be added in the desktop options.h.
*
* This header is specificaly intented to be included multiple times
* with different macro definitions so there is no guard
*/
#ifndef _NETSURF_RISCOS_OPTIONS_H_
#define _NETSURF_RISCOS_OPTIONS_H_
#ifndef NETSURF_RISCOS_OPTIONS_H_
#define NETSURF_RISCOS_OPTIONS_H_
#include "riscos/tinct.h"
@ -66,3 +74,13 @@ NSOPTION_BOOL(thumbnail_iconise, true)
NSOPTION_BOOL(interactive_help, true)
NSOPTION_BOOL(external_hotlists, false)
NSOPTION_STRING(external_hotlist_app, NULL)
/**
* width of screen when window_width option was saved
*/
NSOPTION_INTEGER(window_screen_width, 0)
/**
* height of screen when window_heigh option was saved
*/
NSOPTION_INTEGER(window_screen_height, 0)

2
test/data/Choices
View File

@ -50,8 +50,6 @@ window_x:0
window_y:0
window_width:0
window_height:0
window_screen_width:0
window_screen_height:0
toolbar_status_size:6667
scale:100
incremental_reflow:1

2
test/data/Choices-all
View File

@ -41,8 +41,6 @@ window_x:0
window_y:0
window_width:0
window_height:0
window_screen_width:0
window_screen_height:0
toolbar_status_size:6667
scale:100
incremental_reflow:1