Browse Source

Revert "Fixing tray icon visibility issue on OS X"

This reverts commit a4df4125e3.
pull/1682/head
Sean 10 years ago
parent
commit
a0ecf86c20
  1. 12
      src/widget/systemtrayicon.cpp
  2. 2
      src/widget/widget.cpp

12
src/widget/systemtrayicon.cpp

@ -4,8 +4,6 @@ @@ -4,8 +4,6 @@
#include <QMenu>
#include <QFile>
#include <QDebug>
#include <QPainter>
#include <QBitmap>
#include "src/misc/settings.h"
SystemTrayIcon::SystemTrayIcon()
@ -390,16 +388,6 @@ void SystemTrayIcon::setIcon(QIcon &icon) @@ -390,16 +388,6 @@ void SystemTrayIcon::setIcon(QIcon &icon)
#endif
else if (backendType == SystrayBackendType::Qt)
{
#ifdef Q_OS_MAC
// Since Qt doesn't render SVG tray icons for OSX
// we are forced to do this sort of a workaround!
QPixmap quirk(64, 64);
quirk.fill(Qt::transparent);
QPainter quirker(&quirk);
icon.paint(&quirker, 0, 0, 64, 64);
icon = QIcon(quirk);
#endif
qtIcon->setIcon(icon);
}
}

2
src/widget/widget.cpp

@ -301,7 +301,7 @@ void Widget::updateIcons() @@ -301,7 +301,7 @@ void Widget::updateIcons()
if (ico.isNull())
{
QString color = Settings::getInstance().getLightTrayIcon() ? "light" : "dark";
ico = QIcon(":/img/taskbar/" + color + "/taskbar_" + status + ".svg");
ico = QIcon(":img/taskbar/" + color + "/taskbar_" + status + ".svg");
}
setWindowIcon(ico);

Loading…
Cancel
Save