mirror of
https://github.com/zen-browser/desktop.git
synced 2025-07-07 23:00:01 +02:00
chore: Update Zen browser components submodule commit reference and improve flatpak configuration and fixed tabs not fully closing
This commit is contained in:
parent
bd449faf05
commit
c57db962f8
9 changed files with 42 additions and 44 deletions
3
.gitattributes
vendored
Normal file
3
.gitattributes
vendored
Normal file
|
@ -0,0 +1,3 @@
|
|||
|
||||
*-c.patch linguist-language=C++
|
||||
*-cpp.patch linguist-language=C++
|
6
.github/workflows/alpha.yml
vendored
6
.github/workflows/alpha.yml
vendored
|
@ -298,15 +298,13 @@ jobs:
|
|||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage
|
||||
path: |
|
||||
./dist/zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage
|
||||
path: ./dist/zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage
|
||||
|
||||
- name: Upload artifact (ZSync)
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage.zsync
|
||||
path: |
|
||||
./dist/zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage.zsync
|
||||
path: ./dist/zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage.zsync
|
||||
|
||||
release:
|
||||
if: ${{ github.event.inputs.create_release == 'true' }}
|
||||
|
|
|
@ -71,7 +71,8 @@ pref('zen.view.compact.hide-toolbar', false);
|
|||
pref('zen.view.sidebar-expanded', false);
|
||||
pref('zen.view.sidebar-expanded.show-button', true);
|
||||
pref('zen.view.sidebar-expanded.max-width', 400);
|
||||
pref('zen.keyboard.shortcuts', "{}");
|
||||
pref('zen.keyboard.shortcuts.enabled', true);
|
||||
pref('zen.keyboard.shortcuts', ""); // Empty string means default shortcuts
|
||||
pref('zen.keyboard.shortcuts.disable-firefox', false);
|
||||
|
||||
// Pref to enable the new profiles (TODO: Check this out!)
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 3e1d38d9078b2d5289dd9cae1cad75c35dfe3981
|
||||
Subproject commit 0ab7cda4d5f8e0cfe0d1776e17a6066b15c2f5c8
|
|
@ -124,6 +124,7 @@ var ZenThemeModifier = {
|
|||
|
||||
gZenVerticalTabsManager.init();
|
||||
gZenCompactModeManager.init();
|
||||
gZenKeyboardShortcuts.init();
|
||||
|
||||
this._updateZenAvatar();
|
||||
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', this._onPrefersColorSchemeChange.bind(this));
|
||||
|
@ -153,8 +154,8 @@ var ZenThemeModifier = {
|
|||
const tabs = document.getElementById("tabbrowser-arrowscrollbox");
|
||||
tabs.style.maxHeight = '0px'; // reset to 0
|
||||
const toolbarRect = toolbarItems.getBoundingClientRect();
|
||||
// -7 for the controls padding
|
||||
tabs.style.maxHeight = toolbarRect.height - 7 + "px";
|
||||
// -5 for the controls padding
|
||||
tabs.style.maxHeight = toolbarRect.height - 5 + "px";
|
||||
console.info("ZenThemeModifier: set tabs max-height to", toolbarRect.height + "px");
|
||||
},
|
||||
|
||||
|
|
|
@ -164,13 +164,15 @@ var gZenCKSSettings = {
|
|||
meta: event.metaKey
|
||||
};
|
||||
|
||||
if (event.key === "Tab") {
|
||||
const shortcutWithoutModifiers = !shortcut.ctrl && !shortcut.alt && !shortcut.shift && !shortcut.meta;
|
||||
|
||||
if (event.key === "Tab" && shortcutWithoutModifiers) {
|
||||
return;
|
||||
} else if (event.key === "Escape") {
|
||||
} else if (event.key === "Escape" && shortcutWithoutModifiers) {
|
||||
this._currentAction = null;
|
||||
input.blur();
|
||||
return;
|
||||
} else if (event.key === "Backspace") {
|
||||
} else if (event.key === "Backspace" && shortcutWithoutModifiers) {
|
||||
this._resetCKS(input, this._currentAction);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
|
||||
index 3b97732d8035f07a2308f76f235702c70a5fa388..edbc1ad66a84fd17b1674ff7852cdf01bef0c21b 100644
|
||||
index e9aa0f03c26dc26e1a2e56d28fadb70e60c8e8ca..9c209752b01bd07a3f38452da4bc8efc7433466c 100644
|
||||
--- a/browser/components/tabbrowser/content/tabs.js
|
||||
+++ b/browser/components/tabbrowser/content/tabs.js
|
||||
@@ -552,19 +552,36 @@
|
||||
|
@ -146,21 +146,7 @@ index 3b97732d8035f07a2308f76f235702c70a5fa388..edbc1ad66a84fd17b1674ff7852cdf01
|
|||
children.pop();
|
||||
this._allTabs = children;
|
||||
return children;
|
||||
@@ -1144,10 +1188,13 @@
|
||||
}
|
||||
|
||||
_initializeArrowScrollbox() {
|
||||
+ this.toggleAttribute("overflow", true);
|
||||
+
|
||||
let arrowScrollbox = this.arrowScrollbox;
|
||||
let previewElement = document.getElementById("tab-preview-panel");
|
||||
arrowScrollbox.shadowRoot.addEventListener(
|
||||
"underflow",
|
||||
event => {
|
||||
+ return;
|
||||
// Ignore underflow events:
|
||||
// - from nested scrollable elements
|
||||
@@ -1471,11 +1518,11 @@
|
||||
@@ -1476,11 +1520,11 @@
|
||||
for (let i = numPinned - 1; i >= 0; i--) {
|
||||
let tab = tabs[i];
|
||||
width += layoutData.pinnedTabWidth;
|
||||
|
@ -177,7 +163,7 @@ index 3b97732d8035f07a2308f76f235702c70a5fa388..edbc1ad66a84fd17b1674ff7852cdf01
|
|||
tab._pinnedUnscrollable = true;
|
||||
}
|
||||
this.style.setProperty(
|
||||
@@ -1510,19 +1557,30 @@
|
||||
@@ -1515,19 +1559,30 @@
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -217,7 +203,7 @@ index 3b97732d8035f07a2308f76f235702c70a5fa388..edbc1ad66a84fd17b1674ff7852cdf01
|
|||
|
||||
let pinned = draggedTab.pinned;
|
||||
let numPinned = gBrowser._numPinnedTabs;
|
||||
@@ -1531,36 +1589,39 @@
|
||||
@@ -1536,36 +1591,39 @@
|
||||
pinned ? numPinned : undefined
|
||||
);
|
||||
|
||||
|
@ -268,7 +254,7 @@ index 3b97732d8035f07a2308f76f235702c70a5fa388..edbc1ad66a84fd17b1674ff7852cdf01
|
|||
}
|
||||
|
||||
draggedTab._dragData.translateX = translateX;
|
||||
@@ -1593,11 +1654,11 @@
|
||||
@@ -1598,11 +1656,11 @@
|
||||
if (tabs[mid] == draggedTab && ++mid > high) {
|
||||
break;
|
||||
}
|
||||
|
@ -282,7 +268,7 @@ index 3b97732d8035f07a2308f76f235702c70a5fa388..edbc1ad66a84fd17b1674ff7852cdf01
|
|||
tabCenter
|
||||
) {
|
||||
low = mid + 1;
|
||||
@@ -1620,16 +1681,16 @@
|
||||
@@ -1625,16 +1683,16 @@
|
||||
for (let tab of tabs) {
|
||||
if (tab != draggedTab) {
|
||||
let shift = getTabShift(tab, newIndex);
|
||||
|
@ -302,7 +288,7 @@ index 3b97732d8035f07a2308f76f235702c70a5fa388..edbc1ad66a84fd17b1674ff7852cdf01
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -1701,9 +1762,9 @@
|
||||
@@ -1706,9 +1764,9 @@
|
||||
|
||||
// Slide the relevant tabs to their new position.
|
||||
for (let t of this._getVisibleTabs()) {
|
||||
|
|
|
@ -82,6 +82,8 @@ zen-cks-group-open-page-action = Open Page Actions
|
|||
zen-cks-group-downloads-action = Downloads Actions
|
||||
zen-cks-group-sidebar-action = Sidebar Actions
|
||||
zen-cks-group-compact-mode-action = Compact Mode Actions
|
||||
zen-cks-group-split-view-action = Split View Actions
|
||||
zen-cks-group-workspace-action = Workspace Actions
|
||||
|
||||
open-new-tab = Open New Tab
|
||||
close-tab = Close Tab
|
||||
|
@ -146,3 +148,8 @@ zen-toggle-web-panels = Toggle Web Panels
|
|||
zen-toggle-compact-mode = Toggle Compact Mode
|
||||
zen-toggle-compact-mode-sidebar = Toggle Compact Mode Sidebar
|
||||
zen-toggle-compact-mode-toolbar = Toggle Compact Mode Toolbar
|
||||
zen-change-workspace = Cycle Workspaces
|
||||
zen-split-view-grid = Split View Grid
|
||||
zen-split-view-vertical = Split View Vertical
|
||||
zen-split-view-horizontal = Split View Horizontal
|
||||
zen-split-view-close = Close Split View
|
||||
|
|
|
@ -815,7 +815,6 @@ panelmultiview {
|
|||
|
||||
#TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) {
|
||||
width: 100% !important;
|
||||
justify-content: start;
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
|
@ -823,22 +822,22 @@ panelmultiview {
|
|||
background: var(--button-hover-bgcolor);
|
||||
}
|
||||
|
||||
#TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) .toolbarbutton-text {
|
||||
display: block;
|
||||
margin: 0 !important;
|
||||
padding-left: 0 !important;
|
||||
}
|
||||
|
||||
#TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) .toolbarbutton-text {
|
||||
text-align: start;
|
||||
}
|
||||
|
||||
#TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) .toolbarbutton-text,
|
||||
#TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) .toolbarbutton-icon,
|
||||
#TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) .toolbarbutton-badge-stack {
|
||||
background: transparent !important;
|
||||
}
|
||||
|
||||
#tabbrowser-arrowscrollbox-periphery {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
#tabbrowser-arrowscrollbox-periphery > toolbarbutton {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.tabbrowser-tab {
|
||||
max-width: unset !important;
|
||||
|
||||
|
@ -887,7 +886,8 @@ panelmultiview {
|
|||
padding: 5px;
|
||||
}
|
||||
|
||||
.tabbrowser-tab:not([pinned]) {
|
||||
.tabbrowser-tab:not([pinned]),
|
||||
#tabbrowser-arrowscrollbox-periphery {
|
||||
grid-column: 1 / -1;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue