diff options
| -rw-r--r-- | desktop/options.h | 5 | ||||
| -rw-r--r-- | desktop/treeview.c | 6 | ||||
| -rw-r--r-- | frontends/riscos/gui.c | 6 | ||||
| -rw-r--r-- | utils/nsoption.c | 8 |
4 files changed, 19 insertions, 6 deletions
diff --git a/desktop/options.h b/desktop/options.h index 2f3688750..437d104e9 100644 --- a/desktop/options.h +++ b/desktop/options.h @@ -59,7 +59,10 @@ NSOPTION_STRING(http_proxy_auth_pass, NULL) /** Proxy omission list */ NSOPTION_STRING(http_proxy_noproxy, "localhost") -/** Default font size / 0.1pt. */ +/** Default treeview font size (unit: 0.1pt) */ +NSOPTION_INTEGER(treeview_font_size, 110) + +/** Default font size (unit: 0.1pt) */ NSOPTION_INTEGER(font_size, 128) /** Minimum font size. */ diff --git a/desktop/treeview.c b/desktop/treeview.c index 5e4ceed12..fa7fea02d 100644 --- a/desktop/treeview.c +++ b/desktop/treeview.c @@ -3962,11 +3962,7 @@ nserror treeview_init(void) LOG("Initialising treeview module"); - /* TODO: Should we add an extra `treeview_font_size` option for - * treeviews instead of reusing the html rendering default - * font size? - */ - font_pt_size = nsoption_int(font_size); + font_pt_size = nsoption_int(treeview_font_size); if (font_pt_size <= 0) { font_pt_size = 11 * 10; } diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c index 9d5f6bb40..7e508a8cf 100644 --- a/frontends/riscos/gui.c +++ b/frontends/riscos/gui.c @@ -314,6 +314,12 @@ static nserror set_defaults(struct nsoption_s *defaults) */ nsoption_set_uint(disc_cache_size, 0); + /* Override core default treeview font size with 12 pt. + * TODO: 12 is the normal desktop font size, but users might run + * with something different. + */ + nsoption_set_int(treeview_font_size, 12 * 10); + /* set default system colours for riscos ui */ set_colour_from_wimp(defaults, wimp_COLOUR_BLACK, NSOPTION_sys_colour_ActiveBorder, 0x00000000); set_colour_from_wimp(defaults, wimp_COLOUR_CREAM, NSOPTION_sys_colour_ActiveCaption, 0x00dddddd); diff --git a/utils/nsoption.c b/utils/nsoption.c index 92ecfc176..f92debb30 100644 --- a/utils/nsoption.c +++ b/utils/nsoption.c @@ -144,6 +144,14 @@ static void nsoption_validate(struct nsoption_s *opts, struct nsoption_s *defs) int cloop; bool black = true; + if (opts[NSOPTION_treeview_font_size].value.i < 50) { + opts[NSOPTION_treeview_font_size].value.i = 50; + } + + if (opts[NSOPTION_treeview_font_size].value.i > 1000) { + opts[NSOPTION_treeview_font_size].value.i = 1000; + } + if (opts[NSOPTION_font_size].value.i < 50) { opts[NSOPTION_font_size].value.i = 50; } |