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

Fix minimal borders in grid layout

Browse Source
This commit is contained in:
Kovid Goyal 2020-04-19 17:58:35 +05:30
parent 33498f9133
commit d4a4ee386f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 64 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kitty/borders.py
View File

@ -97,8 +97,11 @@ class Borders:
color = BorderColor.active color = BorderColor.active
else: else:
color = BorderColor.bell if w.needs_attention else BorderColor.inactive color = BorderColor.bell if w.needs_attention else BorderColor.inactive
colors = tuple(color if needed else window_bg for needed in next(border_data)) try:
draw_edges(self.os_window_id, self.tab_id, colors, w, borders=True) colors = tuple(color if needed else window_bg for needed in next(border_data))
draw_edges(self.os_window_id, self.tab_id, colors, w, borders=True)
except StopIteration:
pass
if not has_background_image: if not has_background_image:
# Draw the background rectangles over the padding region # Draw the background rectangles over the padding region
colors = window_bg, window_bg, window_bg, window_bg colors = window_bg, window_bg, window_bg, window_bg

103
kitty/layout.py
View File

@ -552,9 +552,9 @@ class Layout: # {{{
else: else:
yield from Layout.minimal_borders(self, windows, active_window, {}) yield from Layout.minimal_borders(self, windows, active_window, {})
def window_independent_borders(self, windows: WindowList, active_window: Optional[WindowType] = None) -> Generator[Tuple[int, int, int, int], None, None]: def window_independent_borders(self, windows: WindowList, active_window: Optional[WindowType] = None) -> Generator[Edges, None, None]:
return return
yield (0, 0, 0, 0) # type: ignore yield Edges() # type: ignore
def minimal_borders(self, windows: WindowList, active_window: Optional[WindowType], needs_borders_map: Dict[int, bool]) -> Generator[Borders, None, None]: def minimal_borders(self, windows: WindowList, active_window: Optional[WindowType], needs_borders_map: Dict[int, bool]) -> Generator[Borders, None, None]:
for w in windows: for w in windows:
@ -901,51 +901,66 @@ class Grid(Layout):
size = ld.space_before + ld.space_after + ld.content_size size = ld.space_before + ld.space_after + ld.content_size
return start, size return start, size
for window_idx, xl, yl in self.layout_windows( def layout(ld: LayoutData, cell_length: int, before_dec: int, after_dec: int) -> LayoutData:
len(windows), nrows, ncols, special_rows, special_col, on_col_done): start, size = extents(ld)
space_needed_for_decorations = before_dec + after_dec
content_size = size - space_needed_for_decorations
number_of_cells = content_size // cell_length
cell_area = number_of_cells * cell_length
extra = content_size - cell_area
if extra > 0 and not align_top_left:
before_dec += extra // 2
return LayoutData(start + before_dec, number_of_cells, before_dec, size - cell_area - before_dec, cell_area)
def position_window_in_grid_cell(window_idx: int, xl: LayoutData, yl: LayoutData) -> None:
w = windows[window_idx] w = windows[window_idx]
start, size = extents(xl) bw = w.effective_border()
xl = next(self.xlayout([w], start=start, size=size)) edges = Edges(
start, size = extents(yl) w.effective_margin('left') + w.effective_padding('left') + bw,
yl = next(self.ylayout([w], start=start, size=size)) w.effective_margin('right') + w.effective_padding('right') + bw,
w.effective_margin('top') + w.effective_padding('top') + bw,
w.effective_margin('bottom') + w.effective_padding('bottom') + bw,
)
xl = layout(xl, cell_width, edges.left, edges.right)
yl = layout(yl, cell_height, edges.top, edges.bottom)
self.set_window_geometry(w, window_idx, xl, yl) self.set_window_geometry(w, window_idx, xl, yl)
def minimal_borders(self, windows: WindowList, active_window: Optional[WindowType], needs_borders_map: Dict[int, bool]) -> Generator[Borders, None, None]: for window_idx, xl, yl in self.layout_windows(
n = len(windows) n, nrows, ncols, special_rows, special_col, on_col_done):
ncols, nrows, special_rows, special_col = calc_grid_size(n) position_window_in_grid_cell(window_idx, xl, yl)
blank_row: List[Optional[int]] = [None for i in range(ncols)]
matrix = tuple(blank_row[:] for j in range(max(nrows, special_rows)))
wi = iter(windows)
pos_map = {}
col_counts = []
for col in range(ncols):
rows = special_rows if col == special_col else nrows
for row in range(rows):
matrix[row][col] = wid = next(wi).id
pos_map[wid] = row, col
col_counts.append(rows)
def minimal_borders(self, windows: WindowList, active_window: Optional[WindowType], needs_borders_map: Dict[int, bool]) -> Generator[Borders, None, None]:
for w in windows: for w in windows:
wid = w.id if needs_borders_map[w.id]:
if needs_borders_map[wid]:
yield all_borders yield all_borders
continue
row, col = pos_map[wid]
if col + 1 < ncols:
next_col_has_different_count = col_counts[col + 1] != col_counts[col]
right_neighbor_id: Optional[int] = matrix[row][col+1]
else: else:
right_neighbor_id = None yield no_borders
next_col_has_different_count = False
try: def window_independent_borders(self, windows: WindowList, active_window: Optional[WindowType] = None) -> Generator[Edges, None, None]:
bottom_neighbor_id: Optional[int] = matrix[row+1][col] n = len(windows)
except IndexError: if not draw_minimal_borders or n < 2:
bottom_neighbor_id = None return
yield Borders( ncols, nrows, special_rows, special_col = calc_grid_size(n)
False, False, row_borders: List[List[Edges]] = [[]]
(right_neighbor_id is not None and not needs_borders_map[right_neighbor_id]) or next_col_has_different_count, col_borders: List[Edges] = []
bottom_neighbor_id is not None and not needs_borders_map[bottom_neighbor_id] bw = windows[0].effective_border()
)
def on_col_done(col_windows: List[int]) -> None:
left = xl.content_pos + xl.content_size + xl.space_after - bw // 2
col_borders.append(Edges(left, central.top, left + bw, central.bottom))
row_borders.append([])
for window_idx, xl, yl in self.layout_windows(n, nrows, ncols, special_rows, special_col, on_col_done):
top = yl.content_pos + yl.content_size + yl.space_after - bw // 2
right = xl.content_pos + xl.content_size + xl.space_after
row_borders[-1].append(Edges(xl.content_pos - xl.space_before, top, right, top + bw))
for border in col_borders[:-1]:
yield border
for rows in row_borders:
for border in rows[:-1]:
yield border
def neighbors_for_window(self, window: WindowType, windows: WindowList) -> InternalNeighborsMap: def neighbors_for_window(self, window: WindowType, windows: WindowList) -> InternalNeighborsMap:
n = len(windows) n = len(windows)
@ -1079,7 +1094,7 @@ class Pair:
self.one: Optional[Union[Pair, int]] = None self.one: Optional[Union[Pair, int]] = None
self.two: Optional[Union[Pair, int]] = None self.two: Optional[Union[Pair, int]] = None
self.bias = 0.5 self.bias = 0.5
self.between_border: Optional[Tuple[int, int, int, int]] = None self.between_border: Optional[Edges] = None
def __repr__(self) -> str: def __repr__(self) -> str:
return 'Pair(horizontal={}, bias={:.2f}, one={}, two={}, between_border={})'.format( return 'Pair(horizontal={}, bias={:.2f}, one={}, two={}, between_border={})'.format(
@ -1242,7 +1257,7 @@ class Pair:
geom = window_geometry_from_layouts(xl, yl) geom = window_geometry_from_layouts(xl, yl)
self.apply_window_geometry(self.one, geom, id_window_map, id_idx_map, layout_object) self.apply_window_geometry(self.one, geom, id_window_map, id_idx_map, layout_object)
if b1 + b2: if b1 + b2:
self.between_border = (left + w1, top, left + w1 + b1 + b2, top + height) self.between_border = Edges(left + w1, top, left + w1 + b1 + b2, top + height)
left += b1 + b2 left += b1 + b2
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)
@ -1264,7 +1279,7 @@ class Pair:
geom = window_geometry_from_layouts(xl, yl) geom = window_geometry_from_layouts(xl, yl)
self.apply_window_geometry(self.one, geom, id_window_map, id_idx_map, layout_object) self.apply_window_geometry(self.one, geom, id_window_map, id_idx_map, layout_object)
if b1 + b2: if b1 + b2:
self.between_border = (left, top + h1, left + width, top + h1 + b1 + b2) self.between_border = Edges(left, top + h1, left + width, top + h1 + b1 + b2)
top += b1 + b2 top += b1 + b2
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)
@ -1457,7 +1472,7 @@ class Splits(Layout):
pair.bias = 0.5 pair.bias = 0.5
return True return True
def window_independent_borders(self, windows: WindowList, active_window: Optional[WindowType] = None) -> Generator[Tuple[int, int, int, int], None, None]: def window_independent_borders(self, windows: WindowList, active_window: Optional[WindowType] = None) -> Generator[Edges, None, None]:
if not draw_minimal_borders: if not draw_minimal_borders:
return return
for pair in self.pairs_root.self_and_descendants(): for pair in self.pairs_root.self_and_descendants():