From ce016cc451868cdd391d10d723555a50c0060838 Mon Sep 17 00:00:00 2001
From: jlw4049 <jlw_4049@hotmail.com>
Date: Tue, 30 Jan 2024 13:37:30 -0500
Subject: [PATCH] chore: remove hacky font scaler solution feat: now can
 properly set margins on all corners and position the text to top left/top
 right as needed cleanly without extra code

---
 frame_forge/__init__.py | 46 +++++++++++++----------------------------
 1 file changed, 14 insertions(+), 32 deletions(-)

diff --git a/frame_forge/__init__.py b/frame_forge/__init__.py
index 9920c32..3b11130 100644
--- a/frame_forge/__init__.py
+++ b/frame_forge/__init__.py
@@ -8,7 +8,6 @@ from unidecode import unidecode
 import awsmfunc
 import vapoursynth as vs
 from frame_forge.exceptions import FrameForgeError
-from frame_forge.font_scaler import FontScaler
 from frame_forge.utils import get_working_dir, hex_to_bgr
 
 
@@ -71,9 +70,10 @@ class GenerateImages:
         num_source_frames = len(self.source_node)
         num_encode_frames = len(self.encode_node)
 
-        # Format: Name, Fontname, Font-size, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic,
-        # Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL,
-        # MarginR, MarginV,
+        # ASS subtitle styles
+        # Font Name, Font Size, Primary Color, Secondary Color, Outline Color, Back Color, Bold,
+        # Italic, Underline, Strikeout, Scale X, Scale Y, Spacing, Angle, Border Style, Outline Width,
+        # Shadow Depth, Alignment, Left Margin, Right Margin, Vertical Margin, Encoding
 
         # bgr color
         color = "&H000ac7f5"
@@ -82,11 +82,17 @@ class GenerateImages:
 
         selected_sub_style = (
             f"Segoe UI,{self.sub_size},{color},&H00000000,&H00000000,&H00000000,"
-            "1,0,0,0,100,100,0,0,1,1,0,7,5,0,0,1"
+            "1,0,0,0,100,100,0,0,1,1,0,7,10,10,10,1"
         )
-
-        selected_sub_style_ref, selected_sub_style_sync = self.sync_font_scaling(
-            num_source_frames=num_source_frames, scaling_factor=1.35
+        sync_sub_base = (
+            "Segoe UI,{size},&H31FF31&,&H00000000,&H00000000,&H00000000,"
+            "1,0,0,0,100,100,0,0,1,1,0,{pos},10,10,10,1"
+        )
+        selected_sub_style_ref = sync_sub_base.format(
+            size=str(self.sub_size + 5), pos="7"
+        )
+        selected_sub_style_sync = sync_sub_base.format(
+            size=str(self.sub_size + 5), pos="9"
         )
 
         self.check_de_interlaced(num_source_frames, num_encode_frames)
@@ -122,30 +128,6 @@ class GenerateImages:
             flush=True,
         )
 
-    def sync_font_scaling(
-        self, num_source_frames, scaling_factor: float
-    ) -> Tuple[str, str]:
-        calculate_str_len = max(
-            len("frame: reference"), len(str(f"frame: {num_source_frames}"))
-        )
-        sync_size_offset = 5
-        scale_position = FontScaler().get_adjusted_scale(
-            self.sub_size + sync_size_offset, scaling_factor
-        )
-        calculate_right_subs = int(
-            self.source_node.width
-            - ((calculate_str_len + self.sub_size + sync_size_offset) * scale_position)
-        )
-        selected_sub_style_ref = (
-            f"Segoe UI,{self.sub_size + sync_size_offset},&H31FF31&,&H00000000,&H00000000,&H00000000,"
-            f"1,0,0,0,100,100,0,0,1,1,0,7,5,0,0,1"
-        )
-        selected_sub_style_sync = (
-            f"Segoe UI,{self.sub_size + sync_size_offset},&H31FF31&,&H00000000,&H00000000,&H00000000,"
-            f"1,0,0,0,100,100,0,0,1,1,0,7,{calculate_right_subs},0,0,1"
-        )
-        return selected_sub_style_ref, selected_sub_style_sync
-
     def generate_ref_screens(
         self, selected_sub_style_ref, frames: list, screenshot_sync_dir
     ):