File tree Expand file tree Collapse file tree 2 files changed +14
-1
lines changed Expand file tree Collapse file tree 2 files changed +14
-1
lines changed Original file line number Diff line number Diff line change @@ -412,7 +412,7 @@ function createMainWindow(): BrowserWindow {
412
412
) => {
413
413
if ( listener === "toggle-dnd-request" ) {
414
414
const [ duration ] = parameters as [ number ?] ;
415
- const result = DNDUtil . toggle ( ) ; // Toggle DND
415
+ const result = DNDUtil . toggle ( ) ;
416
416
send ( event . sender , "toggle-dnd" , result . dnd , result . newSettings ) ;
417
417
418
418
if ( result . dnd && duration && ! Number . isNaN ( duration ) ) {
@@ -425,6 +425,9 @@ function createMainWindow(): BrowserWindow {
425
425
} ,
426
426
duration * 60 * 1000 ,
427
427
) ;
428
+ } else if ( dndRevertTimeout ) {
429
+ clearTimeout ( dndRevertTimeout ) ;
430
+ dndRevertTimeout = null ;
428
431
}
429
432
430
433
return ;
Original file line number Diff line number Diff line change @@ -443,9 +443,18 @@ export class ServerManagerView {
443
443
444
444
initLeftSidebarEvents ( ) : void {
445
445
this . $dndButton . addEventListener ( "click" , ( ) => {
446
+ const isDndOn = ConfigUtil . getConfigItem ( "dnd" , false ) ;
447
+ if ( isDndOn ) {
448
+ ipcRenderer . send ( "forward-message" , "toggle-dnd-request" , undefined ) ;
449
+ return ;
450
+ }
451
+
446
452
const dropdown = document . querySelector ( "#dnd-dropdown" ) ;
447
453
dropdown ?. classList . toggle ( "hidden" ) ;
448
454
this . $dndTooltip . classList . add ( "hidden" ) ;
455
+ dropdown ?. addEventListener ( "mouseleave" , ( ) => {
456
+ dropdown . classList . add ( "hidden" ) ;
457
+ } ) ;
449
458
} ) ;
450
459
const dropdownItems = document . querySelectorAll ( "#dnd-dropdown div" ) ;
451
460
for ( const item of dropdownItems ) {
@@ -457,6 +466,7 @@ export class ServerManagerView {
457
466
ipcRenderer . send ( "forward-message" , "toggle-dnd-request" , duration ) ;
458
467
459
468
document . querySelector ( "#dnd-dropdown" ) ?. classList . add ( "hidden" ) ;
469
+ this . $dndTooltip . classList . remove ( "hidden" ) ;
460
470
} ) ;
461
471
}
462
472
You can’t perform that action at this time.
0 commit comments