Fixed clicking on the URLbar not doing anything for always floating and fixed experimental rounded corners

This commit is contained in:
mr. M
2024-12-17 00:02:14 +01:00
parent d83f41eaf2
commit 8c983e1849
3 changed files with 17 additions and 13 deletions

View File

@@ -18,13 +18,13 @@
:root[zen-no-padding='true'] &:not([zen-split="true"]) { :root[zen-no-padding='true'] &:not([zen-split="true"]) {
border-radius: 0 !important; border-radius: 0 !important;
} }
}
@media (-moz-bool-pref: 'zen.view.experimental-rounded-view') { @media (-moz-bool-pref: 'zen.view.experimental-rounded-view') {
#tabbrowser-tabpanels { #tabbrowser-tabpanels {
mix-blend-mode: multiply; mix-blend-mode: multiply;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
isolation: isolate; isolation: isolate;
}
} }
} }
} }

View File

@@ -72,9 +72,12 @@
--button-background-color-hover: var(--in-content-button-background-hover) !important; --button-background-color-hover: var(--in-content-button-background-hover) !important;
--button-background-color-active: var(--in-content-primary-button-background-active) !important; --button-background-color-active: var(--in-content-primary-button-background-active) !important;
--color-accent-primary: var(--zen-colors-primary) !important; --color-accent-primary: var(--button-primary-bgcolor) !important;
--color-accent-primary-hover: var(--zen-branding-bg-reverse) !important; --color-accent-primary-hover: var(--button-primary-hover-bgcolor) !important;
--color-accent-primary-active: var(--zen-branding-bg-reverse) !important; --color-accent-primary-active: var(--button-primary-active-bgcolor) !important;
--link-color: var(--zen-colors-primary) !important;
--link-color-hover: var(--zen-branding-bg-reverse) !important;
--in-content-page-background: var(--zen-colors-tertiary) !important; --in-content-page-background: var(--zen-colors-tertiary) !important;
--zen-in-content-dialog-background: var(--zen-colors-tertiary); --zen-in-content-dialog-background: var(--zen-colors-tertiary);

View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
index c504c9afc43785b5f003bb1f9f1dfbddef38d78b..f4167cf9f3dcbbb8666118436e9f79137caf565a 100644 index c504c9afc43785b5f003bb1f9f1dfbddef38d78b..b8acf033b211b18ff5114a81648483abf165be51 100644
--- a/browser/components/urlbar/UrlbarInput.sys.mjs --- a/browser/components/urlbar/UrlbarInput.sys.mjs
+++ b/browser/components/urlbar/UrlbarInput.sys.mjs +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
@@ -65,6 +65,13 @@ XPCOMUtils.defineLazyPreferenceGetter( @@ -65,6 +65,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -39,19 +39,20 @@ index c504c9afc43785b5f003bb1f9f1dfbddef38d78b..f4167cf9f3dcbbb8666118436e9f7913
if ( if (
event.target == this.inputField || event.target == this.inputField ||
event.target == this._inputContainer || event.target == this._inputContainer ||
@@ -4012,8 +4028,11 @@ export class UrlbarInput { @@ -4012,9 +4028,12 @@ export class UrlbarInput {
} }
_on_mousedown(event) { _on_mousedown(event) {
- switch (event.currentTarget) { - switch (event.currentTarget) {
+ switch (event.zenOriginalTarget || event.currentTarget) { + switch (event.zenOriginalTarget || event.currentTarget) {
case this.textbox: { case this.textbox: {
this._mousedownOnUrlbarDescendant = true;
+ if (event.type != "click" && lazy.ZEN_URLBAR_BEHAVIOR === 'float') { + if (event.type != "click" && lazy.ZEN_URLBAR_BEHAVIOR === 'float') {
+ return true; + return true;
+ } + }
this._mousedownOnUrlbarDescendant = true;
if ( if (
event.target != this.inputField &&
@@ -4024,8 +4043,8 @@ export class UrlbarInput { @@ -4024,8 +4043,8 @@ export class UrlbarInput {
break; break;
} }