kovidgoyal/kitty
1
1
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2024-11-14 12:11:12 +03:00
Code Issues Projects Releases Wiki Activity

Fix focus_visible_window not switching to other window in stack layout when only two windows are present

Browse Source 
Fixes #6970
This commit is contained in:
Kovid Goyal 2024-01-05 21:41:21 +05:30
parent 044f53b35b
commit 1e249035c7
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.rst
View File

@ -75,6 +75,9 @@ Detailed list of changes
- Mouse reporting: Fix incorrect position reported for windows with padding (:iss:`6950`)
- Fix :ac:`focus_visible_window` not switching to other window in stack layout
when only two windows are present (:iss:`6970`)
0.31.0 [2023-11-08]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

18
kitty/boss.py
View File

@ -1466,8 +1466,7 @@ class Boss:
focus_os_window(tab.os_window_id, True)
self.current_visual_select = VisualSelect(tab.id, tab.os_window_id, initial_tab_id, initial_os_window_id, choose_msg, callback, reactivate_prev_tab)
if tab.current_layout.only_active_window_visible:
w = self.select_window_in_tab_using_overlay(tab, choose_msg, only_window_ids)
self.current_visual_select.window_used_for_selection_id = 0 if w is None else w.id
self.select_window_in_tab_using_overlay(tab, choose_msg, only_window_ids)
return
km = KeyboardMode('__visual_select__')
km.on_action = 'end'
@ -1522,11 +1521,16 @@ class Boss:
self.mouse_handler(ev)
def select_window_in_tab_using_overlay(self, tab: Tab, msg: str, only_window_ids: Container[int] = ()) -> Optional[Window]:
windows = tuple((None, f'Current window: {w.title}' if w is self.active_window else w.title)
if only_window_ids and w.id not in only_window_ids else (w.id, w.title)
for i, w in tab.windows.iter_windows_with_number(only_visible=False))
if len(windows) < 1:
self.visual_window_select_action_trigger(windows[0][0] if windows and windows[0][0] is not None else 0)
windows: List[Tuple[Optional[int], str]] = []
selectable_windows: List[Tuple[int, str]] = []
for i, w in tab.windows.iter_windows_with_number(only_visible=False):
if only_window_ids and w.id not in only_window_ids:
windows.append((None, f'Current window: {w.title}' if w is self.active_window else w.title))
else:
windows.append((w.id, w.title))
selectable_windows.append((w.id, w.title))
if len(selectable_windows) < 2:
self.visual_window_select_action_trigger(selectable_windows[0][0] if selectable_windows else 0)
if get_options().enable_audio_bell:
ring_bell()
return None