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

cTextMsg pre-calculate layout

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-08-12 15:53:55 -05:00
committed by Celtic Minstrel
parent 5f97d8bfb3
commit c08a10867c
4 changed files with 108 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,6 +95,29 @@ void cTextMsg::setFixed(bool w, bool h) {
fixedHeight = h;
}
void cTextMsg::calculate_layout() {
to_rect = frame;
msg = lbl;
for(const auto& key : keyRefs) {
size_t pos = msg.find_first_of(KEY_PLACEHOLDER);
if(pos == std::string::npos) break;
if(key && !parent->hasControl(*key)) continue;
cControl& ctrl = key ? parent->getControl(*key) : *this;
msg.replace(pos, 1, ctrl.getAttachedKeyDescription());
}
if(to_rect.bottom - to_rect.top < 20) { // essentially, it's a single line
style.lineHeight = 12;
to_rect.left += 3;
text_mode = eTextMode::LEFT_BOTTOM;
}else {
style.lineHeight = textSize + 2;
to_rect.inset(4,4);
text_mode = eTextMode::WRAP;
break_info = calculate_line_wrapping(to_rect, msg, style);
}
calculated = true;
}
void cTextMsg::recalcRect() {
if(fixedWidth && fixedHeight) return;
TextStyle style;
@@ -151,6 +174,7 @@ void cTextMsg::recalcRect() {
calc_rect.width() = combo.width() + 16;
}
frame = calc_rect;
calculate_layout();
}
cTextMsg::cTextMsg(cDialog& parent) :
@@ -189,10 +213,6 @@ void cTextMsg::draw(){
inWindow->setActive();
if(visible){
TextStyle style;
style.font = textFont;
style.pointSize = textSize;
style.underline = underlined;
drawFrame(2, frameStyle);
sf::Color draw_color = color;
if(depressed){
@@ -200,24 +220,9 @@ void cTextMsg::draw(){
draw_color.g = 256 - draw_color.g;
draw_color.b = 256 - draw_color.b;
}
std::string msg = lbl;
for(const auto& key : keyRefs) {
size_t pos = msg.find_first_of(KEY_PLACEHOLDER);
if(pos == std::string::npos) break;
if(key && !parent->hasControl(*key)) continue;
cControl& ctrl = key ? parent->getControl(*key) : *this;
msg.replace(pos, 1, ctrl.getAttachedKeyDescription());
}
style.colour = draw_color;
if(to_rect.bottom - to_rect.top < 20) { // essentially, it's a single line
style.lineHeight = 12;
to_rect.left += 3;
win_draw_string(*inWindow,to_rect,msg,eTextMode::LEFT_BOTTOM,style);
}else {
style.lineHeight = textSize + 2;
to_rect.inset(4,4);
win_draw_string(*inWindow,to_rect,msg,eTextMode::WRAP,style);
}
if (!calculated) calculate_layout();
win_draw_string(*inWindow,to_rect,msg,text_mode,style,break_info);
}
}

7
src/dialogxml/widgets/message.hpp
View File

@@ -55,5 +55,12 @@ private:
std::vector<boost::optional<std::string>> keyRefs;
std::string fromList;
bool underlined = false, fixedWidth = false, fixedHeight = false;
TextStyle style;
rectangle to_rect;
break_info_t break_info;
eTextMode text_mode;
std::string msg;
void calculate_layout();
bool calculated = false;
};
#endif