Fixed not setting text drawer max size properly
This commit is contained in:
parent
5eb3067a34
commit
1f3e925433
@ -261,6 +261,7 @@ func (drawer *TextDrawer) recalculate () {
|
|||||||
|
|
||||||
if drawer.wrap {
|
if drawer.wrap {
|
||||||
drawer.layoutBounds.Max.X = drawer.width
|
drawer.layoutBounds.Max.X = drawer.width
|
||||||
|
println("aaa")
|
||||||
} else {
|
} else {
|
||||||
drawer.layoutBounds.Max.X = horizontalExtent
|
drawer.layoutBounds.Max.X = horizontalExtent
|
||||||
}
|
}
|
||||||
|
@ -36,8 +36,10 @@ func (element *Label) Handle (event tomo.Event) {
|
|||||||
element.core.AllocateCanvas (
|
element.core.AllocateCanvas (
|
||||||
resizeEvent.Width,
|
resizeEvent.Width,
|
||||||
resizeEvent.Height)
|
resizeEvent.Height)
|
||||||
|
if element.wrap {
|
||||||
element.drawer.SetMaxWidth (resizeEvent.Width)
|
element.drawer.SetMaxWidth (resizeEvent.Width)
|
||||||
element.drawer.SetMaxHeight(resizeEvent.Height)
|
element.drawer.SetMaxHeight(resizeEvent.Height)
|
||||||
|
}
|
||||||
element.draw()
|
element.draw()
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
@ -63,6 +65,10 @@ func (element *Label) SetText (text string) {
|
|||||||
// have a minimum size that fits its text.
|
// have a minimum size that fits its text.
|
||||||
func (element *Label) SetWrap (wrap bool) {
|
func (element *Label) SetWrap (wrap bool) {
|
||||||
if wrap == element.wrap { return }
|
if wrap == element.wrap { return }
|
||||||
|
if !wrap {
|
||||||
|
element.drawer.SetMaxWidth(0)
|
||||||
|
element.drawer.SetMaxHeight(0)
|
||||||
|
}
|
||||||
element.wrap = wrap
|
element.wrap = wrap
|
||||||
element.updateMinimumSize()
|
element.updateMinimumSize()
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user