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

DRYer

Browse Source
This commit is contained in:
Kovid Goyal 2022-10-03 15:32:42 +05:30
parent 08041415d1
commit 96faac95db
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kitty/tab_bar.py
View File

@ -579,7 +579,7 @@ class TabBar:
last_tab = data[-1] if data else None last_tab = data[-1] if data else None
ed = ExtraData() ed = ExtraData()
def draw_tab(i: int, tab: TabBarData, cell_ranges: List[Tuple[int, int]], max_tab_length: int, check_overflow: bool = True) -> None: def draw_tab(i: int, tab: TabBarData, cell_ranges: List[Tuple[int, int]], max_tab_length: int) -> None:
ed.prev_tab = data[i - 1] if i > 0 else None ed.prev_tab = data[i - 1] if i > 0 else None
ed.next_tab = data[i + 1] if i + 1 < len(data) else None ed.next_tab = data[i + 1] if i + 1 < len(data) else None
s.cursor.bg = as_rgb(self.draw_data.tab_bg(t)) s.cursor.bg = as_rgb(self.draw_data.tab_bg(t))
@ -589,7 +589,7 @@ class TabBar:
end = self.draw_func(self.draw_data, s, t, before, max_tab_length, i + 1, t is last_tab, ed) end = self.draw_func(self.draw_data, s, t, before, max_tab_length, i + 1, t is last_tab, ed)
s.cursor.bg = s.cursor.fg = 0 s.cursor.bg = s.cursor.fg = 0
cell_ranges.append((before, end)) cell_ranges.append((before, end))
if check_overflow and s.cursor.x > s.columns - max_tab_length and t is not last_tab: if not ed.for_layout and s.cursor.x > s.columns - max_tab_length and t is not last_tab:
s.cursor.x = s.columns - 2 s.cursor.x = s.columns - 2
s.cursor.bg = as_rgb(color_as_int(self.draw_data.default_bg)) s.cursor.bg = as_rgb(color_as_int(self.draw_data.default_bg))
s.cursor.fg = as_rgb(0xff0000) s.cursor.fg = as_rgb(0xff0000)
@ -605,7 +605,7 @@ class TabBar:
ed.for_layout = True ed.for_layout = True
for i, t in enumerate(data): for i, t in enumerate(data):
s.cursor.x = 0 s.cursor.x = 0
draw_tab(i, t, [], unconstrained_tab_length, check_overflow=False) draw_tab(i, t, [], unconstrained_tab_length)
ideal_tab_lengths[i] = tl = max(1, s.cursor.x) ideal_tab_lengths[i] = tl = max(1, s.cursor.x)
if t.is_active: if t.is_active:
active_idx = i active_idx = i