Port code to current master branch

crides · Feb 17, 2019 · 6d07b1d · 6d07b1d
1 parent 3fd69ea
commit 6d07b1d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
@@ -82,8 +82,6 @@ def _set_current_index(self, idx):
         """Convenience method to set the current widget index."""
         cmdutils.check_overflow(idx, 'int')
         self._tabbed_browser.widget.setCurrentIndex(idx)
-        self._tabbed_browser.setCurrentIndex(idx)
-        self._tabbed_browser.print_tree_tab_structure("---- Printing from Command _set_current_index ----\n")
 
     def _current_index(self):
         """Convenience method to get the current widget index."""
@@ -1738,7 +1736,7 @@ def tree_tab_print(self):
         Args:
 
         """
-        self._tabbed_browser.print_tree_tab_structure("---- Printing from Command tree_tab_printf----\n")
+        self._tabbed_browser.widget.print_tree_tab_structure("---- Printing from Command tree_tab_printf----\n")
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def tree_tab_promote(self):
@@ -1756,8 +1754,8 @@ def tree_tab_promote(self):
             tab.node.parent = grandparent
 
 
-        self._tabbed_browser.update_tab_titles()
-        self._tabbed_browser.update_tree_tab_positions('command: tree_tab_promote')
+        self._tabbed_browser.widget.update_tab_titles()
+        self._tabbed_browser.widget.update_tree_tab_positions('command: tree_tab_promote')
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def tree_tab_demote(self):
@@ -1780,8 +1778,8 @@ def tree_tab_demote(self):
 
                 cur_node.parent = siblings[node_idx]
 
-                self._tabbed_browser.update_tab_titles()
-                self._tabbed_browser.update_tree_tab_positions('command: tree_tab_demote')
+                self._tabbed_browser.widget.update_tab_titles()
+                self._tabbed_browser.widget.update_tree_tab_positions('command: tree_tab_demote')
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def tree_tab_rotate_up(self):
@@ -1799,7 +1797,7 @@ def tree_tab_rotate_up(self):
 
             parent.children = siblings
 
-        self._tabbed_browser.update_tree_tab_positions('command: tree_tab_rotate_up')
+        self._tabbed_browser.widget.update_tree_tab_positions('command: tree_tab_rotate_up')
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def tree_tab_next_on_same_level(self):

diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -510,7 +510,7 @@ def tabopen(self, url=None, background=None, related=True, idx=None, *,
         # this was necessary to remove otherwise it was making a hell of a mess in tree structure
         # if idx is None:
         #     idx = self._get_new_tab_idx(explicit)
-        idx = self._get_new_tab_idx(explicit)
+        idx = self._get_new_tab_idx(related)
 
         self.widget.insertTab(idx, tab, "")