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

Blank rects for splits layout

Browse Source
This commit is contained in:
Kovid Goyal 2020-01-28 11:06:16 +05:30
parent c788e30b66
commit 85b6a91e5c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
kitty/layout.py
View File

@ -1065,6 +1065,24 @@ class Pair:
if w is not None: if w is not None:
w.set_geometry(id_idx_map[w.id], window_geometry) w.set_geometry(id_idx_map[w.id], window_geometry)
def blank_rects_for_window(self, layout_object: Layout, window, left: float, top: float, width: float, height: float):
right = left + width - 1
bottom = top + height - 1
g: WindowGeometry = window.geometry
rects: list = layout_object.blank_rects
lt = g.left
if lt > left:
rects.append(Rect(left, top, lt, bottom + 1))
r = g.right
if r <= right:
rects.append(Rect(r, top, right + 1, bottom + 1))
t = g.top
if t > top:
rects.append(Rect(left, top, right + 1, t))
b = g.bottom
if b <= bottom:
rects.append(Rect(left, b, right + 1, bottom + 1))
def layout_pair(self, left, top, width, height, id_window_map, id_idx_map, layout_object): def layout_pair(self, left, top, width, height, id_window_map, id_idx_map, layout_object):
if self.one is None or self.two is None: if self.one is None or self.two is None:
q = self.one or self.two q = self.one or self.two
@ -1076,6 +1094,7 @@ class Pair:
ystart, ynum = next(layout_object.ylayout(1, top=top, height=height)) ystart, ynum = next(layout_object.ylayout(1, top=top, height=height))
geom = window_geometry(xstart, xnum, ystart, ynum) geom = window_geometry(xstart, xnum, ystart, ynum)
self.apply_window_geometry(q, geom, id_window_map, id_idx_map) self.apply_window_geometry(q, geom, id_window_map, id_idx_map)
self.blank_rects_for_window(layout_object, id_window_map[q], left, top, width, height)
return return
if self.horizontal: if self.horizontal:
ystart, ynum = next(layout_object.ylayout(1, top=top, height=height)) ystart, ynum = next(layout_object.ylayout(1, top=top, height=height))
@ -1086,11 +1105,13 @@ class Pair:
else: else:
xstart, xnum = next(layout_object.xlayout(1, left=left, width=w1)) xstart, xnum = next(layout_object.xlayout(1, left=left, width=w1))
self.apply_window_geometry(self.one, window_geometry(xstart, xnum, ystart, ynum), id_window_map, id_idx_map) self.apply_window_geometry(self.one, window_geometry(xstart, xnum, ystart, ynum), id_window_map, id_idx_map)
self.blank_rects_for_window(layout_object, id_window_map[self.one], left, top, w1, height)
if isinstance(self.two, Pair): if isinstance(self.two, Pair):
self.two.layout_pair(left + w1, top, w2, height, id_window_map, id_idx_map, layout_object) self.two.layout_pair(left + w1, top, w2, height, id_window_map, id_idx_map, layout_object)
else: else:
xstart, xnum = next(layout_object.xlayout(1, left=left + w1, width=w2)) xstart, xnum = next(layout_object.xlayout(1, left=left + w1, width=w2))
self.apply_window_geometry(self.two, window_geometry(xstart, xnum, ystart, ynum), id_window_map, id_idx_map) self.apply_window_geometry(self.two, window_geometry(xstart, xnum, ystart, ynum), id_window_map, id_idx_map)
self.blank_rects_for_window(layout_object, id_window_map[self.two], left + w1, top, w2, height)
else: else:
xstart, xnum = next(layout_object.xlayout(1, left=left, width=width)) xstart, xnum = next(layout_object.xlayout(1, left=left, width=width))
h1 = height // 2 h1 = height // 2
@ -1100,11 +1121,13 @@ class Pair:
else: else:
ystart, ynum = next(layout_object.ylayout(1, top=top, height=h1)) ystart, ynum = next(layout_object.ylayout(1, top=top, height=h1))
self.apply_window_geometry(self.one, window_geometry(xstart, xnum, ystart, ynum), id_window_map, id_idx_map) self.apply_window_geometry(self.one, window_geometry(xstart, xnum, ystart, ynum), id_window_map, id_idx_map)
self.blank_rects_for_window(layout_object, id_window_map[self.one], left, top, width, h1)
if isinstance(self.two, Pair): if isinstance(self.two, Pair):
self.two.layout_pair(left, top + h1, width, h2, id_window_map, id_idx_map, layout_object) self.two.layout_pair(left, top + h1, width, h2, id_window_map, id_idx_map, layout_object)
else: else:
ystart, ynum = next(layout_object.ylayout(1, top=top + h1, height=h2)) ystart, ynum = next(layout_object.ylayout(1, top=top + h1, height=h2))
self.apply_window_geometry(self.two, window_geometry(xstart, xnum, ystart, ynum), id_window_map, id_idx_map) self.apply_window_geometry(self.two, window_geometry(xstart, xnum, ystart, ynum), id_window_map, id_idx_map)
self.blank_rects_for_window(layout_object, id_window_map[self.two], left, top + h1, width, h2)
class Splits(Layout): class Splits(Layout):