feat(cli): smarter info window hiding logic

manim_slides/present/__init__.py

@@ -1,7 +1,7 @@
 import signal
 import sys
 from pathlib import Path
-from typing import Optional
+from typing import Literal, Optional
 
 import click
 from click import Context, Parameter
@@ -202,7 +202,7 @@
     "screen_number",
     metavar="NUMBER",
     type=int,
-    default=None,
+    default=0,
     help="Present content on the given screen (a.k.a. display).",
 )
 @click.option(
@@ -222,8 +222,9 @@
 )
 @click.option(
     "--hide-info-window",
-    is_flag=True,
-    help="Hide info window.",
+    type=click.Choice(["auto", "always", "never"], case_sensitive=False),
+    default="auto",
+    help="Hide info window. Auto will hide the info window if there is only one screen.",
 )
 @click.option(
     "--info-window-screen",
@@ -248,10 +249,10 @@
     start_at: tuple[Optional[int], Optional[int], Optional[int]],
     start_at_scene_number: int,
     start_at_slide_number: int,
-    screen_number: Optional[int],
+    screen_number: int,
     playback_rate: float,
     next_terminates_loop: bool,
-    hide_info_window: bool,
+    hide_info_window: Literal["auto", "always", "never"],
     info_window_screen_number: Optional[int],
 ) -> None:
     """
@@ -304,12 +305,31 @@
             )
             return None
 
+    should_hide_info_window = False
+
+    if hide_info_window == "auto":
+        should_hide_info_window = len(app.screens()) == 1
+    elif hide_info_window == "always":
+        should_hide_info_window = True
+
+    if should_hide_info_window and info_window_screen_number is not None:
+        logger.warning(
+            f"Ignoring `--info-window-screen` because `--hide-info-window` is set to `{hide_info_window}`."
+        )
+
+    if (
+        not should_hide_info_window
+        and info_window_screen_number is None
+        and len(app.screens()) > 1
+    ):
+        info_window_screen_number = 1 if screen_number == 0 else 0
+
     if screen_number is not None:
         screen = get_screen(screen_number)
     else:
         screen = None
 
-    if info_window_screen_number is not None:
+    if info_window_screen_number is not None and not should_hide_info_window:
         info_window_screen = get_screen(info_window_screen_number)
     else:
         info_window_screen = None
@@ -333,7 +353,7 @@
         screen=screen,
         playback_rate=playback_rate,
         next_terminates_loop=next_terminates_loop,
-        hide_info_window=hide_info_window,
+        hide_info_window=should_hide_info_window,
         info_window_screen=info_window_screen,
     )
 

manim_slides/present/player.py

@@ -28,7 +28,6 @@
     def __init__(
         self,
         *,
-        full_screen: bool,
         aspect_ratio_mode: Qt.AspectRatioMode,
         screen: Optional[QScreen],
     ) -> None:
@@ -38,9 +37,6 @@
             self.setScreen(screen)
             self.move(screen.geometry().topLeft())
 
-        if full_screen:
-            self.setWindowState(Qt.WindowFullScreen)
-
         layout = QHBoxLayout()
 
         # Current slide view
@@ -243,7 +239,6 @@
         self.slide_changed.connect(self.slide_changed_callback)
 
         self.info = Info(
-            full_screen=full_screen,
             aspect_ratio_mode=aspect_ratio_mode,
             screen=info_window_screen,
         )
@@ -252,6 +247,9 @@
         self.video_sink.videoFrameChanged.connect(self.frame_changed)
         self.hide_info_window = hide_info_window
 
+        if full_screen:
+            self.info.setWindowState(Qt.WindowFullScreen)
+
         # Connecting key callbacks
 
         self.config.keys.QUIT.connect(self.close)
@@ -535,8 +533,10 @@
     def full_screen(self) -> None:
         if self.windowState() == Qt.WindowFullScreen:
             self.setWindowState(Qt.WindowNoState)
+            self.info.setWindowState(Qt.WindowNoState)
         else:
             self.setWindowState(Qt.WindowFullScreen)
+            self.info.setWindowState(Qt.WindowFullScreen)
 
     @Slot()
     def hide_mouse(self) -> None: