feat: add --dark/--light mode flag to all treemap commands

Author: deeplook

src/dirplot/git_scanner.py

@@ -251,7 +251,7 @@ def _render_frame_worker(args: tuple[Any, ...]) -> tuple[int, bytes, RectMap]:
     Args:
         args: ``(repo_str, files, current_highlights, sha, ts, orig_i,
                  total_commits, depth, log_scale, width_px, height_px,
-                 font_size, colormap, cushion)``
+                 font_size, colormap, cushion, dark)``
 
     Returns:
         ``(orig_i, png_bytes, rect_map)``
@@ -271,6 +271,7 @@ def _render_frame_worker(args: tuple[Any, ...]) -> tuple[int, bytes, RectMap]:
         font_size,
         colormap,
         cushion,
+        dark,
     ) = args
 
     from datetime import datetime
@@ -298,6 +299,7 @@ def _render_frame_worker(args: tuple[Any, ...]) -> tuple[int, bytes, RectMap]:
         rect_map_out=rect_map,
         title_suffix=f"sha:{sha[:8]}  {dt_str}",
         progress=progress,
+        dark=dark,
     )
     return (orig_i, buf.read(), rect_map)
 

src/dirplot/main.py

@@ -158,6 +158,7 @@ def watch_cmd(
     cushion: bool = typer.Option(
         True, "--cushion/--no-cushion", help="Apply van Wijk cushion shading"
     ),
+    dark: bool = typer.Option(True, "--dark/--light", help="Dark background (default) or light"),
     animate: bool = typer.Option(
         False,
         "--animate/--no-animate",
@@ -253,6 +254,7 @@ def watch_cmd(
         depth=depth,
         crf=crf,
         codec=codec,
+        dark=dark,
     )
 
     observer = Observer()
@@ -363,6 +365,7 @@ def git_cmd(
     cushion: bool = typer.Option(
         True, "--cushion/--no-cushion", help="Apply van Wijk cushion shading"
     ),
+    dark: bool = typer.Option(True, "--dark/--light", help="Dark background (default) or light"),
     animate: bool = typer.Option(
         False,
         "--animate/--no-animate",
@@ -655,6 +658,7 @@ def git_cmd(
                 font_size,
                 colormap,
                 cushion,
+                dark,
             )
             for orig_i, sha, ts, files_copy, cur_hl, _del in snapshots
         ]
@@ -752,6 +756,7 @@ def git_cmd(
                     f"sha:{sha[:8]}  {datetime.fromtimestamp(ts).strftime('%Y-%m-%d %H:%M')}"
                 ),
                 progress=cumulative_ms / total_anim_ms,
+                dark=dark,
             )
             output.write_bytes(png_buf.read())
             typer.echo(f"  Updated {output}", err=True)
@@ -800,6 +805,7 @@ def replay_cmd(
         None, "--size", help="Output size as WIDTHxHEIGHT", metavar="WIDTHxHEIGHT"
     ),
     cushion: bool = typer.Option(True, "--cushion/--no-cushion", help="Apply cushion shading"),
+    dark: bool = typer.Option(True, "--dark/--light", help="Dark background (default) or light"),
     log: bool = typer.Option(False, "--log/--no-log", help="Use log of file sizes for layout"),
     depth: int | None = typer.Option(None, "--depth", help="Maximum directory depth"),
     workers: int | None = typer.Option(
@@ -949,6 +955,7 @@ def replay_cmd(
             font_size,
             colormap,
             cushion,
+            dark,
         )
         for orig_i, ts, files_copy, cur_hl, _del in snapshots
     ]
@@ -1205,6 +1212,7 @@ def main(
         "--cushion/--no-cushion",
         help="Apply van Wijk cushion shading: gives each tile a raised 3-D look.",
     ),
+    dark: bool = typer.Option(True, "--dark/--light", help="Dark background (default) or light"),
     log: bool = typer.Option(
         False,
         "--log/--no-log",
@@ -1523,11 +1531,19 @@ def _info(msg: str) -> None:
     t_render_start = time.monotonic()
     if use_svg:
         buf = create_treemap_svg(
-            root_node, width_px, height_px, font_size, colormap, legend, cushion, tree_depth
+            root_node, width_px, height_px, font_size, colormap, legend, cushion, tree_depth, dark
         )
     else:
         buf = create_treemap(
-            root_node, width_px, height_px, font_size, colormap, legend, cushion, tree_depth
+            root_node,
+            width_px,
+            height_px,
+            font_size,
+            colormap,
+            legend,
+            cushion,
+            tree_depth,
+            dark=dark,
         )
     t_render = time.monotonic() - t_render_start
 

src/dirplot/render_png.py

@@ -242,6 +242,7 @@ def draw_node(
     img: Image.Image | None = None,
     root_label: str | None = None,
     rect_map: dict[str, tuple[int, int, int, int]] | None = None,
+    dark: bool = True,
 ) -> None:
     """Recursively draw *node* and its children into *draw*.
 
@@ -316,21 +317,24 @@ def draw_node(
     if rect_map is not None:
         rect_map[str(node.path)] = (x, y, w, h)
 
-    # Directory: 1-px white outer border + 1-px black inner border
-    draw.rectangle([x, y, x + w - 1, y + h - 1], outline=(255, 255, 255), width=1)
+    # Directory: 1-px outer border + 1-px inner border (colours swap in light mode)
+    outer_col = (255, 255, 255) if dark else (0, 0, 0)
+    inner_col = (0, 0, 0) if dark else (255, 255, 255)
+    draw.rectangle([x, y, x + w - 1, y + h - 1], outline=outer_col, width=1)
     if w >= 4 and h >= 4:
-        draw.rectangle([x + 1, y + 1, x + w - 2, y + h - 2], outline=(0, 0, 0), width=1)
+        draw.rectangle([x + 1, y + 1, x + w - 2, y + h - 2], outline=inner_col, width=1)
 
     # Header label — height driven by the font size
     header_h = font.size + 4
     if h > 2 + header_h:
         label = _truncate_breadcrumb(
             root_label if root_label is not None else node.name, draw, font, w - 8
         )
+        header_text_col = (224, 224, 224) if dark else (32, 32, 32)
         draw.text(
             (x + w // 2, y + 2 + header_h // 2),
             label,
-            fill=(224, 224, 224),
+            fill=header_text_col,
             font=font,
             anchor="mm",
             align="center",
@@ -355,8 +359,9 @@ def draw_node(
     normed = squarify.normalize_sizes(sizes, iw, ih)
     rects = squarify.squarify(normed, ix, iy, iw, ih)
 
-    # Black background provides the 1-px separator between adjacent children
-    draw.rectangle([ix, iy, ix + iw - 1, iy + ih - 1], fill=(0, 0, 0))
+    # Background provides the 1-px separator between adjacent children
+    sep_col = (0, 0, 0) if dark else (255, 255, 255)
+    draw.rectangle([ix, iy, ix + iw - 1, iy + ih - 1], fill=sep_col)
 
     for rect, child in zip(rects, positive_children, strict=False):
         rx = round(rect["x"])
@@ -376,6 +381,7 @@ def draw_node(
             cushion,
             img,
             rect_map=rect_map,
+            dark=dark,
         )
 
 
@@ -428,6 +434,7 @@ def _draw_legend(
     corner: str,
     font: ImageFont.FreeTypeFont,
     max_rows: int = 20,
+    dark: bool = True,
 ) -> None:
     margin = 4
     bb = draw.textbbox((0, 0), "Ag", font=font)
@@ -455,8 +462,14 @@ def _draw_legend(
     bx = (width_px - box_w - margin) if "right" in corner else margin
     by = (height_px - box_h - margin) if "lower" in corner else margin
 
-    draw.rectangle([bx, by, bx + box_w - 1, by + box_h - 1], fill=(20, 20, 36))
-    draw.rectangle([bx, by, bx + box_w - 1, by + box_h - 1], outline=(80, 80, 80), width=1)
+    leg_bg = (20, 20, 36) if dark else (240, 240, 240)
+    leg_border = (80, 80, 80) if dark else (160, 160, 160)
+    leg_ext_text = (220, 220, 220) if dark else (40, 40, 40)
+    leg_count_text = (160, 160, 160) if dark else (80, 80, 80)
+    leg_more_text = (120, 120, 120) if dark else (100, 100, 100)
+    leg_swatch_outline = (255, 255, 255) if dark else (0, 0, 0)
+    draw.rectangle([bx, by, bx + box_w - 1, by + box_h - 1], fill=leg_bg)
+    draw.rectangle([bx, by, bx + box_w - 1, by + box_h - 1], outline=leg_border, width=1)
 
     for ri, ext in enumerate(top):
         rgba = color_map.get(ext, (0.5, 0.5, 0.5, 1.0))
@@ -467,20 +480,20 @@ def _draw_legend(
         draw.rectangle(
             [ex, sy, ex + SWATCH_PX - 1, sy + SWATCH_PX - 1],
             fill=rgb,
-            outline=(255, 255, 255),
+            outline=leg_swatch_outline,
             width=1,
         )
         draw.text(
             (ex + SWATCH_PX + LEG_PAD, row_mid),
             ext,
-            fill=(220, 220, 220),
+            fill=leg_ext_text,
             font=font,
             anchor="lm",
         )
         draw.text(
             (bx + box_w - LEG_PAD, row_mid),
             str(ext_counts[ext]),
-            fill=(160, 160, 160),
+            fill=leg_count_text,
             font=font,
             anchor="rm",
         )
@@ -490,7 +503,7 @@ def _draw_legend(
         draw.text(
             (bx + LEG_PAD + SWATCH_PX + LEG_PAD, row_mid),
             more_label,
-            fill=(120, 120, 120),
+            fill=leg_more_text,
             font=font,
             anchor="lm",
         )
@@ -547,6 +560,7 @@ def create_treemap(
     rect_map_out: dict[str, tuple[int, int, int, int]] | None = None,
     title_suffix: str | None = None,
     progress: float | None = None,
+    dark: bool = True,
 ) -> io.BytesIO:
     """Render a nested squarified treemap and return it as a PNG in a BytesIO buffer.
 
@@ -568,7 +582,8 @@ def create_treemap(
     exts = collect_extensions(root_node)
     color_map = assign_colors(exts, colormap)
 
-    img = Image.new("RGB", (width_px, height_px), color=(26, 26, 46))
+    canvas_bg = (26, 26, 46) if dark else (255, 255, 255)
+    img = Image.new("RGB", (width_px, height_px), color=canvas_bg)
     idraw = ImageDraw.Draw(img)
     font = _font(font_size, bold=True)
 
@@ -596,6 +611,7 @@ def create_treemap(
         img,
         root_label=root_label,
         rect_map=_tile_rects,
+        dark=dark,
     )
 
     # Batch cushion: one PIL→numpy→PIL round-trip for all tiles instead of one per tile.
@@ -626,7 +642,7 @@ def create_treemap(
         corner = _best_corner(root_node, width_px, height_px)
         ext_counts = _collect_ext_counts(root_node)
         _draw_legend(
-            idraw, ext_counts, color_map, width_px, height_px, corner, overlay_font, legend
+            idraw, ext_counts, color_map, width_px, height_px, corner, overlay_font, legend, dark
         )
 
     pnginfo = PngImagePlugin.PngInfo()

src/dirplot/replay_scanner.py

@@ -140,6 +140,7 @@ def _render_replay_frame_worker(args: tuple[Any, ...]) -> tuple[int, bytes, Rect
         font_size,
         colormap,
         cushion,
+        dark,
     ) = args
 
     from datetime import datetime
@@ -168,5 +169,6 @@ def _render_replay_frame_worker(args: tuple[Any, ...]) -> tuple[int, bytes, Rect
         rect_map_out=rect_map,
         title_suffix=dt_str,
         progress=progress,
+        dark=dark,
     )
     return (orig_i, buf.read(), rect_map)