mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-08-21 00:03:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "raylib: font sizes from QT should match (#36237)"

Browse Source 
This reverts commit 7933c10c97.
This commit is contained in:
Shane Smiskol
2025-10-08 04:05:49 -07:00
parent e1912fa5be
commit e62781cccb
5 changed files with 20 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/ui/widgets/html_render.py
+5 -5
View File
@@ -3,7 +3,7 @@ import pyray as rl
from dataclasses import dataclass
from enum import Enum
from typing import Any
from openpilot.system.ui.lib.application import gui_app, FontWeight, FONT_SCALE
from openpilot.system.ui.lib.application import gui_app, FontWeight
from openpilot.system.ui.lib.scroll_panel import GuiScrollPanel
from openpilot.system.ui.lib.wrap_text import wrap_text
from openpilot.system.ui.widgets import Widget
@@ -176,8 +176,8 @@ class HtmlRenderer(Widget):
wrapped_lines = wrap_text(font, element.content, element.font_size, int(content_width))
for line in wrapped_lines:
if current_y < rect.y - element.font_size * FONT_SCALE:
current_y += element.font_size * FONT_SCALE * element.line_height
if current_y < rect.y - element.font_size:
current_y += element.font_size * element.line_height
continue
if current_y > rect.y + rect.height:
@@ -186,7 +186,7 @@ class HtmlRenderer(Widget):
text_x = rect.x + (max(element.indent_level - 1, 0) * LIST_INDENT_PX)
rl.draw_text_ex(font, line, rl.Vector2(text_x + padding, current_y), element.font_size, 0, self._text_color)
current_y += element.font_size * FONT_SCALE * element.line_height
current_y += element.font_size * element.line_height
# Apply bottom margin
current_y += element.margin_bottom
@@ -210,7 +210,7 @@ class HtmlRenderer(Widget):
wrapped_lines = wrap_text(font, element.content, element.font_size, int(usable_width))
for _ in wrapped_lines:
total_height += element.font_size * FONT_SCALE * element.line_height
total_height += element.font_size * element.line_height
total_height += element.margin_bottom