mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-23 00:38:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

When a window is closed, switch focus to the previously active window (if any) instead of picking the previous window in the layout

Browse Source 
Fixes #1450
This commit is contained in:
Kovid Goyal
2019-03-09 10:42:55 +05:30
parent 428c600788
commit 56864cdfb7
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
kitty/tabs.py
View File

@@ -253,9 +253,33 @@ class Tab: # {{{
if self.windows:
self.remove_window(self.windows[self.active_window_idx])
def previous_active_window_idx(self, num):
try:
old_window_id = self.active_window_history[-num]
except IndexError:
return
for idx, w in enumerate(self.windows):
if w.id == old_window_id:
return idx
def remove_window(self, window):
self.active_window_idx = self.current_layout.remove_window(self.windows, window, self.active_window_idx)
idx = self.previous_active_window_idx(1)
next_window_id = None
if idx is not None:
next_window_id = self.windows[idx].id
active_window_idx = self.current_layout.remove_window(self.windows, window, self.active_window_idx)
remove_window(self.os_window_id, self.id, window.id)
if next_window_id is None and active_window_idx is not None and len(self.windows) > active_window_idx:
next_window_id = self.windows[active_window_idx].id
if next_window_id is not None:
for idx, window in enumerate(self.windows):
if window.id == next_window_id:
self.active_window_idx = self.current_layout.set_active_window(self.windows, idx)
break
else:
self.active_window_idx = active_window_idx
else:
self.active_window_idx = active_window_idx
self.relayout_borders()
def set_active_window_idx(self, idx):
@@ -277,16 +301,10 @@ class Tab: # {{{
def nth_window(self, num=0):
if self.windows:
if num < 0:
try:
old_window_id = self.active_window_history[num]
except IndexError:
return
for idx, w in enumerate(self.windows):
if w.id == old_window_id:
self.active_window_idx = self.current_layout.set_active_window(self.windows, idx)
break
else:
idx = self.previous_active_window_idx(-num)
if idx is None:
return
self.active_window_idx = self.current_layout.set_active_window(self.windows, idx)
else:
self.active_window_idx = self.current_layout.nth_window(self.windows, num)
self.relayout_borders()