From 5d4076bc7254dee2f99f194f07bde51bc0f4e2c0 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 4 Feb 2020 22:17:59 +0100 Subject: [PATCH] hintbox: fix getMaxWidth Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/406e051bd99a5ca37b06831781a448a39eedd1b9 Author: Jacek Jendrzej Date: 2020-02-04 (Tue, 04 Feb 2020) --- src/gui/widget/hintbox.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp index 51d03905e..f1547806b 100644 --- a/src/gui/widget/hintbox.cpp +++ b/src/gui/widget/hintbox.cpp @@ -444,7 +444,8 @@ int CHintBox::getMaxWidth(const string& Text, const string& Title, Font *font, c int res = max(HINTBOX_MIN_WIDTH, max(minWidth+2*w_indentation, min(CTextBox::getMaxLineWidth(Text, font)+2*w_indentation, (int)frameBuffer->getScreenWidth()))); if (ccw_show_header){ initHeader(); - return max(res, ccw_head->getCaptionFont()->getRenderWidth(Title) + 2*w_indentation); + int max_title_width = max(res, ccw_head->getCaptionFont()->getRenderWidth(Title) + 2*w_indentation); + return min(max_title_width, (int)frameBuffer->getScreenWidth()); } return res;