KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change splits layout neighbors to only include real neighbors

Browse Source
This commit is contained in:
Juho Peltonen 2020-07-09 10:18:57 +03:00
parent f7ff63132d
commit 1decae2938
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kitty/layout/splits.py
View File

@ -244,7 +244,7 @@ class Pair:
return parent.modify_size_of_child(which, increment, is_horizontal, layout_object) return parent.modify_size_of_child(which, increment, is_horizontal, layout_object)
return False return False
def neighbors_for_window(self, window_id: int, ans: NeighborsMap, layout_object: 'Splits') -> None: def neighbors_for_window(self, window_id: int, ans: NeighborsMap, layout_object: 'Splits', all_windows: WindowList) -> None:
def quadrant(is_horizontal: bool, is_first: bool) -> Tuple[EdgeLiteral, EdgeLiteral]: def quadrant(is_horizontal: bool, is_first: bool) -> Tuple[EdgeLiteral, EdgeLiteral]:
if is_horizontal: if is_horizontal:
@ -255,13 +255,27 @@ class Pair:
return 'top', 'bottom' return 'top', 'bottom'
return 'bottom', 'top' return 'bottom', 'top'
geometries = dict((group.id, group.geometry) for group in all_windows.groups if group.geometry)
def extend(other: Union[int, 'Pair', None], edge: EdgeLiteral, which: EdgeLiteral) -> None: def extend(other: Union[int, 'Pair', None], edge: EdgeLiteral, which: EdgeLiteral) -> None:
if not ans[which] and other: if not ans[which] and other:
if isinstance(other, Pair): if isinstance(other, Pair):
ans[which].extend(other.edge_windows(edge)) neighbors = (
w for w in other.edge_windows(edge)
if is_neighbouring_geometry(geometries[w], geometries[window_id], which))
ans[which].extend(neighbors)
else: else:
ans[which].append(other) ans[which].append(other)
def is_neighbouring_geometry(a: WindowGeometry, b: WindowGeometry, direction: str) -> bool:
def edges(g: WindowGeometry) -> Tuple[int, int]:
return (g.top, g.bottom) if direction in ['left', 'right'] else (g.left, g.right)
a1, a2 = edges(a)
b1, b2 = edges(b)
return a1 < b2 and a2 > b1
other = self.two if self.one == window_id else self.one other = self.two if self.one == window_id else self.one
extend(other, *quadrant(self.horizontal, self.one == window_id)) extend(other, *quadrant(self.horizontal, self.one == window_id))
@ -418,7 +432,7 @@ class Splits(Layout):
pair = self.pairs_root.pair_for_window(wg.id) pair = self.pairs_root.pair_for_window(wg.id)
ans: NeighborsMap = {'left': [], 'right': [], 'top': [], 'bottom': []} ans: NeighborsMap = {'left': [], 'right': [], 'top': [], 'bottom': []}
if pair is not None: if pair is not None:
pair.neighbors_for_window(wg.id, ans, self) pair.neighbors_for_window(wg.id, ans, self, all_windows)
return ans return ans
def move_window(self, all_windows: WindowList, delta: Union[str, int] = 1) -> bool: def move_window(self, all_windows: WindowList, delta: Union[str, int] = 1) -> bool:

4
kitty_tests/layout.py
View File

@ -250,6 +250,10 @@ class TestLayout(BaseTest):
self.ae(q.pairs_root.pair_for_window(2).horizontal, False) self.ae(q.pairs_root.pair_for_window(2).horizontal, False)
q.add_window(all_windows, Window(4), location='vsplit') q.add_window(all_windows, Window(4), location='vsplit')
windows = list(all_windows) windows = list(all_windows)
windows[0].set_geometry(WindowGeometry(0, 0, 10, 20, 0, 0))
windows[1].set_geometry(WindowGeometry(11, 0, 20, 10, 0, 0))
windows[2].set_geometry(WindowGeometry(11, 11, 15, 20, 0, 0))
windows[3].set_geometry(WindowGeometry(16, 11, 20, 20, 0, 0))
self.ae(q.neighbors_for_window(windows[0], all_windows), {'left': [], 'right': [2, 3], 'top': [], 'bottom': []}) self.ae(q.neighbors_for_window(windows[0], all_windows), {'left': [], 'right': [2, 3], 'top': [], 'bottom': []})
self.ae(q.neighbors_for_window(windows[1], all_windows), {'left': [1], 'right': [], 'top': [], 'bottom': [3, 4]}) self.ae(q.neighbors_for_window(windows[1], all_windows), {'left': [1], 'right': [], 'top': [], 'bottom': [3, 4]})
self.ae(q.neighbors_for_window(windows[2], all_windows), {'left': [1], 'right': [4], 'top': [2], 'bottom': []}) self.ae(q.neighbors_for_window(windows[2], all_windows), {'left': [1], 'right': [4], 'top': [2], 'bottom': []})