Fixed: Match position settings when opening bookmark and history

(#675)
mbnuqw · Jul 19, 2023 · 6d04fcc · 6d04fcc
1 parent fb33a8f
commit 6d04fcc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/services/bookmarks.actions.ts b/src/services/bookmarks.actions.ts
@@ -272,6 +272,7 @@ export function getMouseOpeningConf(button: number): OpeningBookmarksConfig {
   // Left click
   if (button === 0) {
     const panelId = Sidebar.getRecentTabsPanelId()
+    const panel = Sidebar.panelsById[panelId]
     conf.useActiveTab = Settings.state.bookmarksLeftClickAction === 'open_in_act'
     conf.activateFirstTab = Settings.state.bookmarksLeftClickActivate
     conf.dst.panelId = panelId
@@ -281,12 +282,15 @@ export function getMouseOpeningConf(button: number): OpeningBookmarksConfig {
         conf.dst.index = activeTab.index + 1
         conf.dst.parentId = activeTab.parentId
       }
+    } else if (Utils.isTabsPanel(panel)) {
+      conf.dst.index = Tabs.getIndexForNewTab(panel)
     }
   }
 
   // Middle click
   else if (button === 1) {
     const panelId = Sidebar.getRecentTabsPanelId()
+    const panel = Sidebar.panelsById[panelId]
     conf.activateFirstTab = Settings.state.bookmarksMidClickActivate
     conf.removeBookmark = Settings.state.bookmarksMidClickRemove
     conf.dst.panelId = panelId
@@ -296,6 +300,8 @@ export function getMouseOpeningConf(button: number): OpeningBookmarksConfig {
         conf.dst.index = activeTab.index + 1
         conf.dst.parentId = activeTab.parentId
       }
+    } else if (Utils.isTabsPanel(panel)) {
+      conf.dst.index = Tabs.getIndexForNewTab(panel)
     }
   }
 

diff --git a/src/services/history.actions.ts b/src/services/history.actions.ts
@@ -435,6 +435,7 @@ export function getMouseOpeningConf(button: number): OpeningHistoryConfig {
   // Left click
   if (button === 0) {
     const panelId = Sidebar.getRecentTabsPanelId()
+    const panel = Sidebar.panelsById[panelId]
     conf.useActiveTab = Settings.state.historyLeftClickAction === 'open_in_act'
     conf.activateFirstTab = Settings.state.historyLeftClickActivate
     conf.dst.panelId = panelId
@@ -444,12 +445,15 @@ export function getMouseOpeningConf(button: number): OpeningHistoryConfig {
         conf.dst.index = activeTab.index + 1
         conf.dst.parentId = activeTab.parentId
       }
+    } else if (Utils.isTabsPanel(panel)) {
+      conf.dst.index = Tabs.getIndexForNewTab(panel)
     }
   }
 
   // Middle click
   else if (button === 1) {
     const panelId = Sidebar.getRecentTabsPanelId()
+    const panel = Sidebar.panelsById[panelId]
     conf.activateFirstTab = Settings.state.historyMidClickActivate
     conf.dst.panelId = panelId
     if (Settings.state.historyMidClickPos === 'after') {
@@ -458,6 +462,8 @@ export function getMouseOpeningConf(button: number): OpeningHistoryConfig {
         conf.dst.index = activeTab.index + 1
         conf.dst.parentId = activeTab.parentId
       }
+    } else if (Utils.isTabsPanel(panel)) {
+      conf.dst.index = Tabs.getIndexForNewTab(panel)
     }
   }