From b40559e83809cf93dae65c0667a98ad49f57de69 Mon Sep 17 00:00:00 2001 From: Xie Qingtian Date: Wed, 14 Feb 2024 10:21:36 +0800 Subject: [PATCH] FIX: additional fix for issue #5471 (Rich-text size is inconsistent across various setups) --- modules/view/backends/windows/direct2d.reds | 7 +++++-- modules/view/backends/windows/gui.reds | 2 -- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/view/backends/windows/direct2d.reds b/modules/view/backends/windows/direct2d.reds index b9a18b343f..93885716ad 100644 --- a/modules/view/backends/windows/direct2d.reds +++ b/modules/view/backends/windows/direct2d.reds @@ -2130,8 +2130,11 @@ create-text-format: func [ if TYPE_OF(value) = TYPE_NONE [make-font face font] ;-- make a GDI font int: as red-integer! values + FONT_OBJ_SIZE - len: either TYPE_OF(int) <> TYPE_INTEGER [10][int/value] - if len <= 0 [len: 10] + len: either TYPE_OF(int) <> TYPE_INTEGER [0][int/value] + if len <= 0 [ + int: as red-integer! #get system/view/fonts/size + len: int/value + ] ft-sz: as float! len size: ConvertPointSizeToDIP(ft-sz) diff --git a/modules/view/backends/windows/gui.reds b/modules/view/backends/windows/gui.reds index 1d63405a6a..b1d02164e6 100644 --- a/modules/view/backends/windows/gui.reds +++ b/modules/view/backends/windows/gui.reds @@ -776,8 +776,6 @@ set-defaults: func [ len #get system/view/fonts/system UTF-16LE - - font/lfHeight: font/lfHeight * log-pixels-y / inital-dpi ;-- font/lfHeight isn't affected by DPI change, we update it manually integer/make-at #get system/view/fonts/size 0 - (font/lfHeight * 72 / log-pixels-y)