File tree Expand file tree Collapse file tree 3 files changed +11
-12
lines changed Expand file tree Collapse file tree 3 files changed +11
-12
lines changed Original file line number Diff line number Diff line change 259
259
}
260
260
}
261
261
262
- const browserSidebarContainer = this . #currentParentTab?. linkedBrowser ?. closest (
263
- '.browserSidebarContainer'
264
- ) ;
265
- if ( onTabClose && hasFocused && ! this . #confirmationTimeout && browserSidebarContainer ) {
266
- const cancelButton = browserSidebarContainer ?. querySelector ( '.zen-glance-sidebar-close' ) ;
262
+ const sidebarButtons = this . browserWrapper . querySelector ( '.zen-glance-sidebar-container' ) ;
263
+ if ( onTabClose && hasFocused && ! this . #confirmationTimeout && sidebarButtons ) {
264
+ const cancelButton = sidebarButtons ?. querySelector ( '.zen-glance-sidebar-close' ) ;
267
265
cancelButton . setAttribute ( 'waitconfirmation' , true ) ;
268
266
this . #confirmationTimeout = setTimeout ( ( ) => {
269
267
cancelButton . removeAttribute ( 'waitconfirmation' ) ;
274
272
275
273
this . browserWrapper . removeAttribute ( 'has-finished-animation' ) ;
276
274
if ( noAnimation ) {
277
- this . _clearContainerStyles ( browserSidebarContainer ) ;
275
+ this . _clearContainerStyles (
276
+ this . #currentParentTab?. linkedBrowser ?. closest ( '.browserSidebarContainer' )
277
+ ) ;
278
278
this . quickCloseGlance ( { closeCurrentTab : false } ) ;
279
279
return ;
280
280
}
299
299
this . overlay . style . pointerEvents = 'none' ;
300
300
this . quickCloseGlance ( { justAnimateParent : true , clearID : false } ) ;
301
301
const originalPosition = this . #glances. get ( this . #currentGlanceID) . originalPosition ;
302
- const sidebarButtons = this . browserWrapper . querySelector ( '.zen-glance-sidebar-container' ) ;
303
302
if ( sidebarButtons ) {
304
303
gZenUIManager . motion
305
304
. animate (
Original file line number Diff line number Diff line change 1268
1268
getMostDominantColor ( allColors ) {
1269
1269
const color = this . getPrimaryColor ( allColors ) ;
1270
1270
if ( typeof color === 'string' ) {
1271
- return this . hexToRgb ( color ) ;
1271
+ // We found a custom color, we should rather return the native accent color
1272
+ return this . getNativeAccentColor ( ) ;
1272
1273
}
1273
1274
return color ;
1274
1275
}
1448
1449
browser . document . documentElement . style . setProperty ( '--zen-primary-color' , primaryColor ) ;
1449
1450
browser . gZenThemePicker . isLegacyVersion = this . isLegacyVersion ;
1450
1451
let isDarkMode = isDarkModeWindow ;
1451
- const isUsingCustomColors = workspaceTheme . gradientColors . some ( ( color ) => color . isCustom ) ;
1452
- if ( ! isDefaultTheme && ! this . isLegacyVersion && ! isUsingCustomColors ) {
1452
+ if ( ! isDefaultTheme && ! this . isLegacyVersion ) {
1453
1453
// Check for the primary color
1454
1454
isDarkMode = browser . gZenThemePicker . shouldBeDarkMode ( dominantColor ) ;
1455
1455
browser . document . documentElement . setAttribute ( 'zen-should-be-dark-mode' , isDarkMode ) ;
1456
1456
browser . gZenThemePicker . panel . removeAttribute ( 'invalidate-controls' ) ;
1457
1457
} else {
1458
1458
browser . document . documentElement . removeAttribute ( 'zen-should-be-dark-mode' ) ;
1459
- if ( ! this . isLegacyVersion && ! isUsingCustomColors ) {
1459
+ if ( ! this . isLegacyVersion ) {
1460
1460
browser . gZenThemePicker . panel . setAttribute ( 'invalidate-controls' , 'true' ) ;
1461
1461
}
1462
1462
}
Original file line number Diff line number Diff line change 19
19
"brandShortName" : " Zen" ,
20
20
"brandFullName" : " Zen Browser" ,
21
21
"release" : {
22
- "displayVersion" : " 1.14.7b " ,
22
+ "displayVersion" : " 1.14.8b " ,
23
23
"github" : {
24
24
"repo" : " zen-browser/desktop"
25
25
},
You can’t perform that action at this time.
0 commit comments