fix: resolve merge conflicts and improve Audio 2 visibility

This commit is contained in:
klop51 2025-08-12 18:18:19 +02:00
commit d589700d7a

View File

@ -340,7 +340,7 @@ class ShortsEditorGUI:
# Professional Timeline Workspace - Multi-track editing environment # Professional Timeline Workspace - Multi-track editing environment
# Fixed height prevents timeline from shrinking when window is resized # Fixed height prevents timeline from shrinking when window is resized
# This is where users perform the majority of their editing work # This is where users perform the majority of their editing work
timeline_workspace = tk.Frame(player_frame, bg=self.colors['bg_secondary'], height=428) timeline_workspace = tk.Frame(player_frame, bg=self.colors['bg_secondary'], height=480)
timeline_workspace.grid(row=1, column=0, sticky="ew", padx=15, pady=(0, 15)) timeline_workspace.grid(row=1, column=0, sticky="ew", padx=15, pady=(0, 15))
timeline_workspace.pack_propagate(False) # Maintain fixed height for consistent layout timeline_workspace.pack_propagate(False) # Maintain fixed height for consistent layout