Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions src/_locales/dict.setup-page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2340,6 +2340,39 @@ Available variables: %B - a list mark (bullet); %CT - custom title or title; %T
zh_TW: '注意:拖曳時按住 Ctrl 將保留書籤',
ja: '注:ブックマークの移動は、ドラッグアンドドロップが有効になっている場合にのみ機能します。',
},
'settings.move_tab_to_panel': {
en: 'Position when dropping tabs to a panel',
de: 'Position beim Ablegen von Tabs auf einem Panel',
fr: 'Position lors du dépôt des onglets sur un panneau',
hu: 'Pozíció a lapok panelre való ejtésekor',
pl: 'Pozycja przy upuszczaniu kart do panelu',
ru: 'Позиция при перетаскивании вкладок на панель',
zh_CN: '将标签页拖放到面板时的位置',
zh_TW: '將分頁拖放到面板時的位置',
ja: 'タブをパネルにドロップしたときの位置',
},
'settings.move_tab_to_panel_start': {
en: 'Panel start',
de: 'Panel-Anfang',
fr: 'Début du panneau',
hu: 'Panel eleje',
pl: 'Początek panelu',
ru: 'Начало панели',
zh_CN: '面板开头',
zh_TW: '面板開頭',
ja: 'パネルの先頭',
},
'settings.move_tab_to_panel_end': {
en: 'Panel end',
de: 'Panel-Ende',
fr: 'Fin du panneau',
hu: 'Panel vége',
pl: 'Koniec panelu',
ru: 'Конец панели',
zh_CN: '面板末尾',
zh_TW: '面板末尾',
ja: 'パネルの最後',
},

// - Search;
'settings.search_title': {
Expand Down
2 changes: 2 additions & 0 deletions src/defaults/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export const DEFAULT_SETTINGS: SettingsState = {
dndActSearchTab: true,
dndMoveTabs: false,
dndMoveBookmarks: false,
moveTabToPanel: 'end',

// Search
searchBarMode: 'dynamic',
Expand Down Expand Up @@ -349,6 +350,7 @@ export const SETTINGS_OPTIONS = {
dndExp: ['pointer', 'hover', 'none'],
dndExpMod: ['alt', 'shift', 'ctrl', 'none'],
dndOutside: ['win', 'data'],
moveTabToPanel: ['start', 'end'],
animationSpeed: ['fast', 'norm', 'slow'],
treeRmOutdent: ['branch', 'first_child'],
colorizeTabsSrc: ['domain', 'container'],
Expand Down
6 changes: 6 additions & 0 deletions src/page.setup/components/settings.dnd.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ section(ref="el")
label="settings.dnd_act_search_tab"
v-model:value="Settings.state.dndActSearchTab"
@update:value="Settings.saveDebounced(150)")
SelectField(
label="settings.move_tab_to_panel"
optLabel="settings.move_tab_to_panel_"
v-model:value="Settings.state.moveTabToPanel"
:opts="Settings.getOpts('moveTabToPanel')"
@update:value="Settings.saveDebounced(150)")
ToggleField(
label="settings.dnd_move_tabs"
:note="translate('settings.dnd_move_tabs_note')"
Expand Down
5 changes: 4 additions & 1 deletion src/services/drag-and-drop.actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,10 @@ function getDstIndexInside(dstType: DropType, dst: DstPlaceInfo): number {
const branchLen = Tabs.getBranchLen(parent.id) ?? 0
return parent.index + branchLen + 1
} else {
return dstPanel.nextTabIndex ?? Tabs.list.length
// Use the setting to determine whether to drop at start or end
return Settings.state.moveTabToPanel === 'start'
? dstPanel.startTabIndex
: (dstPanel.nextTabIndex ?? Tabs.list.length)
}
}
// To the last position in bookmarks children list
Expand Down
1 change: 1 addition & 0 deletions src/types/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export interface SettingsState {
dndActSearchTab: boolean
dndMoveTabs: boolean
dndMoveBookmarks: boolean
moveTabToPanel: (typeof SETTINGS_OPTIONS.moveTabToPanel)[number]

// Search
searchBarMode: (typeof SETTINGS_OPTIONS.searchBarMode)[number]
Expand Down