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

Merge branch 'tab_powerline' of https://github.com/slfotg/kitty

Browse Source
This commit is contained in:
Kovid Goyal 2021-02-24 12:23:11 +05:30
commit 18f42fe4c1
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kitty/config_data.py
View File

@ -953,6 +953,11 @@ entries to this list.
o('tab_separator', '"{}"'.format(default_tab_separator), option_type=tab_separator, long_text=_(''' o('tab_separator', '"{}"'.format(default_tab_separator), option_type=tab_separator, long_text=_('''
The separator between tabs in the tab bar when using :code:`separator` as the :opt:`tab_bar_style`.''')) The separator between tabs in the tab bar when using :code:`separator` as the :opt:`tab_bar_style`.'''))
o('tab_powerline_style', 'angled', option_type=choices('angled', 'slanted', 'round'), long_text=_('''
The powerline separator style between tabs in the tab bar when using :code:`powerline`
as the :opt:`tab_bar_style`, can be one of: :code:`angled`, :code:`slanted`, or :code:`round`.
'''))
def tab_activity_symbol(x: str) -> Optional[str]: def tab_activity_symbol(x: str) -> Optional[str]:
if x == 'none': if x == 'none':

21
kitty/tab_bar.py
View File

@ -42,6 +42,7 @@ class DrawData(NamedTuple):
title_template: str title_template: str
active_title_template: Optional[str] active_title_template: Optional[str]
tab_activity_symbol: Optional[str] tab_activity_symbol: Optional[str]
powerline_style: str
def as_rgb(x: int) -> int: def as_rgb(x: int) -> int:
@ -186,13 +187,22 @@ def draw_tab_with_powerline(draw_data: DrawData, screen: Screen, tab: TabBarData
inactive_bg = as_rgb(color_as_int(draw_data.inactive_bg)) inactive_bg = as_rgb(color_as_int(draw_data.inactive_bg))
default_bg = as_rgb(color_as_int(draw_data.default_bg)) default_bg = as_rgb(color_as_int(draw_data.default_bg))
separator_symbol = ''
separator_alt_symbol = ''
if draw_data.powerline_style == 'slanted':
separator_symbol = ''
separator_alt_symbol = '╱'
elif draw_data.powerline_style == 'round':
separator_symbol = ''
separator_alt_symbol = ''
min_title_length = 1 + 2 min_title_length = 1 + 2
if screen.cursor.x + min_title_length >= screen.columns: if screen.cursor.x + min_title_length >= screen.columns:
screen.cursor.x -= 2 screen.cursor.x -= 2
screen.cursor.bg = default_bg screen.cursor.bg = default_bg
screen.cursor.fg = inactive_bg screen.cursor.fg = inactive_bg
screen.draw('') screen.draw('{} '.format(separator_symbol))
return screen.cursor.x return screen.cursor.x
start_draw = 2 start_draw = 2
@ -200,7 +210,7 @@ def draw_tab_with_powerline(draw_data: DrawData, screen: Screen, tab: TabBarData
screen.cursor.x -= 2 screen.cursor.x -= 2
screen.cursor.fg = inactive_bg screen.cursor.fg = inactive_bg
screen.cursor.bg = tab_bg screen.cursor.bg = tab_bg
screen.draw(' ') screen.draw('{} '.format(separator_symbol))
screen.cursor.fg = tab_fg screen.cursor.fg = tab_fg
elif screen.cursor.x == 0: elif screen.cursor.x == 0:
screen.cursor.bg = tab_bg screen.cursor.bg = tab_bg
@ -224,9 +234,9 @@ def draw_tab_with_powerline(draw_data: DrawData, screen: Screen, tab: TabBarData
screen.cursor.bg = default_bg screen.cursor.bg = default_bg
else: else:
screen.cursor.bg = inactive_bg screen.cursor.bg = inactive_bg
screen.draw('') screen.draw(separator_symbol)
else: else:
screen.draw(' ') screen.draw(' {}'.format(separator_alt_symbol))
end = screen.cursor.x end = screen.cursor.x
if end < screen.columns: if end < screen.columns:
@ -273,7 +283,8 @@ class TabBar:
self.opts.inactive_tab_foreground, self.opts.inactive_tab_background, self.opts.inactive_tab_foreground, self.opts.inactive_tab_background,
self.opts.tab_bar_background or self.opts.background, self.opts.tab_title_template, self.opts.tab_bar_background or self.opts.background, self.opts.tab_title_template,
self.opts.active_tab_title_template, self.opts.active_tab_title_template,
self.opts.tab_activity_symbol self.opts.tab_activity_symbol,
self.opts.tab_powerline_style
) )
if self.opts.tab_bar_style == 'separator': if self.opts.tab_bar_style == 'separator':
self.draw_func = draw_tab_with_separator self.draw_func = draw_tab_with_separator