From 740dec6b2e2a3b3a07a60589b114d5e8576d2acf Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Thu, 2 Aug 2018 14:02:31 +0200 Subject: [PATCH 1/3] + fix: wrong dialog size in German resources --- language/np3_de_de/dialogs_de_de.rc | Bin 74446 -> 74446 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc index a3a67cfabcbc13125c027e971aaa5842fcb93473..cc2c954c256c90f3982477c78ac5e106961847a7 100644 GIT binary patch delta 18 acmX?il;zw}mJNRQnavnXHV59Xbp`-Z-v}H4 delta 18 acmX?il;zw}mJNRQnN1lCHwWIYbp`-Z#RwPx From 83d8b858de138675246e47db28113fa3969319c1 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Thu, 2 Aug 2018 15:24:14 +0200 Subject: [PATCH 2/3] + fix: "Customize Scheme..." dialog: add line-break for styling text --- language/np3_af_za/dialogs_af_za.rc | Bin 73240 -> 73244 bytes language/np3_de_de/dialogs_de_de.rc | Bin 74446 -> 74450 bytes language/np3_en_gb/dialogs_en_gb.rc | Bin 73292 -> 73296 bytes language/np3_en_us/dialogs_en_us.rc | Bin 73104 -> 73108 bytes language/np3_es_es/dialogs_es_es.rc | Bin 73356 -> 73360 bytes language/np3_fr_fr/dialogs_fr_fr.rc | Bin 74828 -> 74832 bytes language/np3_nl_nl/dialogs_nl_nl.rc | Bin 73264 -> 73268 bytes language/np3_zh_cn/dialogs_zh_cn.rc | Bin 68238 -> 68242 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/language/np3_af_za/dialogs_af_za.rc b/language/np3_af_za/dialogs_af_za.rc index bba0f828815b142a209197b37865d2addd6e0d93..3f95bd9b37e98a51adc02b7b56fb118e22499af5 100644 GIT binary patch delta 27 jcmbQShh@$lmJRR9nPV98Hoq+|XPoSGN@a6L<%A^wu@MZ> delta 23 fcmbQUhh@edmJRR9H-9QGW1ReHm&)dz$_YyVmWK?i diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc index cc2c954c256c90f3982477c78ac5e106961847a7..20b4b2d4de30e3dbf28049a4bffdbda0a8d63dce 100644 GIT binary patch delta 27 jcmX?il;zSCfnp_LI delta 21 dcmbQRm!)Sf%LccK&0ZB{jEn}G4_2OE0sv*535oy! diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc index 7fea931aa700ee24d30d313b0c05e476208a0ff9..b56ff3eedaec47397f1c02efebc7bad6edd8a700 100644 GIT binary patch delta 27 jcmX?eg5|;qmJP?Mm}407HXp4@WSlItQDw7N4but$v&IYK delta 23 fcmca`g5}H!mJP?MHlM0WV4OT@t;%M<8m1KhmZS@s diff --git a/language/np3_nl_nl/dialogs_nl_nl.rc b/language/np3_nl_nl/dialogs_nl_nl.rc index 4b567b0457955831a5faf742442a9edb9af6ae96..0badca4de91875521368b3e1ac536f12aee5181e 100644 GIT binary patch delta 27 jcmdn6hh@timJM7L%rOjkn>j1W87C_>sBB(R*|P)ymG%nh delta 25 fcmdn8hh+m0aaC;Qt0-e+G?;wQTzT_~%AO?viIfVe diff --git a/language/np3_zh_cn/dialogs_zh_cn.rc b/language/np3_zh_cn/dialogs_zh_cn.rc index 5838ab597d94cd329053207712a898078180b7c6..8534d3ad30219143c14049a5450a13186c628ced 100644 GIT binary patch delta 30 mcmeC1$}(vx%Z7$L<`{;&$@O{rCp(#_OkVO)Y;#4v*lYm5K@771 delta 26 icmbO Date: Thu, 2 Aug 2018 15:58:42 +0200 Subject: [PATCH 3/3] + fix: rounding problem while calculating fractional font size for DPI awareness --- src/Styles.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Styles.c b/src/Styles.c index d5c479487..3c0e8a9ba 100644 --- a/src/Styles.c +++ b/src/Styles.c @@ -5571,7 +5571,8 @@ bool Style_SelectColor(HWND hwnd,bool bForeGround,LPWSTR lpszStyle,int cchStyle, inline static int _GetDPIAwareFractFontSize(float fFontSize) { - return MulDiv((int)(fFontSize + 0.5), (SC_FONT_SIZE_MULTIPLIER * g_uCurrentDPI), USER_DEFAULT_SCREEN_DPI); + float const fracSizeDPI = fFontSize * (float)SC_FONT_SIZE_MULTIPLIER; + return MulDiv((int)(fracSizeDPI + 0.5), g_uCurrentDPI, USER_DEFAULT_SCREEN_DPI); }