mirror of
https://github.com/zen-browser/desktop.git
synced 2025-10-05 17:36:34 +00:00
Enhance split view functionality and styling improvements
This commit is contained in:
@@ -34,6 +34,7 @@
|
|||||||
margin-left: 0 !important;
|
margin-left: 0 !important;
|
||||||
position: absolute !important;
|
position: absolute !important;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
transition: inset 0.1s;
|
||||||
}
|
}
|
||||||
|
|
||||||
#tabbrowser-tabpanels[zen-split-view='true']:not([zen-split-resizing]) > [zen-split-anim='true'] {
|
#tabbrowser-tabpanels[zen-split-view='true']:not([zen-split-resizing]) > [zen-split-anim='true'] {
|
||||||
|
@@ -13,14 +13,21 @@ tab-group[split-view-group] {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
--zen-split-view-active-tab-bg: color-mix(in srgb, var(--zen-toolbar-element-bg), transparent 40%);
|
--zen-split-view-active-tab-bg: color-mix(in srgb, var(--zen-toolbar-element-bg), transparent 40%);
|
||||||
|
|
||||||
|
:root:not([zen-sidebar-expanded='true']) & {
|
||||||
|
padding: 2px 0;
|
||||||
|
}
|
||||||
|
|
||||||
& > .tabbrowser-tab {
|
& > .tabbrowser-tab {
|
||||||
--tab-min-height: 28px;
|
|
||||||
--tab-selected-bgcolor: var(--zen-split-view-active-tab-bg);
|
--tab-selected-bgcolor: var(--zen-split-view-active-tab-bg);
|
||||||
--tab-hover-background-color: transparent;
|
--tab-hover-background-color: transparent;
|
||||||
--tab-selected-shadow: none;
|
--tab-selected-shadow: none;
|
||||||
--border-radius-medium: var(--tab-border-radius);
|
--border-radius-medium: var(--tab-border-radius);
|
||||||
--zen-active-tab-scale: 1;
|
--zen-active-tab-scale: 1;
|
||||||
|
|
||||||
|
:root[zen-sidebar-expanded='true'] & {
|
||||||
|
--tab-min-height: 28px;
|
||||||
|
}
|
||||||
|
|
||||||
flex: 1 !important;
|
flex: 1 !important;
|
||||||
|
|
||||||
&:not(:last-child)::after {
|
&:not(:last-child)::after {
|
||||||
@@ -33,6 +40,15 @@ tab-group[split-view-group] {
|
|||||||
top: 50%;
|
top: 50%;
|
||||||
transform: translateY(-50%);
|
transform: translateY(-50%);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
:root:not([zen-sidebar-expanded='true']) &:not(:last-child)::after {
|
||||||
|
width: 16px;
|
||||||
|
height: 1px;
|
||||||
|
top: auto;
|
||||||
|
bottom: 0;
|
||||||
|
right: 50%;
|
||||||
|
transform: translateX(50%);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&:has(> tab[visuallyselected]) {
|
&:has(> tab[visuallyselected]) {
|
||||||
@@ -42,7 +58,7 @@ tab-group[split-view-group] {
|
|||||||
& > .tabbrowser-tab {
|
& > .tabbrowser-tab {
|
||||||
--tab-hover-background-color: var(--zen-split-view-active-tab-bg);
|
--tab-hover-background-color: var(--zen-split-view-active-tab-bg);
|
||||||
& .tab-background {
|
& .tab-background {
|
||||||
background-color: var(--zen-split-view-active-tab-bg);
|
background-color: var(--zen-split-view-active-tab-bg) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
&::after {
|
&::after {
|
||||||
@@ -70,6 +86,12 @@ tab-group[split-view-group] {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
:root:not([zen-sidebar-expanded='true']) {
|
||||||
|
tab-group {
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tab-group[split-view-group] .tabbrowser-tab {
|
tab-group[split-view-group] .tabbrowser-tab {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
max-width: unset;
|
max-width: unset;
|
||||||
|
@@ -391,7 +391,7 @@
|
|||||||
max-height: unset !important;
|
max-height: unset !important;
|
||||||
|
|
||||||
& .tabbrowser-tab:not(:hover) .tab-background:not([selected]):not([multiselected]) {
|
& .tabbrowser-tab:not(:hover) .tab-background:not([selected]):not([multiselected]) {
|
||||||
background: transparent !important;
|
background: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
& .tabbrowser-tab .tab-content {
|
& .tabbrowser-tab .tab-content {
|
||||||
@@ -872,7 +872,7 @@
|
|||||||
display: block;
|
display: block;
|
||||||
width: 2.5px;
|
width: 2.5px;
|
||||||
height: 16px;
|
height: 16px;
|
||||||
background: light-dark(rgba(88, 79, 79, 0.02), rgba(255, 255, 255, 0.3));
|
background: light-dark(rgba(66, 61, 61, 0.3), rgba(255, 255, 255, 0.3));
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
top: 50%;
|
top: 50%;
|
||||||
|
@@ -1383,9 +1383,8 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
|
|||||||
label: '',
|
label: '',
|
||||||
showCreateUI: false,
|
showCreateUI: false,
|
||||||
insertBefore: tabs[0],
|
insertBefore: tabs[0],
|
||||||
|
forSplitView: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
group.setAttribute('split-view-group', true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
@@ -263,6 +263,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
|
|||||||
|
|
||||||
_organizeTabsToWorkspaceSections(workspace, section, pinnedSection, tabs) {
|
_organizeTabsToWorkspaceSections(workspace, section, pinnedSection, tabs) {
|
||||||
const workspaceTabs = Array.from(tabs).filter((tab) => tab.getAttribute('zen-workspace-id') === workspace.uuid);
|
const workspaceTabs = Array.from(tabs).filter((tab) => tab.getAttribute('zen-workspace-id') === workspace.uuid);
|
||||||
|
let firstNormalTab = null;
|
||||||
for (const tab of workspaceTabs) {
|
for (const tab of workspaceTabs) {
|
||||||
if (tab.hasAttribute('zen-essential')) {
|
if (tab.hasAttribute('zen-essential')) {
|
||||||
continue; // Ignore essentials as they need to be in their own section
|
continue; // Ignore essentials as they need to be in their own section
|
||||||
@@ -272,9 +273,18 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
|
|||||||
if (tab.pinned) {
|
if (tab.pinned) {
|
||||||
pinnedSection.insertBefore(tab, pinnedSection.nextSibling);
|
pinnedSection.insertBefore(tab, pinnedSection.nextSibling);
|
||||||
} else {
|
} else {
|
||||||
|
if (!firstNormalTab) {
|
||||||
|
firstNormalTab = tab;
|
||||||
|
}
|
||||||
section.insertBefore(tab, section.lastChild);
|
section.insertBefore(tab, section.lastChild);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Kind of a hacky fix, but for some reason the first normal tab in the list
|
||||||
|
// created by session restore is added the the last position of the tab list
|
||||||
|
// let's just prepend it to the section
|
||||||
|
if (firstNormalTab) {
|
||||||
|
section.insertBefore(firstNormalTab, section.firstChild);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
initializeWorkspaceNavigation() {
|
initializeWorkspaceNavigation() {
|
||||||
@@ -989,21 +999,15 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
|
|||||||
}.bind(browser.ZenWorkspaces)
|
}.bind(browser.ZenWorkspaces)
|
||||||
);
|
);
|
||||||
|
|
||||||
element.addEventListener(
|
element.addEventListener('dragenter', function (event) {
|
||||||
'dragenter',
|
if (this.isReorderModeOn(browser) && this.draggedElement) {
|
||||||
function (event) {
|
element.classList.add('dragover');
|
||||||
if (this.isReorderModeOn(browser) && this.draggedElement) {
|
}
|
||||||
element.classList.add('dragover');
|
});
|
||||||
}
|
|
||||||
}.bind(browser.ZenWorkspaces)
|
|
||||||
);
|
|
||||||
|
|
||||||
element.addEventListener(
|
element.addEventListener('dragleave', function (event) {
|
||||||
'dragleave',
|
element.classList.remove('dragover');
|
||||||
function (event) {
|
});
|
||||||
element.classList.remove('dragover');
|
|
||||||
}.bind(browser.ZenWorkspaces)
|
|
||||||
);
|
|
||||||
|
|
||||||
element.addEventListener(
|
element.addEventListener(
|
||||||
'drop',
|
'drop',
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
|
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
|
||||||
index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e94798f4f7 100644
|
index 628aa6596627c85efe361fc1ece8fd58f7ee653e..f4a4ad413785e08bbb70df8cbb5feefd71c4dfe1 100644
|
||||||
--- a/browser/components/tabbrowser/content/tabbrowser.js
|
--- a/browser/components/tabbrowser/content/tabbrowser.js
|
||||||
+++ b/browser/components/tabbrowser/content/tabbrowser.js
|
+++ b/browser/components/tabbrowser/content/tabbrowser.js
|
||||||
@@ -412,11 +412,50 @@
|
@@ -412,11 +412,50 @@
|
||||||
@@ -238,17 +238,28 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
// Additionally send pinned tab events
|
// Additionally send pinned tab events
|
||||||
if (pinned) {
|
if (pinned) {
|
||||||
this._notifyPinnedStatus(t);
|
this._notifyPinnedStatus(t);
|
||||||
@@ -2918,7 +2990,8 @@
|
@@ -2904,6 +2976,7 @@
|
||||||
|
label = "",
|
||||||
|
insertBefore = null,
|
||||||
|
showCreateUI = false,
|
||||||
|
+ forSplitView = false,
|
||||||
|
} = {}
|
||||||
|
) {
|
||||||
|
if (!tabs?.length) {
|
||||||
|
@@ -2918,7 +2991,11 @@
|
||||||
id = `${Date.now()}-${Math.round(Math.random() * 100)}`;
|
id = `${Date.now()}-${Math.round(Math.random() * 100)}`;
|
||||||
}
|
}
|
||||||
let group = this._createTabGroup(id, color, false, label);
|
let group = this._createTabGroup(id, color, false, label);
|
||||||
- this.tabContainer.insertBefore(
|
- this.tabContainer.insertBefore(
|
||||||
|
+ if (forSplitView) {
|
||||||
|
+ group.setAttribute('split-view-group', true);
|
||||||
|
+ }
|
||||||
+ group.pinned = tabs.some(tab => tab.pinned);
|
+ group.pinned = tabs.some(tab => tab.pinned);
|
||||||
+ (group.pinned ? this.verticalPinnedTabsContainer : this.tabContainer).insertBefore(
|
+ (group.pinned ? this.verticalPinnedTabsContainer : this.tabContainer).insertBefore(
|
||||||
group,
|
group,
|
||||||
insertBefore?.group ?? insertBefore
|
insertBefore?.group ?? insertBefore
|
||||||
);
|
);
|
||||||
@@ -3126,6 +3199,7 @@
|
@@ -3126,6 +3203,7 @@
|
||||||
initialBrowsingContextGroupId,
|
initialBrowsingContextGroupId,
|
||||||
openWindowInfo,
|
openWindowInfo,
|
||||||
skipLoad,
|
skipLoad,
|
||||||
@@ -256,7 +267,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
}
|
}
|
||||||
) {
|
) {
|
||||||
// If we don't have a preferred remote type, and we have a remote
|
// If we don't have a preferred remote type, and we have a remote
|
||||||
@@ -3189,6 +3263,7 @@
|
@@ -3189,6 +3267,7 @@
|
||||||
openWindowInfo,
|
openWindowInfo,
|
||||||
name,
|
name,
|
||||||
skipLoad,
|
skipLoad,
|
||||||
@@ -264,7 +275,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3367,6 +3442,24 @@
|
@@ -3367,6 +3446,24 @@
|
||||||
) {
|
) {
|
||||||
tabWasReused = true;
|
tabWasReused = true;
|
||||||
tab = this.selectedTab;
|
tab = this.selectedTab;
|
||||||
@@ -289,7 +300,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
if (!tabData.pinned) {
|
if (!tabData.pinned) {
|
||||||
this.unpinTab(tab);
|
this.unpinTab(tab);
|
||||||
} else {
|
} else {
|
||||||
@@ -3380,6 +3473,7 @@
|
@@ -3380,6 +3477,7 @@
|
||||||
restoreTabsLazily && !select && !tabData.pinned;
|
restoreTabsLazily && !select && !tabData.pinned;
|
||||||
|
|
||||||
let url = "about:blank";
|
let url = "about:blank";
|
||||||
@@ -297,7 +308,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
if (tabData.entries?.length) {
|
if (tabData.entries?.length) {
|
||||||
let activeIndex = (tabData.index || tabData.entries.length) - 1;
|
let activeIndex = (tabData.index || tabData.entries.length) - 1;
|
||||||
// Ensure the index is in bounds.
|
// Ensure the index is in bounds.
|
||||||
@@ -3415,7 +3509,24 @@
|
@@ -3415,7 +3513,24 @@
|
||||||
skipLoad: true,
|
skipLoad: true,
|
||||||
preferredRemoteType,
|
preferredRemoteType,
|
||||||
});
|
});
|
||||||
@@ -323,7 +334,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
if (select) {
|
if (select) {
|
||||||
tabToSelect = tab;
|
tabToSelect = tab;
|
||||||
}
|
}
|
||||||
@@ -3428,8 +3539,8 @@
|
@@ -3428,8 +3543,8 @@
|
||||||
// inserted in the DOM. If the tab is not yet in the DOM,
|
// inserted in the DOM. If the tab is not yet in the DOM,
|
||||||
// just insert it in the right place from the start.
|
// just insert it in the right place from the start.
|
||||||
if (!tab.parentNode) {
|
if (!tab.parentNode) {
|
||||||
@@ -334,7 +345,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
tab.toggleAttribute("pinned", true);
|
tab.toggleAttribute("pinned", true);
|
||||||
this.tabContainer._invalidateCachedTabs();
|
this.tabContainer._invalidateCachedTabs();
|
||||||
// Then ensure all the tab open/pinning information is sent.
|
// Then ensure all the tab open/pinning information is sent.
|
||||||
@@ -3693,7 +3804,7 @@
|
@@ -3693,7 +3808,7 @@
|
||||||
// Ensure we have an index if one was not provided.
|
// Ensure we have an index if one was not provided.
|
||||||
if (typeof index != "number") {
|
if (typeof index != "number") {
|
||||||
// Move the new tab after another tab if needed, to the end otherwise.
|
// Move the new tab after another tab if needed, to the end otherwise.
|
||||||
@@ -343,7 +354,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
if (
|
if (
|
||||||
!bulkOrderedOpen &&
|
!bulkOrderedOpen &&
|
||||||
((openerTab &&
|
((openerTab &&
|
||||||
@@ -3736,18 +3847,18 @@
|
@@ -3736,18 +3851,18 @@
|
||||||
|
|
||||||
// Ensure index is within bounds.
|
// Ensure index is within bounds.
|
||||||
if (tab.pinned) {
|
if (tab.pinned) {
|
||||||
@@ -366,7 +377,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
if (tabAfter && tabAfter.group == tabGroup) {
|
if (tabAfter && tabAfter.group == tabGroup) {
|
||||||
// Place at the front of, or between tabs in, the same tab group
|
// Place at the front of, or between tabs in, the same tab group
|
||||||
this.tabContainer.insertBefore(tab, tabAfter);
|
this.tabContainer.insertBefore(tab, tabAfter);
|
||||||
@@ -4059,6 +4170,9 @@
|
@@ -4059,6 +4174,9 @@
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -376,7 +387,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
this.removeTabs(selectedTabs);
|
this.removeTabs(selectedTabs);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4391,6 +4505,7 @@
|
@@ -4391,6 +4509,7 @@
|
||||||
skipSessionStore,
|
skipSessionStore,
|
||||||
} = {}
|
} = {}
|
||||||
) {
|
) {
|
||||||
@@ -384,7 +395,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
if (UserInteraction.running("browser.tabs.opening", window)) {
|
if (UserInteraction.running("browser.tabs.opening", window)) {
|
||||||
UserInteraction.finish("browser.tabs.opening", window);
|
UserInteraction.finish("browser.tabs.opening", window);
|
||||||
}
|
}
|
||||||
@@ -4407,6 +4522,12 @@
|
@@ -4407,6 +4526,12 @@
|
||||||
TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
|
TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -397,7 +408,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
// Handle requests for synchronously removing an already
|
// Handle requests for synchronously removing an already
|
||||||
// asynchronously closing tab.
|
// asynchronously closing tab.
|
||||||
if (!animate && aTab.closing) {
|
if (!animate && aTab.closing) {
|
||||||
@@ -4421,7 +4542,9 @@
|
@@ -4421,7 +4546,9 @@
|
||||||
// frame created for it (for example, by updating the visually selected
|
// frame created for it (for example, by updating the visually selected
|
||||||
// state).
|
// state).
|
||||||
let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
|
let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
|
||||||
@@ -408,7 +419,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
if (
|
if (
|
||||||
!this._beginRemoveTab(aTab, {
|
!this._beginRemoveTab(aTab, {
|
||||||
closeWindowFastpath: true,
|
closeWindowFastpath: true,
|
||||||
@@ -4435,7 +4558,6 @@
|
@@ -4435,7 +4562,6 @@
|
||||||
TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
|
TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -416,7 +427,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
let lockTabSizing =
|
let lockTabSizing =
|
||||||
!this.tabContainer.verticalMode &&
|
!this.tabContainer.verticalMode &&
|
||||||
!aTab.pinned &&
|
!aTab.pinned &&
|
||||||
@@ -4574,14 +4696,14 @@
|
@@ -4574,14 +4700,14 @@
|
||||||
!!this.tabsInCollapsedTabGroups.length;
|
!!this.tabsInCollapsedTabGroups.length;
|
||||||
if (
|
if (
|
||||||
aTab.visible &&
|
aTab.visible &&
|
||||||
@@ -433,7 +444,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
|
|
||||||
if (closeWindow) {
|
if (closeWindow) {
|
||||||
// We've already called beforeunload on all the relevant tabs if we get here,
|
// We've already called beforeunload on all the relevant tabs if we get here,
|
||||||
@@ -4605,6 +4727,7 @@
|
@@ -4605,6 +4731,7 @@
|
||||||
|
|
||||||
newTab = true;
|
newTab = true;
|
||||||
}
|
}
|
||||||
@@ -441,7 +452,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
aTab._endRemoveArgs = [closeWindow, newTab];
|
aTab._endRemoveArgs = [closeWindow, newTab];
|
||||||
|
|
||||||
// swapBrowsersAndCloseOther will take care of closing the window without animation.
|
// swapBrowsersAndCloseOther will take care of closing the window without animation.
|
||||||
@@ -4645,9 +4768,7 @@
|
@@ -4645,9 +4772,7 @@
|
||||||
aTab._mouseleave();
|
aTab._mouseleave();
|
||||||
|
|
||||||
if (newTab) {
|
if (newTab) {
|
||||||
@@ -452,7 +463,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
} else {
|
} else {
|
||||||
TabBarVisibility.update();
|
TabBarVisibility.update();
|
||||||
}
|
}
|
||||||
@@ -4776,6 +4897,8 @@
|
@@ -4776,6 +4901,8 @@
|
||||||
this.tabs[i]._tPos = i;
|
this.tabs[i]._tPos = i;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -461,7 +472,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
if (!this._windowIsClosing) {
|
if (!this._windowIsClosing) {
|
||||||
if (wasPinned) {
|
if (wasPinned) {
|
||||||
this.tabContainer._positionPinnedTabs();
|
this.tabContainer._positionPinnedTabs();
|
||||||
@@ -4994,7 +5117,7 @@
|
@@ -4994,7 +5121,7 @@
|
||||||
!excludeTabs.has(aTab.owner) &&
|
!excludeTabs.has(aTab.owner) &&
|
||||||
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
|
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
|
||||||
) {
|
) {
|
||||||
@@ -470,7 +481,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Try to find a remaining tab that comes after the given tab
|
// Try to find a remaining tab that comes after the given tab
|
||||||
@@ -5016,7 +5139,7 @@
|
@@ -5016,7 +5143,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tab) {
|
if (tab) {
|
||||||
@@ -479,7 +490,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If no qualifying visible tab was found, see if there is a tab in
|
// If no qualifying visible tab was found, see if there is a tab in
|
||||||
@@ -5434,10 +5557,10 @@
|
@@ -5434,10 +5561,10 @@
|
||||||
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
|
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -492,7 +503,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
aTab.selected ||
|
aTab.selected ||
|
||||||
aTab.closing ||
|
aTab.closing ||
|
||||||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
|
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
|
||||||
@@ -5675,7 +5798,7 @@
|
@@ -5675,7 +5802,7 @@
|
||||||
|
|
||||||
// Don't allow mixing pinned and unpinned tabs.
|
// Don't allow mixing pinned and unpinned tabs.
|
||||||
if (aTab.pinned) {
|
if (aTab.pinned) {
|
||||||
@@ -501,7 +512,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
} else {
|
} else {
|
||||||
aIndex = Math.max(aIndex, this.pinnedTabCount);
|
aIndex = Math.max(aIndex, this.pinnedTabCount);
|
||||||
}
|
}
|
||||||
@@ -5684,11 +5807,17 @@
|
@@ -5684,11 +5811,18 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
this._handleTabMove(aTab, () => {
|
this._handleTabMove(aTab, () => {
|
||||||
@@ -511,18 +522,19 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
+ const _tPos = aTab._tPos;
|
+ const _tPos = aTab._tPos;
|
||||||
+ if ((forceStandaloneTab && neighbor.group) || neighbor.group?.hasAttribute("split-view-group")) {
|
+ if ((forceStandaloneTab && neighbor.group) || neighbor.group?.hasAttribute("split-view-group")) {
|
||||||
neighbor = neighbor.group;
|
neighbor = neighbor.group;
|
||||||
+ } else if (aTab.group && aTab.group.hasAttribute("split-view-group")) {
|
}
|
||||||
|
- if (neighbor && aIndex >= aTab._tPos) {
|
||||||
|
+ if (aTab.group?.hasAttribute("split-view-group")) {
|
||||||
+ aTab = aTab.group;
|
+ aTab = aTab.group;
|
||||||
+ }
|
+ }
|
||||||
+ if (aTab.group?.hasAttribute("split-view-group") && neighbor == aTab.group) {
|
+ if (aTab.group?.hasAttribute("split-view-group") && neighbor == aTab.group) {
|
||||||
+ return;
|
+ return;
|
||||||
}
|
+ }
|
||||||
- if (neighbor && aIndex >= aTab._tPos) {
|
|
||||||
+ if (neighbor && aIndex >= _tPos) {
|
+ if (neighbor && aIndex >= _tPos) {
|
||||||
neighbor.after(aTab);
|
neighbor.after(aTab);
|
||||||
} else {
|
} else {
|
||||||
this.tabContainer.insertBefore(aTab, neighbor);
|
this.tabContainer.insertBefore(aTab, neighbor);
|
||||||
@@ -5697,7 +5826,7 @@
|
@@ -5697,7 +5831,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
moveTabToGroup(aTab, aGroup) {
|
moveTabToGroup(aTab, aGroup) {
|
||||||
@@ -531,7 +543,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (aTab.group && aTab.group.id === aGroup.id) {
|
if (aTab.group && aTab.group.id === aGroup.id) {
|
||||||
@@ -5721,6 +5850,8 @@
|
@@ -5721,6 +5855,8 @@
|
||||||
|
|
||||||
moveActionCallback();
|
moveActionCallback();
|
||||||
|
|
||||||
@@ -540,7 +552,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
// Clear tabs cache after moving nodes because the order of tabs may have
|
// Clear tabs cache after moving nodes because the order of tabs may have
|
||||||
// changed.
|
// changed.
|
||||||
this.tabContainer._invalidateCachedTabs();
|
this.tabContainer._invalidateCachedTabs();
|
||||||
@@ -5771,7 +5902,7 @@
|
@@ -5771,7 +5907,7 @@
|
||||||
createLazyBrowser,
|
createLazyBrowser,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -549,7 +561,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
|
if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
|
||||||
params.pinned = true;
|
params.pinned = true;
|
||||||
}
|
}
|
||||||
@@ -7415,6 +7546,7 @@
|
@@ -7415,6 +7551,7 @@
|
||||||
aWebProgress.isTopLevel
|
aWebProgress.isTopLevel
|
||||||
) {
|
) {
|
||||||
this.mTab.setAttribute("busy", "true");
|
this.mTab.setAttribute("busy", "true");
|
||||||
@@ -557,7 +569,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
gBrowser._tabAttrModified(this.mTab, ["busy"]);
|
gBrowser._tabAttrModified(this.mTab, ["busy"]);
|
||||||
this.mTab._notselectedsinceload = !this.mTab.selected;
|
this.mTab._notselectedsinceload = !this.mTab.selected;
|
||||||
}
|
}
|
||||||
@@ -8381,7 +8513,7 @@ var TabContextMenu = {
|
@@ -8381,7 +8518,7 @@ var TabContextMenu = {
|
||||||
);
|
);
|
||||||
contextUnpinSelectedTabs.hidden =
|
contextUnpinSelectedTabs.hidden =
|
||||||
!this.contextTab.pinned || !multiselectionContext;
|
!this.contextTab.pinned || !multiselectionContext;
|
||||||
@@ -566,7 +578,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
// Move Tab items
|
// Move Tab items
|
||||||
let contextMoveTabOptions = document.getElementById(
|
let contextMoveTabOptions = document.getElementById(
|
||||||
"context_moveTabOptions"
|
"context_moveTabOptions"
|
||||||
@@ -8414,7 +8546,7 @@ var TabContextMenu = {
|
@@ -8414,7 +8551,7 @@ var TabContextMenu = {
|
||||||
let contextMoveTabToStart = document.getElementById("context_moveToStart");
|
let contextMoveTabToStart = document.getElementById("context_moveToStart");
|
||||||
let isFirstTab =
|
let isFirstTab =
|
||||||
tabsToMove[0] == visibleTabs[0] ||
|
tabsToMove[0] == visibleTabs[0] ||
|
||||||
@@ -575,7 +587,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..287ff24e0fee10f435fd33914756d9e9
|
|||||||
contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
|
contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
|
||||||
|
|
||||||
document.getElementById("context_openTabInWindow").disabled =
|
document.getElementById("context_openTabInWindow").disabled =
|
||||||
@@ -8647,6 +8779,7 @@ var TabContextMenu = {
|
@@ -8647,6 +8784,7 @@ var TabContextMenu = {
|
||||||
if (this.contextTab.multiselected) {
|
if (this.contextTab.multiselected) {
|
||||||
gBrowser.removeMultiSelectedTabs();
|
gBrowser.removeMultiSelectedTabs();
|
||||||
} else {
|
} else {
|
||||||
|
Reference in New Issue
Block a user