Make Entry fields bigger in ContextBar to avoid text scrolling

This commit is contained in:
David Capello 2017-05-31 16:21:34 -03:00
parent ea130da9a7
commit d5c47e2213
2 changed files with 9 additions and 2 deletions

View File

@ -434,8 +434,12 @@ bool Entry::onProcessMessage(Message* msg)
void Entry::onSizeHint(SizeHintEvent& ev) void Entry::onSizeHint(SizeHintEvent& ev)
{ {
int trailing = font()->textLength(getSuffix());
trailing = MAX(trailing, 2*theme()->getEntryCaretSize(this).w);
int w = int w =
+ font()->textLength("w") * MIN(m_maxsize, 6) + font()->textLength("w") * MIN(m_maxsize, 6)
+ trailing
+ 2*guiscale() + 2*guiscale()
+ border().width(); + border().width();

View File

@ -134,8 +134,11 @@ bool IntEntry::onProcessMessage(Message* msg)
void IntEntry::onSizeHint(SizeHintEvent& ev) void IntEntry::onSizeHint(SizeHintEvent& ev)
{ {
int min_w = font()->textLength(m_slider.convertValueToText(m_min) + "%"); int trailing = font()->textLength(getSuffix());
int max_w = font()->textLength(m_slider.convertValueToText(m_max)); trailing = MAX(trailing, 2*theme()->getEntryCaretSize(this).w);
int min_w = font()->textLength(m_slider.convertValueToText(m_min));
int max_w = font()->textLength(m_slider.convertValueToText(m_max)) + trailing;
int w = MAX(min_w, max_w); int w = MAX(min_w, max_w);
int h = textHeight(); int h = textHeight();