Skip to content

Commit

Permalink
Merge pull request #9 from dryabov/master
Browse files Browse the repository at this point in the history
fix issue #8
  • Loading branch information
iShift committed Mar 7, 2014
2 parents f489d89 + 799c840 commit 5802aec
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/js/tray.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var gui = require('nw.gui'),
window.addEventListener('init', function () {

var tray = new gui.Tray({
icon: 'app/logo/twister_logo.png'
icon: 'app/logo/twister_icon16.png'
}),
menuTray = new gui.Menu(),
skipMinimizeToTray = false,
Expand Down Expand Up @@ -148,7 +148,7 @@ window.addEventListener('init', function () {
bNewMessages = reNewMessages.test(title);
win.title = title;
tray.tooltip = title;
tray.icon = 'app/logo/' + (bNewMessages ? 'twister_logo_alt.png' : 'twister_logo.png');
tray.icon = 'app/logo/' + (bNewMessages ? 'twister_alticon16.png' : 'twister_icon16.png');
if (settings.requestAttention && !win.isFocused && bNewMessages) {
if (win.isHidden) {
win.show();
Expand Down
Binary file added app/logo/twister_alticon16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/logo/twister_icon16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5802aec

Please sign in to comment.