@@ -79,53 +79,47 @@ app.on("ready", () => {
79
79
path . join ( __dirname , "../app/images/32x32.png" )
80
80
) ;
81
81
82
- // setup the tray handler
83
- const tray = new Tray ( trayIcon ) ;
84
- const contextMenu = Menu . buildFromTemplate ( [
85
- {
86
- label : "Dashboard" ,
87
- click : ( ) => changePage ( mainWindow , "/" )
88
- } ,
89
- {
90
- label : "Pay" ,
91
- click : ( ) => changePage ( mainWindow , "/pay" )
92
- } ,
93
- {
94
- label : "Request" ,
95
- click : ( ) => changePage ( mainWindow , "/request" )
96
- } ,
97
- {
98
- label : "Cards" ,
99
- click : ( ) => changePage ( mainWindow , "/card" )
100
- } ,
101
- { type : "separator" } ,
102
- {
103
- label : "Quit" ,
104
- click : ( ) => app . quit ( )
105
- }
106
- ] ) ;
107
- tray . setContextMenu ( contextMenu ) ;
108
- tray . setToolTip ( "BunqDesktop" ) ;
109
-
110
- // Event handlers
111
- tray . on ( "click" , ( ) => {
112
- // show app on single click
113
- if ( ! mainWindow . isVisible ( ) ) mainWindow . show ( ) ;
114
- } ) ;
115
- tray . on ( "double-click" , ( ) => {
116
- // hide app on double click
117
- if ( mainWindow . isVisible ( ) ) mainWindow . hide ( ) ;
118
- } ) ;
82
+ const createTrayIcon = ( ) => {
83
+ // setup the tray handler
84
+ const tray = new Tray ( trayIcon ) ;
85
+ const contextMenu = Menu . buildFromTemplate ( [
86
+ {
87
+ label : "Dashboard" ,
88
+ click : ( ) => changePage ( mainWindow , "/" )
89
+ } ,
90
+ {
91
+ label : "Pay" ,
92
+ click : ( ) => changePage ( mainWindow , "/pay" )
93
+ } ,
94
+ {
95
+ label : "Request" ,
96
+ click : ( ) => changePage ( mainWindow , "/request" )
97
+ } ,
98
+ {
99
+ label : "Cards" ,
100
+ click : ( ) => changePage ( mainWindow , "/card" )
101
+ } ,
102
+ { type : "separator" } ,
103
+ {
104
+ label : "Quit" ,
105
+ click : ( ) => app . quit ( )
106
+ }
107
+ ] ) ;
108
+ tray . setContextMenu ( contextMenu ) ;
109
+ tray . setToolTip ( "BunqDesktop" ) ;
110
+
111
+ // Event handlers
112
+ tray . on ( "click" , ( ) => {
113
+ // show app on single click
114
+ if ( ! mainWindow . isVisible ( ) ) mainWindow . show ( ) ;
115
+ tray . destroy ( ) ;
116
+ } ) ;
117
+ }
119
118
120
- mainWindow . on ( "show" , ( ) => {
121
- tray . setHighlightMode ( "always" ) ;
122
- } ) ;
123
- mainWindow . on ( "hide" , ( ) => {
124
- tray . setHighlightMode ( "never" ) ;
125
- } ) ;
126
119
mainWindow . on ( "minimize" , function ( event ) {
127
- const minimizeToTray = ! ! settings . get ( "MINIMIZE_TO_TRAY_LOCATION " ) ;
120
+ const minimizeToTray = ! ! settings . get ( "MINIMIZE_TO_TRAY " ) ;
128
121
if ( minimizeToTray ) {
122
+ createTrayIcon ( ) ;
129
123
event . preventDefault ( ) ;
130
124
mainWindow . hide ( ) ;
131
125
}
0 commit comments