openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix line breaks being ignored. Fix #608

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-02-15 13:41:42 -06:00
committed by Celtic Minstrel
parent ff65ddbb69
commit ec4094cf29
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dialogxml/widgets/message.cpp
View File

@@ -119,7 +119,7 @@ void cTextMsg::calculate_layout() {
cControl& ctrl = key ? parent->getControl(*key) : *this; cControl& ctrl = key ? parent->getControl(*key) : *this;
msg.replace(pos, 1, ctrl.getAttachedKeyDescription()); msg.replace(pos, 1, ctrl.getAttachedKeyDescription());
} }
if(to_rect.bottom - to_rect.top < 20) { // essentially, it's a single line if(to_rect.bottom - to_rect.top < 20 && msg.find("|") == std::string::npos){
style.lineHeight = 12; style.lineHeight = 12;
to_rect.left += 3; to_rect.left += 3;
text_mode = eTextMode::LEFT_BOTTOM; text_mode = eTextMode::LEFT_BOTTOM;
@@ -136,12 +136,12 @@ void cTextMsg::recalcRect() {
style.pointSize = textSize; style.pointSize = textSize;
style.underline = underlined; style.underline = underlined;
style.font = textFont; style.font = textFont;
if(fixedWidth && fixedHeight){ std::string test = getText();
if(fixedWidth && fixedHeight && test.find("|") == std::string::npos){
calculate_layout(); calculate_layout();
return; return;
} }
style.lineHeight = textSize + 2; style.lineHeight = textSize + 2;
std::string test = getText();
size_t lines = 1, cur_line_chars = 0, max_line_chars = 0; size_t lines = 1, cur_line_chars = 0, max_line_chars = 0;
// Substitute | with newlines for measuring // Substitute | with newlines for measuring
for(auto& c : test) { for(auto& c : test) {