From b912dc380abbb4f576f3a58b51c542d6c184cb2c Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Mon, 22 Jun 2020 21:35:12 +0200 Subject: [PATCH] Fix the DPI in wxSTC IME window This same modification was made to the Scintilla/SciTE source. --- src/stc/ScintillaWX.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 7b7a7ef033..23c5453fd5 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -1510,13 +1510,8 @@ void ScintillaWX::ImeStartComposition() { int sizeZoomed = vs.styles[styleHere].size + vs.zoomLevel * SC_FONT_SIZE_MULTIPLIER; if (sizeZoomed <= 2 * SC_FONT_SIZE_MULTIPLIER) // Hangs if sizeZoomed <= 1 sizeZoomed = 2 * SC_FONT_SIZE_MULTIPLIER; - AutoSurface surface(this); - int deviceHeight = sizeZoomed; - if (surface) { - deviceHeight = (sizeZoomed * surface->LogPixelsY()) / 72; - } // The negative is to allow for leading - lf.lfHeight = -(std::abs(deviceHeight / SC_FONT_SIZE_MULTIPLIER)); + lf.lfHeight = -::MulDiv(sizeZoomed, stc->GetDPI().y, 72 * SC_FONT_SIZE_MULTIPLIER); lf.lfWeight = vs.styles[styleHere].weight; lf.lfItalic = static_cast(vs.styles[styleHere].italic ? 1 : 0); lf.lfCharSet = DEFAULT_CHARSET;