mirror of
https://github.com/zen-browser/desktop.git
synced 2026-01-25 14:16:10 +00:00
feat: Fixed allowing folders to drop into normal tabs, b=no-bug, c=tabs
This commit is contained in:
@@ -973,13 +973,15 @@
|
||||
(possibleFolderElement.collapsed ||
|
||||
possibleFolderElement.childGroupsAndTabs.length < 2)));
|
||||
if (
|
||||
isTabGroupLabel(draggedTab) &&
|
||||
draggedTab.group?.isZenFolder &&
|
||||
(isTab(dropElement) || dropElement.hasAttribute("split-view-group")) &&
|
||||
(!dropElement.pinned || dropElement.hasAttribute("zen-essential"))
|
||||
(isTabGroupLabel(draggedTab) &&
|
||||
draggedTab.group?.isZenFolder &&
|
||||
(isTab(dropElement) || dropElement.hasAttribute("split-view-group")) &&
|
||||
(!dropElement.pinned || dropElement.hasAttribute("zen-essential"))) ||
|
||||
showIndicatorUnderNewTabButton
|
||||
) {
|
||||
dropElement = null;
|
||||
this.clearDragOverVisuals();
|
||||
return null;
|
||||
return [dropElement, dropBefore];
|
||||
}
|
||||
if (
|
||||
isTab(dropElement) ||
|
||||
@@ -994,7 +996,7 @@
|
||||
let top = 0;
|
||||
threshold =
|
||||
Services.prefs.getIntPref("browser.tabs.dragDrop.moveOverThresholdPercent") / 100;
|
||||
if (overlapPercent > threshold) {
|
||||
if (overlapPercent > threshold || showIndicatorUnderNewTabButton) {
|
||||
top = Math.round(rect.top + rect.height) + "px";
|
||||
dropBefore = false;
|
||||
} else {
|
||||
|
||||
@@ -565,6 +565,12 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
|
||||
currentEssenialContainer.essentialsPromo.remove();
|
||||
}
|
||||
|
||||
movingTabs = movingTabs.filter((tab) =>
|
||||
gBrowser.isTabGroupLabel(tab)
|
||||
? tab.group?.isZenFolder && !tabsTarget && !essentialTabsTarget
|
||||
: true
|
||||
);
|
||||
|
||||
// TODO: Solve the issue of adding a tab between two groups
|
||||
// Remove group labels from the moving tabs and replace it
|
||||
// with the sub tabs
|
||||
|
||||
Reference in New Issue
Block a user