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

When closing a tab switch to the last active tab instead of the rightmost tab. Fixes #585

Browse Source
This commit is contained in:
Kovid Goyal
2018-05-29 08:06:33 +05:30
parent b886b4c6b2
commit adccc8fea4
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kitty/tabs.py
View File

@@ -425,6 +425,7 @@ class TabManager: # {{{
self.os_window_id = os_window_id self.os_window_id = os_window_id
self.opts, self.args = opts, args self.opts, self.args = opts, args
self.tabs = [] self.tabs = []
self.active_tab_history = deque()
self.tab_bar = TabBar(self.os_window_id, opts) self.tab_bar = TabBar(self.os_window_id, opts)
self._active_tab_idx = 0 self._active_tab_idx = 0
@@ -440,6 +441,9 @@ class TabManager: # {{{
def active_tab_idx(self, val): def active_tab_idx(self, val):
try: try:
old_active_tab = self.tabs[self._active_tab_idx] old_active_tab = self.tabs[self._active_tab_idx]
self.active_tab_history.append(old_active_tab.id)
if len(self.active_tab_history) > 64:
self.active_tab_history.popleft()
except Exception: except Exception:
old_active_tab = None old_active_tab = None
self._active_tab_idx = max(0, min(val, len(self.tabs) - 1)) self._active_tab_idx = max(0, min(val, len(self.tabs) - 1))
@@ -563,7 +567,18 @@ class TabManager: # {{{
def remove(self, tab): def remove(self, tab):
self._remove_tab(tab) self._remove_tab(tab)
self._set_active_tab(max(0, min(self.active_tab_idx, len(self.tabs) - 1))) next_active_tab = -1
while self.active_tab_history and next_active_tab < 0:
tab_id = self.active_tab_history.pop()
if tab_id == tab.id:
continue
for idx, qtab in enumerate(self.tabs):
if qtab.id == tab_id:
next_active_tab = idx
break
if next_active_tab < 0:
next_active_tab = max(0, min(self.active_tab_idx, len(self.tabs) - 1))
self._set_active_tab(next_active_tab)
self.mark_tab_bar_dirty() self.mark_tab_bar_dirty()
tab.destroy() tab.destroy()