chore(w.l.overflow): Improve code readability

Signed-off-by: Lucas Schwiderski <lucas@lschwiderski.de>
This commit is contained in:
Lucas Schwiderski 2021-04-12 16:28:28 +02:00
parent f5ba1d21c3
commit 252800fda1
No known key found for this signature in database
GPG Key ID: AA12679AAA6DF4D8
1 changed files with 6 additions and 12 deletions

View File

@ -53,25 +53,19 @@ function overflow:fit(context, orig_width, orig_height)
used_max = math.max(used_max, w) used_max = math.max(used_max, w)
used_in_dir = used_in_dir + h used_in_dir = used_in_dir + h
else else
used_in_dir = used_in_dir + w
used_max = math.max(used_max, h) used_max = math.max(used_max, h)
used_in_dir = used_in_dir + w
end end
end end
local spacing = self._private.spacing * (num_widgets - 1) local spacing = self._private.spacing * (num_widgets - 1)
used_in_dir = used_in_dir + spacing used_in_dir = used_in_dir + spacing
local need_scrollbar = used_in_dir > avail_in_dir and scrollbar_enabled local need_scrollbar = scrollbar_enabled and used_in_dir > avail_in_dir
-- If the direction perpendicular to scrolling (e.g. width in vertical -- Even if `used_max == orig_(width|height)` already, `base.fit_widget`
-- scrolling) is not fully covered by any of the widgets, we can add our -- will clamp return values, so we can "overextend" here.
-- scrollbar width to that value. Otherwise widget size will be reduced if need_scrollbar then
-- during `layout` to make space for the scrollbar.
if need_scrollbar
and (
(is_y and used_max < orig_width)
or (not is_y and used_max < orig_height)
) then
used_max = used_max + scrollbar_width used_max = used_max + scrollbar_width
end end
@ -114,8 +108,8 @@ function overflow:layout(context, orig_width, orig_height)
used_max = math.max(used_max, w) used_max = math.max(used_max, w)
used_in_dir = used_in_dir + h used_in_dir = used_in_dir + h
else else
used_in_dir = used_in_dir + w
used_max = math.max(used_max, h) used_max = math.max(used_max, h)
used_in_dir = used_in_dir + w
end end
end end