jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Add new vector-based menubar icons for macOS

master
PatTheMav 2021-06-06 11:01:40 +02:00 committed by Matt Gajownik
parent 3c71399650
commit 39aedc6c2f
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UI/forms/images/obs_macos.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

1
UI/forms/images/obs_paused_macos.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

1
UI/forms/images/tray_active_macos.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

6
UI/forms/obs.qrc
View File

@ -12,11 +12,11 @@
<file>images/up.svg</file>
<file>images/obs_256x256.png</file>
<file>images/obs.png</file>
<file>images/obs_macos.png</file>
<file>images/obs_macos.svg</file>
<file>images/obs_paused.png</file>
<file>images/obs_paused_macos.png</file>
<file>images/obs_paused_macos.svg</file>
<file>images/tray_active.png</file>
<file>images/tray_active_macos.png</file>
<file>images/tray_active_macos.svg</file>
<file>images/expand.svg</file>
<file>images/unlocked.svg</file>
<file>images/locked.svg</file>

14
UI/window-basic-main.cpp
View File

@ -6480,7 +6480,7 @@ inline void OBSBasic::OnActivate()
if (trayIcon && trayIcon->isVisible()) {
#ifdef __APPLE__
QIcon trayMask =
QIcon(":/res/images/tray_active_macos.png");
QIcon(":/res/images/tray_active_macos.svg");
trayMask.setIsMask(true);
trayIcon->setIcon(
QIcon::fromTheme("obs-tray", trayMask));
@ -6507,7 +6507,7 @@ inline void OBSBasic::OnDeactivate()
if (trayIcon && trayIcon->isVisible()) {
#ifdef __APPLE__
QIcon trayIconFile =
QIcon(":/res/images/obs_macos.png");
QIcon(":/res/images/obs_macos.svg");
trayIconFile.setIsMask(true);
#else
QIcon trayIconFile = QIcon(":/res/images/obs.png");
@ -6520,7 +6520,7 @@ inline void OBSBasic::OnDeactivate()
if (os_atomic_load_bool(&recording_paused)) {
#ifdef __APPLE__
QIcon trayIconFile =
QIcon(":/res/images/obs_paused_macos.png");
QIcon(":/res/images/obs_paused_macos.svg");
trayIconFile.setIsMask(true);
#else
QIcon trayIconFile =
@ -6531,7 +6531,7 @@ inline void OBSBasic::OnDeactivate()
} else {
#ifdef __APPLE__
QIcon trayIconFile =
QIcon(":/res/images/tray_active_macos.png");
QIcon(":/res/images/tray_active_macos.svg");
trayIconFile.setIsMask(true);
#else
QIcon trayIconFile =
@ -8767,7 +8767,7 @@ void OBSBasic::ToggleShowHide()
void OBSBasic::SystemTrayInit()
{
#ifdef __APPLE__
QIcon trayIconFile = QIcon(":/res/images/obs_macos.png");
QIcon trayIconFile = QIcon(":/res/images/obs_macos.svg");
trayIconFile.setIsMask(true);
#else
QIcon trayIconFile = QIcon(":/res/images/obs.png");
@ -9455,7 +9455,7 @@ void OBSBasic::PauseRecording()
if (trayIcon && trayIcon->isVisible()) {
#ifdef __APPLE__
QIcon trayIconFile =
QIcon(":/res/images/obs_paused_macos.png");
QIcon(":/res/images/obs_paused_macos.svg");
trayIconFile.setIsMask(true);
#else
QIcon trayIconFile =
@ -9495,7 +9495,7 @@ void OBSBasic::UnpauseRecording()
if (trayIcon && trayIcon->isVisible()) {
#ifdef __APPLE__
QIcon trayIconFile =
QIcon(":/res/images/tray_active_macos.png");
QIcon(":/res/images/tray_active_macos.svg");
trayIconFile.setIsMask(true);
#else
QIcon trayIconFile =