ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix/splits-layout-variable-shadowing' of https://github.com/noomz/kitty

Browse source
This commit is contained in:
Kovid Goyal 2026-03-02 12:29:06 +05:30
commit bc7523fe32
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
kitty/layout/splits.py
View file

@ -272,8 +272,8 @@ def layout_pair(
if isinstance(self.one, Pair):
self.one.layout_pair(left, top, w1, height, id_window_map, layout_object)
if bw:
for top, bottom, window_id in self.one.edge_border(RIGHT_EDGE, id_window_map):
one.append(BorderLine(Edges(bleft, top, bleft + bw, bottom), window_id=window_id))
for etop, ebottom, window_id in self.one.edge_border(RIGHT_EDGE, id_window_map):
one.append(BorderLine(Edges(bleft, etop, bleft + bw, ebottom), window_id=window_id))
else:
wg = id_window_map[self.one]
yl = next(layout_object.ylayout(iter((wg,)), start=top, size=height, border_mult=border_mult))
@ -287,8 +287,8 @@ def layout_pair(
if isinstance(self.two, Pair):
self.two.layout_pair(left, top, w2, height, id_window_map, layout_object)
if bw:
for top, bottom, window_id in self.two.edge_border(LEFT_EDGE, id_window_map):
two.append(BorderLine(Edges(left - bw, top, left, bottom), window_id=window_id))
for etop, ebottom, window_id in self.two.edge_border(LEFT_EDGE, id_window_map):
two.append(BorderLine(Edges(left - bw, etop, left, ebottom), window_id=window_id))
else:
wg = id_window_map[self.two]
if bw:
@ -310,8 +310,8 @@ def layout_pair(
if isinstance(self.one, Pair):
self.one.layout_pair(left, top, width, h1, id_window_map, layout_object)
if bw:
for left, right, window_id in self.one.edge_border(BOTTOM_EDGE, id_window_map):
one.append(BorderLine(Edges(left, btop, right, btop + bw), window_id=window_id))
for eleft, eright, window_id in self.one.edge_border(BOTTOM_EDGE, id_window_map):
one.append(BorderLine(Edges(eleft, btop, eright, btop + bw), window_id=window_id))
else:
wg = id_window_map[self.one]
xl = next(layout_object.xlayout(iter((wg,)), start=left, size=width, border_mult=border_mult))
@ -325,8 +325,8 @@ def layout_pair(
if isinstance(self.two, Pair):
self.two.layout_pair(left, top, width, h2, id_window_map, layout_object)
if bw:
for left, right, window_id in self.two.edge_border(TOP_EDGE, id_window_map):
two.append(BorderLine(Edges(left, top - bw, right, top), window_id=window_id))
for eleft, eright, window_id in self.two.edge_border(TOP_EDGE, id_window_map):
two.append(BorderLine(Edges(eleft, top - bw, eright, top), window_id=window_id))
else:
wg = id_window_map[self.two]
if bw: