From 1b39cf4af5367bed703386776fab3f81a1623386 Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Wed, 24 Oct 2018 19:56:15 +0800
Subject: [PATCH] fix icon

---
 src/resources/docs/welcome_en.md | 2 +-
 src/resources/docs/welcome_zh.md | 2 +-
 src/vmainwindow.cpp              | 8 +++++++-
 src/vnote.qrc                    | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/resources/docs/welcome_en.md b/src/resources/docs/welcome_en.md
index 7ce40069..42db5841 100644
--- a/src/resources/docs/welcome_en.md
+++ b/src/resources/docs/welcome_en.md
@@ -1,5 +1,5 @@
 # Welcome to VNote
-![VNote](qrc:/resources/icons/vnote.svg =128x)
+![VNote](qrc:/resources/icons/256x256/vnote.png)
 
 > A Vim-inspired note-taking application that knows programmers and Markdown better.
 
diff --git a/src/resources/docs/welcome_zh.md b/src/resources/docs/welcome_zh.md
index 3dc22750..aefff7d6 100644
--- a/src/resources/docs/welcome_zh.md
+++ b/src/resources/docs/welcome_zh.md
@@ -1,5 +1,5 @@
 # 欢迎使用VNote
-![VNote](qrc:/resources/icons/vnote.svg =128x)
+![VNote](qrc:/resources/icons/256x256/vnote.png)
 
 > 一个受Vim启发的、更懂程序员和Markdown的笔记软件。
 
diff --git a/src/vmainwindow.cpp b/src/vmainwindow.cpp
index 26cd254d..313f53af 100644
--- a/src/vmainwindow.cpp
+++ b/src/vmainwindow.cpp
@@ -2630,7 +2630,13 @@ void VMainWindow::initTrayIcon()
     connect(exitAct, &QAction::triggered,
             this, &VMainWindow::quitApp);
 
-    m_trayIcon = new QSystemTrayIcon(QIcon(":/resources/icons/32x32/vnote.png"), this);
+    QIcon sysIcon(":/resources/icons/256x256/vnote.png");
+
+#if defined(Q_OS_MACOS) || defined(Q_OS_MAC)
+    sysIcon.setIsMask(true);
+#endif
+
+    m_trayIcon = new QSystemTrayIcon(sysIcon, this);
     m_trayIcon->setToolTip(tr("VNote"));
     m_trayIcon->setContextMenu(menu);
 
diff --git a/src/vnote.qrc b/src/vnote.qrc
index ead95908..f6982ac8 100644
--- a/src/vnote.qrc
+++ b/src/vnote.qrc
@@ -75,7 +75,6 @@
         <file>resources/icons/strikethrough.svg</file>
         <file>resources/icons/inline_code.svg</file>
         <file>resources/icons/close_note_tb.svg</file>
-        <file>resources/icons/32x32/vnote.png</file>
         <file>resources/icons/editing_modified.svg</file>
         <file>resources/docs/markdown_guide_en.md</file>
         <file>resources/docs/markdown_guide_zh.md</file>
@@ -276,5 +275,6 @@
         <file>resources/icons/delete.svg</file>
         <file>resources/docs/welcome_en.md</file>
         <file>resources/docs/welcome_zh.md</file>
+        <file>resources/icons/256x256/vnote.png</file>
     </qresource>
 </RCC>