minor

example/main.lua

@@ -29,7 +29,7 @@ local style = {
         padding = 8,
         background = { 255, 255, 255 },
         icon = 'icon/32px/Box.png',
-        multiline = true,
+        wrap = true,
     },
 }
 
@@ -177,7 +177,7 @@ eight
 
 layout.mainCanvas.align = 'top'
 
-layout.mainCanvas.multiline = true
+layout.mainCanvas.wrap = true
 
 local Backend = require 'luigi.backend'
 

luigi/renderer.lua

@@ -166,7 +166,7 @@ function Renderer:positionText (widget, x1, y1, x2, y2)
     end
 
     if not widget.textData then
-        local limit = widget.multiline and x2 - x1 or nil
+        local limit = widget.wrap and x2 - x1 or nil
         widget.textData = Text(
             font, widget.text, widget.textColor, horizontal, limit)
     end
@@ -230,9 +230,9 @@ function Renderer:renderIconAndText (widget)
         end
     end
 
-    -- horizontal alignment for non-multiline
+    -- horizontal alignment for non-wrapped text
     -- TODO: handle this in Backend.Text
-    if text and not widget.multiline then
+    if text and not widget.wrap then
         if align:find 'right' then
             textX = textX + ((x2 - x1) - widget.textData:getWidth())
         elseif align:find 'center' then

luigi/widget.lua

@@ -57,7 +57,7 @@ local function metaNewIndex (self, property, value)
     end
 
     if property == 'text' or property == 'textColor'
-    or property == 'align' or property == 'multiline' then
+    or property == 'align' or property == 'wrap' then
         self.shadowProperties[property] = value
         self.textData = nil
         return
@@ -66,7 +66,7 @@ local function metaNewIndex (self, property, value)
     if property == 'width' then
         value = value and math.max(value, self.minwidth or 0)
         self.shadowProperties[property] = value
-        if self.multiline then
+        if self.wrap then
             self.textData = nil
         end
         Widget.reshape(self.parent or self)
@@ -126,7 +126,7 @@ local shadowKeys = {
     'width', 'height',
     'font', 'fontSize',
     'text', 'textColor',
-    'align', 'multiline',
+    'align', 'wrap',
 }
 
 --[[--