mirror of
https://github.com/zen-browser/desktop.git
synced 2025-09-05 19:08:18 +00:00
Update subproject commit in zen-components
This commit is contained in:
Submodule src/browser/base/content/zen-components updated: 208e147264...6d542ea79b
@@ -1,68 +0,0 @@
|
||||
diff --git a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
|
||||
index 9f4aa535e07adab496788165f4089be6732b1444..7b7955c0d1f2f3277cb750652458649d181e90e5 100644
|
||||
--- a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
|
||||
+++ b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
|
||||
@@ -39,6 +39,10 @@ XPCOMUtils.defineLazyPreferenceGetter(
|
||||
300
|
||||
);
|
||||
|
||||
+function zenSplitViewIsEnabled() {
|
||||
+ return Services.prefs.getBoolPref("zen.splitView.working", false);
|
||||
+}
|
||||
+
|
||||
/**
|
||||
* The tab switcher is responsible for asynchronously switching
|
||||
* tabs in e10s. It waits until the new tab is ready (i.e., the
|
||||
@@ -279,7 +283,7 @@ export class AsyncTabSwitcher {
|
||||
browser.docShellIsActive = true;
|
||||
}
|
||||
|
||||
- if (remoteTab) {
|
||||
+ if (remoteTab && !zenSplitViewIsEnabled()) {
|
||||
browser.renderLayers = true;
|
||||
remoteTab.priorityHint = true;
|
||||
}
|
||||
@@ -291,7 +295,7 @@ export class AsyncTabSwitcher {
|
||||
// Setting the docShell to be inactive will also cause it
|
||||
// to stop rendering layers.
|
||||
browser.docShellIsActive = false;
|
||||
- if (remoteTab) {
|
||||
+ if (remoteTab && !zenSplitViewIsEnabled()) {
|
||||
remoteTab.priorityHint = false;
|
||||
}
|
||||
if (!browser.hasLayers) {
|
||||
@@ -364,7 +368,7 @@ export class AsyncTabSwitcher {
|
||||
// constructing BrowserChild's, layer trees, etc, by showing a blank
|
||||
// tab instead and focusing it immediately.
|
||||
let shouldBeBlank = false;
|
||||
- if (requestedBrowser.isRemoteBrowser) {
|
||||
+ if (requestedBrowser.isRemoteBrowser && !zenSplitViewIsEnabled()) {
|
||||
// If a tab is remote and the window is not minimized, we can show a
|
||||
// blank tab instead of a spinner in the following cases:
|
||||
//
|
||||
@@ -399,7 +403,7 @@ export class AsyncTabSwitcher {
|
||||
}
|
||||
}
|
||||
|
||||
- if (requestedBrowser.isRemoteBrowser) {
|
||||
+ if (requestedBrowser.isRemoteBrowser && !zenSplitViewIsEnabled()) {
|
||||
this.addLogFlag("isRemote");
|
||||
}
|
||||
|
||||
@@ -825,7 +829,7 @@ export class AsyncTabSwitcher {
|
||||
`onRemotenessChange(${tab._tPos}, ${tab.linkedBrowser.isRemoteBrowser})`
|
||||
);
|
||||
if (!tab.linkedBrowser.isRemoteBrowser) {
|
||||
- if (this.getTabState(tab) == this.STATE_LOADING) {
|
||||
+ if (this.getTabState(tab) == this.STATE_LOADING && !zenSplitViewIsEnabled()) {
|
||||
this.onLayersReady(tab.linkedBrowser);
|
||||
} else if (this.getTabState(tab) == this.STATE_UNLOADING) {
|
||||
this.onLayersCleared(tab.linkedBrowser);
|
||||
@@ -1018,6 +1022,7 @@ export class AsyncTabSwitcher {
|
||||
lazy.gTabCacheSize > 1 &&
|
||||
tab.linkedBrowser.isRemoteBrowser &&
|
||||
tab.linkedBrowser.currentURI.spec != "about:blank"
|
||||
+ && !zenSplitViewIsEnabled()
|
||||
) {
|
||||
let tabIndex = this.tabLayerCache.indexOf(tab);
|
||||
|
@@ -1,13 +0,0 @@
|
||||
diff --git a/dom/ipc/BrowserHost.cpp b/dom/ipc/BrowserHost.cpp
|
||||
index 489f07a612e52a3edb00f59e53495dcd9e16c0f5..1799e0d416f9d7be2c9e34c237d6ff741e5e2420 100644
|
||||
--- a/dom/ipc/BrowserHost.cpp
|
||||
+++ b/dom/ipc/BrowserHost.cpp
|
||||
@@ -106,7 +106,7 @@ void BrowserHost::UpdateEffects(EffectsInfo aEffects) {
|
||||
/* attribute boolean renderLayers; */
|
||||
NS_IMETHODIMP
|
||||
BrowserHost::GetRenderLayers(bool* aRenderLayers) {
|
||||
- if (!mRoot) {
|
||||
+ if (!mRoot && !Preferences::GetBool("zen.splitView.working", false)) {
|
||||
*aRenderLayers = false;
|
||||
return NS_OK;
|
||||
}
|
@@ -1,13 +0,0 @@
|
||||
diff --git a/toolkit/themes/linux/global/menu.css b/toolkit/themes/linux/global/menu.css
|
||||
index da47f78790a251bb573d992476dc5dac9a870857..c7d019df2164b95fca29ec5a72e7fe4188d1e1e6 100644
|
||||
--- a/toolkit/themes/linux/global/menu.css
|
||||
+++ b/toolkit/themes/linux/global/menu.css
|
||||
@@ -52,7 +52,7 @@ menulist > menupopup > :is(menuitem, menucaption, menu) {
|
||||
|
||||
.menu-text {
|
||||
/* This is (18 + the size of end-padding on .menu-iconic-left)px */
|
||||
- margin-inline-start: 21px;
|
||||
+ margin-inline-start: 0;
|
||||
}
|
||||
|
||||
.menu-accel,
|
@@ -1 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.b{fill:#8000d7;}.b,.c{stroke-width:0px;}.c{fill:#fff;}</style></defs><circle class="b" cx="10" cy="10" r="9.5"/><path class="c" d="M12.7711,11.1656c-1.1727,0-2.1528.798-2.4543,1.876h-.634c-.3015-1.078-1.2816-1.876-2.4543-1.876-1.4113,0-2.5595,1.1492-2.5595,2.5606s1.1482,2.5596,2.5595,2.5596c1.1727,0,2.1528-.7973,2.4543-1.875h.634c.3015,1.0777,1.2816,1.875,2.4543,1.875,1.4114,0,2.5606-1.1483,2.5606-2.5596s-1.1492-2.5606-2.5606-2.5606ZM7.2284,14.9166c-.6568,0-1.1913-.5334-1.1913-1.1903s.5345-1.1914,1.1913-1.1914c.6564,0,1.1909.5345,1.1909,1.1914s-.5345,1.1903-1.1909,1.1903ZM12.7711,14.9166c-.6569,0-1.1904-.5334-1.1904-1.1903s.5335-1.1914,1.1904-1.1914,1.1914.5345,1.1914,1.1914-.5345,1.1903-1.1914,1.1903ZM16.3154,8.9273h-1.4463l-.6548-4.6247c-.0298-.2092-.1542-.3932-.3382-.498-.184-.1043-.407-.1198-.6003-.038l-3.276,1.3538-3.2761-1.3538c-.1953-.0817-.4178-.0668-.6003.038-.184.1049-.3084.2889-.3382.498l-.6543,4.6247h-1.4468c-.3777,0-.6841.3063-.6841.6841s.3063.6841.6841.6841h12.6313c.3783,0,.6846-.3063.6846-.6841s-.3063-.6841-.6846-.6841ZM7.0167,5.3681l2.722,1.1245c.1665.0699.3557.0699.5222,0l2.722-1.1245.5042,3.5592h-6.9741l.5038-3.5592Z"/></svg>
|
Before Width: | Height: | Size: 1.3 KiB |
@@ -1,20 +0,0 @@
|
||||
diff --git a/widget/ThemeColors.h b/widget/ThemeColors.h
|
||||
index 739a7ca0f0ff4d1647c5c204b49ba7cc157c76fd..86a89bc890ec5ef824f0a0295876fddb9e363c7c 100644
|
||||
--- a/widget/ThemeColors.h
|
||||
+++ b/widget/ThemeColors.h
|
||||
@@ -13,8 +13,14 @@
|
||||
|
||||
namespace mozilla::widget {
|
||||
|
||||
+#ifndef ZEN_DEFAULT_ACCENT_COLOR
|
||||
+// Like a normal hex code:
|
||||
+// 0xRRGGBBAA
|
||||
+#define ZEN_DEFAULT_ACCENT_COLOR 0x000000df
|
||||
+#endif
|
||||
+
|
||||
static constexpr gfx::sRGBColor sDefaultAccent(
|
||||
- gfx::sRGBColor::UnusualFromARGB(0xff0060df)); // Luminance: 13.69346%
|
||||
+ gfx::sRGBColor::UnusualFromARGB(ZEN_DEFAULT_ACCENT_COLOR)); // Luminance: 13.69346%
|
||||
static constexpr gfx::sRGBColor sDefaultAccentText(
|
||||
gfx::sRGBColor::OpaqueWhite());
|
||||
|
Reference in New Issue
Block a user