mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-04-11 05:13:01 +00:00
fix line wrap
This commit is contained in:
@@ -227,13 +227,13 @@ class OfTheDayManager:
|
|||||||
wrapped = self._wrap_text(subtitle, available_width, body_font, max_lines=3, line_height=body_height, max_height=available_height)
|
wrapped = self._wrap_text(subtitle, available_width, body_font, max_lines=3, line_height=body_height, max_height=available_height)
|
||||||
for i, line in enumerate(wrapped):
|
for i, line in enumerate(wrapped):
|
||||||
if line.strip(): # Only draw non-empty lines
|
if line.strip(): # Only draw non-empty lines
|
||||||
self._draw_bdf_text(draw, body_font, line, 1, y_start + i * body_height, color=self.subtitle_color)
|
self._draw_bdf_text(draw, body_font, line, 1, y_start + i * (body_height + 1), color=self.subtitle_color)
|
||||||
elif self.rotation_state == 1 and description:
|
elif self.rotation_state == 1 and description:
|
||||||
# Show description
|
# Show description
|
||||||
wrapped = self._wrap_text(description, available_width, body_font, max_lines=3, line_height=body_height, max_height=available_height)
|
wrapped = self._wrap_text(description, available_width, body_font, max_lines=3, line_height=body_height, max_height=available_height)
|
||||||
for i, line in enumerate(wrapped):
|
for i, line in enumerate(wrapped):
|
||||||
if line.strip(): # Only draw non-empty lines
|
if line.strip(): # Only draw non-empty lines
|
||||||
self._draw_bdf_text(draw, body_font, line, 1, y_start + i * body_height, color=self.subtitle_color)
|
self._draw_bdf_text(draw, body_font, line, 1, y_start + i * (body_height + 1), color=self.subtitle_color)
|
||||||
# else: nothing to show
|
# else: nothing to show
|
||||||
return True
|
return True
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -273,9 +273,10 @@ class OfTheDayManager:
|
|||||||
truncated = truncated[:-1]
|
truncated = truncated[:-1]
|
||||||
if not truncated:
|
if not truncated:
|
||||||
lines.append(word[:10] + "...")
|
lines.append(word[:10] + "...")
|
||||||
if len(lines) * line_height >= max_height or len(lines) >= max_lines:
|
# Check if we've filled all lines (accounting for line spacing)
|
||||||
|
if len(lines) * (line_height + 1) >= max_height or len(lines) >= max_lines:
|
||||||
break
|
break
|
||||||
if current_line and (len(lines) * line_height < max_height and len(lines) < max_lines):
|
if current_line and (len(lines) * (line_height + 1) < max_height and len(lines) < max_lines):
|
||||||
lines.append(' '.join(current_line))
|
lines.append(' '.join(current_line))
|
||||||
while len(lines) < max_lines:
|
while len(lines) < max_lines:
|
||||||
lines.append("")
|
lines.append("")
|
||||||
|
|||||||
Reference in New Issue
Block a user