mirror of
https://github.com/zen-browser/desktop.git
synced 2025-10-05 09:26:34 +00:00
Small fixed for new split view groups
This commit is contained in:
@@ -221,15 +221,6 @@
|
||||
background-color: var(--zen-colors-secondary);
|
||||
align-items: center;
|
||||
z-index: 100;
|
||||
}
|
||||
|
||||
.zen-view-splitter-drag-handle {
|
||||
flex-grow: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
cursor: move;
|
||||
}
|
||||
|
||||
@@ -245,6 +236,7 @@
|
||||
height: 24px;
|
||||
cursor: pointer;
|
||||
appearance: none;
|
||||
margin-left: auto;
|
||||
outline: var(--toolbarbutton-outline);
|
||||
list-style-image: url('chrome://global/skin/icons/close-fill.svg') !important;
|
||||
&:hover {
|
||||
|
@@ -872,9 +872,6 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
|
||||
_createHeader(container) {
|
||||
const header = document.createElement('div');
|
||||
header.classList.add('zen-view-splitter-header');
|
||||
const dragHandle = document.createElement('div');
|
||||
dragHandle.classList.add('zen-view-splitter-drag-handle');
|
||||
header.appendChild(dragHandle);
|
||||
const removeButton = document.createXULElement('toolbarbutton');
|
||||
removeButton.classList.add('zen-tab-unsplit-button');
|
||||
removeButton.addEventListener('click', () => {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
|
||||
index 628aa6596627c85efe361fc1ece8fd58f7ee653e..36ac8b0623059638ecb3fb1821b272964d0e4aea 100644
|
||||
index 628aa6596627c85efe361fc1ece8fd58f7ee653e..59c563683fc18972fffd51c41d1d1c159b62f28d 100644
|
||||
--- a/browser/components/tabbrowser/content/tabbrowser.js
|
||||
+++ b/browser/components/tabbrowser/content/tabbrowser.js
|
||||
@@ -412,11 +412,50 @@
|
||||
@@ -283,7 +283,17 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..36ac8b0623059638ecb3fb1821b27296
|
||||
if (
|
||||
!bulkOrderedOpen &&
|
||||
((openerTab &&
|
||||
@@ -3744,7 +3845,7 @@
|
||||
@@ -3736,18 +3837,18 @@
|
||||
|
||||
// Ensure index is within bounds.
|
||||
if (tab.pinned) {
|
||||
- index = Math.max(index, 0);
|
||||
- index = Math.min(index, this.pinnedTabCount);
|
||||
+ index = Math.max(index, tab.hasAttribute("zen-essential") ? 0 : this._numZenEssentials);
|
||||
+ index = Math.min(index, tab.hasAttribute("zen-essential") ? this._numZenEssentials : this.pinnedTabCount);
|
||||
} else {
|
||||
index = Math.max(index, this.pinnedTabCount);
|
||||
index = Math.min(index, this.tabs.length);
|
||||
}
|
||||
|
||||
/** @type {MozTabbrowserTab|undefined} */
|
||||
@@ -291,7 +301,11 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..36ac8b0623059638ecb3fb1821b27296
|
||||
+ let tabAfter = this.tabs.filter(tab => !tab.hasAttribute("zen-glance-tab")).at(index);
|
||||
this.tabContainer._invalidateCachedTabs();
|
||||
|
||||
if (tabGroup) {
|
||||
- if (tabGroup) {
|
||||
+ if (tabGroup && !tabGroup.hasAttribute("split-view-group")) {
|
||||
if (tabAfter && tabAfter.group == tabGroup) {
|
||||
// Place at the front of, or between tabs in, the same tab group
|
||||
this.tabContainer.insertBefore(tab, tabAfter);
|
||||
@@ -4059,6 +4160,9 @@
|
||||
return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user