From 13276f56549f1c03cf485fb39c4f683a3ea4d3c7 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sun, 4 Aug 2019 15:17:40 +0100 Subject: [PATCH] make risc os title setting not use shadow scale value --- frontends/riscos/window.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c index beadf4c41..a92d4c73c 100644 --- a/frontends/riscos/window.c +++ b/frontends/riscos/window.c @@ -3514,20 +3514,24 @@ static void gui_window_destroy(struct gui_window *g) */ static void gui_window_set_title(struct gui_window *g, const char *title) { + float scale; assert(g); assert(title); - if (g->scale != 1.0) { - int scale_disp = g->scale * 100; + scale = browser_window_get_scale(g->bw); - if (ABS((float)scale_disp - g->scale * 100) >= 0.05) + if (scale != 1.0) { + int scale_disp = scale * 100; + + if (ABS((float)scale_disp - scale * 100) >= 0.05) { snprintf(g->title, sizeof g->title, "%s (%.1f%%)", - title, g->scale * 100); - else + title, scale * 100); + } else { snprintf(g->title, sizeof g->title, "%s (%i%%)", title, scale_disp); + } } else { - strncpy(g->title, title, sizeof g->title); + strncpy(g->title, title, sizeof(g->title)); } ro_gui_set_window_title(g->window, g->title);