mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 22:28:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use box drawing for filled circle and fish eye so that they line up with empty circle

Browse Source 
Fixes #7840
This commit is contained in:
Kovid Goyal
2024-09-09 21:34:46 +05:30
parent c166589150
commit 48c7c538c1
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kitty/fonts.c
View File

@@ -602,7 +602,7 @@ START_ALLOW_CASE_RANGE
case 0x2500 ... 0x2573:
case 0x2574 ... 0x259f:
case 0x25d6 ... 0x25d7:
case 0x25cb:
case 0x25cb: case 0x25c9: case 0x25cf:
case 0x25dc ... 0x25e5:
case 0x2800 ... 0x28ff:
case 0xe0b0 ... 0xe0bf: case 0xe0d6 ... 0xe0d7: // powerline box drawing

22
kitty/fonts/box_drawing.py
View File

@@ -588,12 +588,30 @@ def draw_circle(buf: SSByteArray, width: int, height: int, scale: float = 1.0, g
w, h = width // 2, height // 2
radius = int(scale * min(w, h) - gap / 2)
fill = 0 if invert else 255
limit = radius * radius
for y in range(height):
for x in range(width):
if (x - w) ** 2 + (y - h) ** 2 <= radius ** 2:
xw, yh = x - w, y - h
if xw * xw + yh * yh <= limit:
buf[y * width + x] = fill
@supersampled()
def draw_filled_circle(buf: SSByteArray, width: int, height: int, level: int = 1) -> None:
draw_circle(buf, width, height)
@supersampled()
def draw_fish_eye(buf: SSByteArray, width: int, height: int, level: int = 0) -> None:
w, h = width // 2, height // 2
line_width = int(thickness(level) * buf.supersample_factor) // 2
radius = min(w, h) - line_width
arc_x, arc_y = circle_equations(w, h, radius, start_at=0, end_at=360)
draw_parametrized_curve(buf, width, height, level, arc_x, arc_y)
gap = radius - radius // 10
draw_circle(buf, width, height, gap=gap)
@supersampled()
def commit(buf: SSByteArray, width: int, height: int, level: int = 1, scale: float = 0.9, lines: list[str] = [], solid: bool = True) -> None:
' Draw a circular commit with the given scale. Commits can either be solid or hollow and can have vertical, horizontal, up, down, left, or right line(s) '
@@ -1116,6 +1134,8 @@ box_chars: dict[str, list[Callable[[BufType, int, int], Any]]] = {
'': [p(spinner, start=80, end=220)],
'': [p(spinner, start=170, end=270)],
'○': [p(spinner, start=0, end=360, level=0)], # circle
'●': [draw_filled_circle],
'◉': [draw_fish_eye],
'◜': [p(spinner, start=180, end=270)], # upper-left
'◝': [p(spinner, start=270, end=360)], # upper-right
'◞': [p(spinner, start=360, end=450)], # lower-right