diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-04-09 12:37:41 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-04-09 12:37:41 +0800 |
| commit | 381fecfd3e6f724ba0d3ae73ff6b1645521681e9 (patch) | |
| tree | 19d621c92d8ecdeae7cbea3b6bedbc367febf9bb /indra/llwindow | |
| parent | 38e93309358700deb15b6b32b6395d1bc08e5525 (diff) | |
| parent | 632a8648ca5456448499a96dcc58c40f4ff80d95 (diff) | |
Merge tag 'Second_Life_Release#632a8648-2025.03' into 2025.03
Diffstat (limited to 'indra/llwindow')
| -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 557af1b158..730e658c6a 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -4029,7 +4029,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; } |