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

This reverts commit 7933c10c97.

system/ui/lib/application.py

@@ -30,10 +30,6 @@ SCALE = float(os.getenv("SCALE", "1.0"))
 DEFAULT_TEXT_SIZE = 60
 DEFAULT_TEXT_COLOR = rl.WHITE
 
-# Qt draws fonts accounting for ascent/descent differently, so compensate to match old styles
-# The real scales for the fonts below range from 1.212 to 1.266
-FONT_SCALE = 1.242
-
 ASSETS_DIR = files("openpilot.selfdrive").joinpath("assets")
 FONT_DIR = ASSETS_DIR.joinpath("fonts")
 
@@ -177,7 +173,6 @@ class GuiApplication:
     self._target_fps = fps
     self._set_styles()
     self._load_fonts()
-    self._patch_text_functions()
 
     if not PC:
       self._mouse.start()
@@ -361,16 +356,6 @@ class GuiApplication:
     rl.gui_set_style(rl.GuiControl.DEFAULT, rl.GuiControlProperty.TEXT_COLOR_NORMAL, rl.color_to_int(DEFAULT_TEXT_COLOR))
     rl.gui_set_style(rl.GuiControl.DEFAULT, rl.GuiControlProperty.BASE_COLOR_NORMAL, rl.color_to_int(rl.Color(50, 50, 50, 255)))
 
-  def _patch_text_functions(self):
-    # Wrap pyray text APIs to apply a global text size scale so our px sizes match Qt
-    if not hasattr(rl, "_orig_draw_text_ex"):
-      rl._orig_draw_text_ex = rl.draw_text_ex
-
-    def _draw_text_ex_scaled(font, text, position, font_size, spacing, tint):
-      return rl._orig_draw_text_ex(font, text, position, font_size * FONT_SCALE, spacing, tint)
-
-    rl.draw_text_ex = _draw_text_ex_scaled
-
   def _set_log_callback(self):
     ffi_libc = cffi.FFI()
     ffi_libc.cdef("""

system/ui/lib/text_measure.py

@@ -1,5 +1,4 @@
 import pyray as rl
-from openpilot.system.ui.lib.application import FONT_SCALE
 
 _cache: dict[int, rl.Vector2] = {}
 
@@ -10,6 +9,6 @@ def measure_text_cached(font: rl.Font, text: str, font_size: int, spacing: int =
   if key in _cache:
     return _cache[key]
 
-  result = rl.measure_text_ex(font, text, font_size * FONT_SCALE, spacing)  # noqa: TID251
+  result = rl.measure_text_ex(font, text, font_size, spacing)  # noqa: TID251
   _cache[key] = result
   return result

system/ui/widgets/html_render.py

@@ -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