diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2025-04-25 16:40:38 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2025-04-25 16:40:38 +0300 |
| commit | a7759f370435bdd971724aa799160fa28ae112b5 (patch) | |
| tree | d5c63558fd34311ba70a4f0ceafcca8a8565f0bd /indra/llwindow/llwindowwin32.cpp | |
| parent | d9468ecc59f75363d9b57a9c1f7419cc3c42599b (diff) | |
| parent | 89f817194305243cb28499c70819656b8172dfa8 (diff) | |
Merge branch 'release/2025.04' into 2025.04-chat-mention
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index c190295512..4fca74497f 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -4040,7 +4040,15 @@ void LLWindowWin32::fillCompositionLogfont(LOGFONT *logfont) break; } - logfont->lfHeight = mPreeditor->getPreeditFontSize(); + if (mPreeditor) + { + logfont->lfHeight = mPreeditor->getPreeditFontSize(); + } + else + { + // todo: extract from some font * LLUI::getScaleFactor() intead + logfont->lfHeight = 10; + } logfont->lfWeight = FW_NORMAL; } |