new tabs: apply review

This commit is contained in:
mathieui 2018-06-30 21:39:31 +02:00
parent 2147efa4a1
commit 115aee3d05
No known key found for this signature in database
GPG key ID: C59F84CEEFD616E3
2 changed files with 14 additions and 11 deletions

View file

@ -1098,7 +1098,7 @@ class Core:
for state in states:
for tab in tab_refs[state]:
if (tab.nb < self.tabs.current_tab_intex and
if (tab.nb < self.tabs.current_tab_index and
tab_refs[state][-1].nb > self.tabs.current_tab_index):
continue
self.command.win(str(tab.nb))

View file

@ -157,15 +157,11 @@ class Tabs:
self._current_tab = self._tabs[0]
def _inc_cursor(self):
self._current_index += 1
if self._current_index >= len(self._tabs):
self._current_index = 0
self._current_index = (self._current_index + 1) % len(self._tabs)
self._current_tab = self._tabs[self._current_index]
def _dec_cursor(self):
self._current_index -= 1
if self._current_index < 0:
self._current_index = len(self._tabs) - 1
self._current_index = (self._current_index - 1) % len(self._tabs)
self._current_tab = self._tabs[self._current_index]
def _store_previous(self):
@ -212,18 +208,24 @@ class Tabs:
self._tab_types[type(tab)].remove(tab)
del self._tab_names[tab.name]
self._collect_trailing_gaptabs()
self._update_numbers()
if is_current:
self._restore_previous_tab()
if gap:
self._collect_trailing_gaptabs()
else:
self._update_numbers()
if tab is self._previous_tab:
self._previous_tab = None
if is_current:
self._restore_previous_tab()
self._validate_current_index()
def _restore_previous_tab(self):
if self._previous_tab:
if not self.set_current_tab(self._previous_tab):
self.set_current_index(0)
else:
self.set_current_index(0)
def _validate_current_index(self):
if not 0 <= self._current_index < len(
@ -240,6 +242,7 @@ class Tabs:
def _update_numbers(self):
for i, tab in enumerate(self._tabs):
tab.nb = i
self._current_index = self._current_tab.nb
# Moving tabs around #