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

Simplify grid layout code some more

Browse Source
This commit is contained in:
Kovid Goyal 2018-05-17 17:47:42 +05:30
parent 2a5b314f67
commit 24bed6273b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kitty/layout.py
View File

@ -477,10 +477,7 @@ class Grid(Layout):
name = 'grid' name = 'grid'
def do_layout(self, windows, active_window_idx): def calc_grid_size(self, n):
n = len(windows)
if n == 1:
return self.layout_single_window(windows[0])
if n <= 5: if n <= 5:
ncols = 1 if n == 1 else 2 ncols = 1 if n == 1 else 2
else: else:
@ -490,27 +487,42 @@ class Grid(Layout):
nrows = n // ncols nrows = n // ncols
special_rows = n - (nrows * (ncols - 1)) special_rows = n - (nrows * (ncols - 1))
special_col = 0 if special_rows < nrows else ncols - 1 special_col = 0 if special_rows < nrows else ncols - 1
return ncols, nrows, special_rows, special_col
def layout_windows(self, windows, nrows, ncols, special_rows, special_col, on_col_done=lambda col_windows: None):
# Distribute windows top-to-bottom, left-to-right (i.e. in columns) # Distribute windows top-to-bottom, left-to-right (i.e. in columns)
xlayout = self.xlayout(ncols) xlayout = self.xlayout(ncols)
yvals_normal = tuple(self.ylayout(nrows)) yvals_normal = tuple(self.ylayout(nrows))
yvals_special = yvals_normal if special_rows == nrows else tuple(self.ylayout(special_rows)) yvals_special = yvals_normal if special_rows == nrows else tuple(self.ylayout(special_rows))
winmap = list(enumerate(windows))
pos = 0 pos = 0
win_col_map = [] winmap = list(enumerate(windows))
for col in range(ncols): for col in range(ncols):
rows = special_rows if col == special_col else nrows rows = special_rows if col == special_col else nrows
yl = yvals_special if col == special_col else yvals_normal yl = yvals_special if col == special_col else yvals_normal
xstart, xnum = next(xlayout) xstart, xnum = next(xlayout)
col_windows = [] col_windows = []
for (ystart, ynum), (window_idx, w) in zip(yl, winmap[pos:pos + rows]): for (ystart, ynum), (window_idx, w) in zip(yl, winmap[pos:pos + rows]):
w.set_geometry(window_idx, window_geometry(xstart, xnum, ystart, ynum)) yield window_idx, w, xstart, xnum, ystart, ynum
col_windows.append(w) col_windows.append(w)
# bottom blank rect
self.bottom_blank_rect(w)
pos += rows pos += rows
on_col_done(col_windows)
def do_layout(self, windows, active_window_idx):
n = len(windows)
if n == 1:
return self.layout_single_window(windows[0])
ncols, nrows, special_rows, special_col = self.calc_grid_size(n)
win_col_map = []
def on_col_done(col_windows):
win_col_map.append(col_windows) win_col_map.append(col_windows)
# bottom blank rect
self.bottom_blank_rect(col_windows[-1])
for window_idx, w, xstart, xnum, ystart, ynum in self.layout_windows(
windows, nrows, ncols, special_rows, special_col, on_col_done):
w.set_geometry(window_idx, window_geometry(xstart, xnum, ystart, ynum))
# left, top and right blank rects # left, top and right blank rects
self.simple_blank_rects(windows[0], windows[-1]) self.simple_blank_rects(windows[0], windows[-1])