apply substitutions when calculating line wrapping
This commit is contained in:
@@ -108,10 +108,18 @@ static void push_snippets(size_t start, size_t end, text_params_t& options, size
|
|||||||
} while(start < upper_bound);
|
} while(start < upper_bound);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::map<std::string, std::string> substitutions = {
|
||||||
|
{"–", "--"}
|
||||||
|
};
|
||||||
|
|
||||||
break_info_t calculate_line_wrapping(rectangle dest_rect, std::string str, TextStyle style) {
|
break_info_t calculate_line_wrapping(rectangle dest_rect, std::string str, TextStyle style) {
|
||||||
break_info_t break_info;
|
break_info_t break_info;
|
||||||
if(str.empty()) return break_info; // Nothing to do!
|
if(str.empty()) return break_info; // Nothing to do!
|
||||||
|
|
||||||
|
for(auto it : substitutions){
|
||||||
|
boost::replace_all(str, it.first, it.second);
|
||||||
|
}
|
||||||
|
|
||||||
sf::Text str_to_draw;
|
sf::Text str_to_draw;
|
||||||
style.applyTo(str_to_draw);
|
style.applyTo(str_to_draw);
|
||||||
short str_len = str.length();
|
short str_len = str.length();
|
||||||
@@ -241,10 +249,6 @@ std::string truncate_with_ellipsis(std::string str, const TextStyle& style, int
|
|||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::map<std::string, std::string> substitutions = {
|
|
||||||
{"–", "--"}
|
|
||||||
};
|
|
||||||
|
|
||||||
static void win_draw_string(sf::RenderTarget& dest_window,rectangle dest_rect,std::string str,text_params_t& options) {
|
static void win_draw_string(sf::RenderTarget& dest_window,rectangle dest_rect,std::string str,text_params_t& options) {
|
||||||
if(str.empty()) return; // Nothing to do!
|
if(str.empty()) return; // Nothing to do!
|
||||||
short line_height = options.style.lineHeight;
|
short line_height = options.style.lineHeight;
|
||||||
|
Reference in New Issue
Block a user