mirror of
https://github.com/zen-browser/desktop.git
synced 2026-08-25 16:01:34 +00:00
Merge branch 'dev' into improved-color-picker
This commit is contained in:
@@ -172,9 +172,9 @@
|
||||
.titlebar-buttonbox-container {
|
||||
/* Draw 3 dots as background to represent the window controls,
|
||||
all with the same cololr as the titlebar */
|
||||
background-image: radial-gradient(circle, #4d4c4a 6px, transparent 0.5px);
|
||||
background-image: radial-gradient(circle, var(--zen-toolbar-element-bg) 6px, transparent 0.5px);
|
||||
background-size: 20px 22px;
|
||||
background-position: 52% 50%;
|
||||
background-position: 53% 50%;
|
||||
|
||||
&:not([zen-has-hover='true']) > .titlebar-buttonbox {
|
||||
opacity: 0;
|
||||
|
||||
@@ -342,17 +342,13 @@ var gZenCompactModeManager = {
|
||||
const buttonRect = gZenVerticalTabsManager.actualWindowButtons.getBoundingClientRect();
|
||||
const MAC_WINDOW_BUTTONS_X_BORDER = buttonRect.width + buttonRect.x;
|
||||
const MAC_WINDOW_BUTTONS_Y_BORDER = buttonRect.height + buttonRect.y;
|
||||
if (event.clientX < MAC_WINDOW_BUTTONS_X_BORDER && event.clientY < MAC_WINDOW_BUTTONS_Y_BORDER) {
|
||||
// Also check if it has gone from the top or left if we are exiting the titlebar
|
||||
// button area
|
||||
if (
|
||||
!(
|
||||
target.classList.contains('titlebar-buttonbox-container') &&
|
||||
(event.clientX < buttonRect.x || event.clientY < buttonRect.y)
|
||||
)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
if (
|
||||
event.clientX < MAC_WINDOW_BUTTONS_X_BORDER &&
|
||||
event.clientY < MAC_WINDOW_BUTTONS_Y_BORDER &&
|
||||
event.clientX > buttonRect.x &&
|
||||
event.clientY > buttonRect.y
|
||||
) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user