diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-04-15 09:50:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-15 09:50:42 -0400 |
| commit | cf2b4dbfb280986cf859b12fd55158d7b9e0ac3d (patch) | |
| tree | e7af9b048afdb57799259b7ae7767457b79115ca /indra/llwindow/llwindowwin32.cpp | |
| parent | b7dd677933797a72175a95f2945b2ca8363e09b5 (diff) | |
| parent | 632a8648ca5456448499a96dcc58c40f4ff80d95 (diff) | |
Merge pull request #3706 from secondlife/release/2025.03
Release/2025.03
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 832cf254d1..1cac6ffe08 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; } |