refactor(w.l.fixed): Rename abbreviated variables

Signed-off-by: Lucas Schwiderski <lucas@lschwiderski.de>
This commit is contained in:
Lucas Schwiderski 2021-07-13 22:30:52 +02:00
parent c1a3f02c88
commit a938a1b807
No known key found for this signature in database
GPG Key ID: AA12679AAA6DF4D8
1 changed files with 7 additions and 7 deletions

View File

@ -32,7 +32,7 @@ function fixed:layout(context, width, height)
spacing_widget = spacing ~= 0 and self._private.spacing_widget or nil spacing_widget = spacing ~= 0 and self._private.spacing_widget or nil
for k, v in pairs(self._private.widgets) do for index, widget in pairs(self._private.widgets) do
local w, h, local_spacing = width - x, height - y, spacing local w, h, local_spacing = width - x, height - y, spacing
-- Some widget might be zero sized either because this is their -- Some widget might be zero sized either because this is their
@ -43,8 +43,8 @@ function fixed:layout(context, width, height)
local zero = false local zero = false
if is_y then if is_y then
if k ~= widgets_nr or not self._private.fill_space then if index ~= widgets_nr or not self._private.fill_space then
h = select(2, base.fit_widget(self, context, v, w, h)) h = select(2, base.fit_widget(self, context, widget, w, h))
zero = h == 0 zero = h == 0
end end
@ -65,8 +65,8 @@ function fixed:layout(context, width, height)
end end
end end
else else
if k ~= widgets_nr or not self._private.fill_space then if index ~= widgets_nr or not self._private.fill_space then
w = select(1, base.fit_widget(self, context, v, w, h)) w = select(1, base.fit_widget(self, context, widget, w, h))
zero = w == 0 zero = w == 0
end end
@ -94,13 +94,13 @@ function fixed:layout(context, width, height)
-- Place widget, even if it has zero width/height. Otherwise -- Place widget, even if it has zero width/height. Otherwise
-- any layout change for zero-sized widget would become invisible. -- any layout change for zero-sized widget would become invisible.
table.insert(result, base.place_widget_at(v, x, y, w, h)) table.insert(result, base.place_widget_at(widget, x, y, w, h))
x = is_x and x + w + local_spacing or x x = is_x and x + w + local_spacing or x
y = is_y and y + h + local_spacing or y y = is_y and y + h + local_spacing or y
-- Add the spacing widget (if needed) -- Add the spacing widget (if needed)
if k < widgets_nr and spacing_widget then if index < widgets_nr and spacing_widget then
table.insert(result, base.place_widget_at( table.insert(result, base.place_widget_at(
spacing_widget, is_x and (x - spoffset) or x, is_y and (y - spoffset) or y, spacing_widget, is_x and (x - spoffset) or x, is_y and (y - spoffset) or y,
is_x and abspace or w, is_y and abspace or h is_x and abspace or w, is_y and abspace or h