diff options
Diffstat (limited to 'screen_ui.cpp')
-rw-r--r-- | screen_ui.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp index 2a8d7f9eb..fd7a1bea5 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp @@ -469,20 +469,22 @@ int ScreenRecoveryUI::DrawTextLines(int x, int y, const std::vector<std::string> int ScreenRecoveryUI::DrawWrappedTextLines(int x, int y, const std::vector<std::string>& lines) const { + // Keep symmetrical margins based on the given offset (i.e. x). + size_t text_cols = (ScreenWidth() - x * 2) / char_width_; int offset = 0; for (const auto& line : lines) { size_t next_start = 0; while (next_start < line.size()) { - std::string sub = line.substr(next_start, text_cols_ + 1); - if (sub.size() <= text_cols_) { + std::string sub = line.substr(next_start, text_cols + 1); + if (sub.size() <= text_cols) { next_start += sub.size(); } else { - // Line too long and must be wrapped to text_cols_ columns. + // Line too long and must be wrapped to text_cols columns. size_t last_space = sub.find_last_of(" \t\n"); if (last_space == std::string::npos) { // No space found, just draw as much as we can. - sub.resize(text_cols_); - next_start += text_cols_; + sub.resize(text_cols); + next_start += text_cols; } else { sub.resize(last_space); next_start += last_space + 1; @@ -750,7 +752,7 @@ bool ScreenRecoveryUI::Init(const std::string& locale) { return true; } -std::string ScreenRecoveryUI::GetLocale() { +std::string ScreenRecoveryUI::GetLocale() const { return locale_; } |