MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Added minimal width specification to label text tokens." 

This reverts commit 8081ab8f51.
develop
Warmist 2012-11-29 10:57:40 +02:00
parent fe2fbe347c
commit 5755addc8a
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lua API.rst
Unescape Escape View File

@ -2737,10 +2737,6 @@ containing newlines, or a table with the following possible fields:
Specifies a unique identifier for the token. Specifies a unique identifier for the token.
* ``token.minw``
Specifies minimal token width
* ``token.line``, ``token.x1``, ``token.x2`` * ``token.line``, ``token.x1``, ``token.x2``
Reserved for internal use. Reserved for internal use.

5
library/lua/gui/widgets.lua
Unescape Escape View File

@ -282,10 +282,7 @@ function render_text(obj,dc,x0,y0,pen,dpen,disabled)
end end
end end
end end
if token.minw and x<token.minw then
dc:advance(token.minw-x)
x = math.max(x,token.minw or 0)
end
token.x2 = x token.x2 = x
end end
width = math.max(width, x) width = math.max(width, x)