mirror/obs-studio
1
0 Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-10-20 13:04:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

UI: Use icons from theme on Linux

Browse Source
This commit is contained in:
Clayton Groeneveld committed 2019-03-16 05:41:12 -05:00
1 parent f27a00d266
commit 2080051b9f
4 files changed
+12 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/window-basic-main.cpp
+6 -4
View File
@@ -4977,7 +4977,8 @@ inline void OBSBasic::OnActivate()
UpdateProcessPriority();
if (trayIcon)
trayIcon->setIcon(QIcon(":/res/images/tray_active.png"));
trayIcon->setIcon(QIcon::fromTheme("obs-tray-active",
QIcon(":/res/images/tray_active.png")));
}
}
@@ -4990,7 +4991,8 @@ inline void OBSBasic::OnDeactivate()
ClearProcessPriority();
if (trayIcon)
trayIcon->setIcon(QIcon(":/res/images/obs.png"));
trayIcon->setIcon(QIcon::fromTheme("obs-tray",
QIcon(":/res/images/obs.png")));
}
}
@@ -6639,8 +6641,8 @@ void OBSBasic::ToggleShowHide()
void OBSBasic::SystemTrayInit()
{
trayIcon.reset(new QSystemTrayIcon(QIcon(":/res/images/obs.png"),
this));
trayIcon.reset(new QSystemTrayIcon(QIcon::fromTheme("obs-tray",
QIcon(":/res/images/obs.png")), this));
trayIcon->setToolTip("OBS Studio");
showHide = new QAction(QTStr("Basic.SystemTray.Show"),