|
@@ -41,20 +41,14 @@ void UIWidget::updateText()
|
41
|
41
|
m_drawText = m_text;
|
42
|
42
|
|
43
|
43
|
// update rect size
|
44
|
|
- if(!m_rect.isValid()) {
|
45
|
|
- Size textSize = getTextSize();
|
46
|
|
- Size newSize = getSize();
|
47
|
|
- if(newSize.width() <= 0)
|
48
|
|
- newSize.setWidth(textSize.width());
|
49
|
|
- if(newSize.height() <= 0)
|
50
|
|
- newSize.setHeight(textSize.height());
|
51
|
|
- setSize(newSize);
|
52
|
|
- } else if(m_textAutoResize) {
|
53
|
|
- Size textSize = getTextSize();
|
|
44
|
+ if(!m_rect.isValid() || m_textAutoResize) {
|
|
45
|
+ Size textBoxSize = getTextSize();
|
|
46
|
+ textBoxSize += Size(m_padding.left + m_padding.right, m_padding.top + m_padding.left);
|
54
|
47
|
Size size = getSize();
|
55
|
|
- if(textSize.width() > size.width())
|
56
|
|
- size.setWidth(textSize.width());
|
57
|
|
- size.setHeight(textSize.height());
|
|
48
|
+ if(size.width() <= 0 || (m_textAutoResize && !m_textWrap))
|
|
49
|
+ size.setWidth(textBoxSize.width());
|
|
50
|
+ if(size.height() <= 0 || m_textAutoResize)
|
|
51
|
+ size.setHeight(textBoxSize.height());
|
58
|
52
|
setSize(size);
|
59
|
53
|
}
|
60
|
54
|
|