gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

enable text-auto-resize for width

This commit is contained in:
Eduardo Bart 2012-04-10 23:59:05 -03:00
parent 2c53d0b1dc
commit 1d2f6c7e9f
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/client_background/background.otui
View File

@ -18,5 +18,6 @@ Panel
text-align: center text-align: center
text-auto-resize: true text-auto-resize: true
width: 120 width: 120
padding: 2
color: #ffffff color: #ffffff
font: verdana-11px-monochrome font: verdana-11px-monochrome

4
src/framework/ui/uiwidget.cpp
View File

@ -1318,8 +1318,6 @@ void UIWidget::onStyleApply(const std::string& styleName, const OTMLNodePtr& sty
void UIWidget::onGeometryChange(const Rect& oldRect, const Rect& newRect) void UIWidget::onGeometryChange(const Rect& oldRect, const Rect& newRect)
{ {
callLuaField("onGeometryChange", oldRect, newRect);
if(m_textWrap && oldRect.size() != newRect.size()) if(m_textWrap && oldRect.size() != newRect.size())
updateText(); updateText();
@ -1328,6 +1326,8 @@ void UIWidget::onGeometryChange(const Rect& oldRect, const Rect& newRect)
if(!child->isAnchored()) if(!child->isAnchored())
child->bindRectToParent(); child->bindRectToParent();
} }
callLuaField("onGeometryChange", oldRect, newRect);
} }
void UIWidget::onLayoutUpdate() void UIWidget::onLayoutUpdate()

20
src/framework/ui/uiwidgettext.cpp
View File

@ -41,20 +41,14 @@ void UIWidget::updateText()
m_drawText = m_text; m_drawText = m_text;
// update rect size // update rect size
if(!m_rect.isValid()) { if(!m_rect.isValid() || m_textAutoResize) {
Size textSize = getTextSize(); Size textBoxSize = getTextSize();
Size newSize = getSize(); textBoxSize += Size(m_padding.left + m_padding.right, m_padding.top + m_padding.left);
if(newSize.width() <= 0)
newSize.setWidth(textSize.width());
if(newSize.height() <= 0)
newSize.setHeight(textSize.height());
setSize(newSize);
} else if(m_textAutoResize) {
Size textSize = getTextSize();
Size size = getSize(); Size size = getSize();
if(textSize.width() > size.width()) if(size.width() <= 0 || (m_textAutoResize && !m_textWrap))
size.setWidth(textSize.width()); size.setWidth(textBoxSize.width());
size.setHeight(textSize.height()); if(size.height() <= 0 || m_textAutoResize)
size.setHeight(textBoxSize.height());
setSize(size); setSize(size);
} }