mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-01-08 06:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Fixed git conflicts for compact mode fix, b=no-bug, c=compact-mode

Browse Source
This commit is contained in:
Mr. M
2025-11-12 20:20:11 +01:00
parent 00b132d8b4
commit 2ac1db0fac
1 changed files with 9 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/zen/compact-mode/ZenCompactMode.mjs
View File

@@ -359,47 +359,11 @@
) {
return;
}
<<<<<<< Updated upstream
delete gZenVerticalTabsManager._hadSidebarCollapse;
this.sidebar.style.setProperty('--zen-sidebar-width', `${sidebarWidth}px`);
}
return sidebarWidth;
},
=======
if (document.documentElement.hasAttribute('zen-sidebar-expanded')) {
sidebarWidth -= 0.5 * splitterWidth;
if (elementSeparation < splitterWidth) {
// Subtract from the splitter width to end up with the correct element separation
sidebarWidth += 1.5 * splitterWidth - elementSeparation;
}
} else {
sidebarWidth -= elementSeparation;
}
if (canHideSidebar && isCompactMode) {
this._setElementExpandAttribute(this.sidebar, false);
gZenUIManager.motion
.animate(
this.sidebar,
{
marginRight: [0, this.sidebarIsOnRight ? `-${sidebarWidth}px` : 0],
marginLeft: [0, this.sidebarIsOnRight ? 0 : `-${sidebarWidth}px`],
},
{
ease: 'easeIn',
type: 'spring',
bounce: 0,
duration: 0.12,
}
)
.then(() => {
this.sidebar.style.transition = 'none';
this.sidebar.style.pointEvents = 'none';
const titlebar = document.getElementById('titlebar');
titlebar.style.visibility = 'hidden';
titlebar.style.transition = 'none';
this.sidebar.removeAttribute('animate');
document.documentElement.removeAttribute('zen-compact-animating');
>>>>>>> Stashed changes
get canHideSidebar() {
return (
@@ -456,16 +420,16 @@
resolve();
return;
}
if (canHideSidebar && isCompactMode) {
if (document.documentElement.hasAttribute('zen-sidebar-expanded')) {
sidebarWidth -= 0.5 * splitterWidth;
if (elementSeparation < splitterWidth) {
// Subtract from the splitter width to end up with the correct element separation
sidebarWidth += 1.5 * splitterWidth - elementSeparation;
}
} else {
sidebarWidth -= elementSeparation;
if (document.documentElement.hasAttribute('zen-sidebar-expanded')) {
sidebarWidth -= 0.5 * splitterWidth;
if (elementSeparation < splitterWidth) {
// Subtract from the splitter width to end up with the correct element separation
sidebarWidth += 1.5 * splitterWidth - elementSeparation;
}
} else {
sidebarWidth -= elementSeparation;
}
if (canHideSidebar && isCompactMode) {
this._setElementExpandAttribute(this.sidebar, false);
gZenUIManager.motion
.animate(