OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-15 07:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Hide/show dialogs when minimizing to tray

Browse source 
Hides dialogs when minimizing to tray, and shows again when restoring
from tray.

Closes jp9000/obs-studio#737
This commit is contained in:
SuslikV 2017-01-25 00:39:18 -08:00 committed by jp9000
parent abe4bfd96e
commit d473b2da96
2 changed files with 63 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
UI/window-basic-main.cpp
View file

@ -2703,6 +2703,29 @@ void OBSBasic::CloseDialogs()
}
}
void OBSBasic::EnumDialogs()
{
visDialogs.clear();
modalDialogs.clear();
visMsgBoxes.clear();
/* fill list of Visible dialogs and Modal dialogs */
QList<QDialog*> dialogs = findChildren<QDialog*>();
for (QDialog *dialog : dialogs) {
if (dialog->isVisible())
visDialogs.append(dialog);
if (dialog->isModal())
modalDialogs.append(dialog);
}
/* fill list of Visible message boxes */
QList<QMessageBox*> msgBoxes = findChildren<QMessageBox*>();
for (QMessageBox *msgbox : msgBoxes) {
if (msgbox->isVisible())
visMsgBoxes.append(msgbox);
}
}
void OBSBasic::ClearSceneData()
{
disableSaving++;
@ -2817,11 +2840,9 @@ void OBSBasic::on_actionRemux_triggered()
void OBSBasic::on_action_Settings_triggered()
{
disableHiding = true;
OBSBasicSettings settings(this);
settings.exec();
SystemTray(false);
disableHiding = false;
}
void OBSBasic::on_actionAdvAudioProperties_triggered()
@ -4893,6 +4914,15 @@ void OBSBasic::SetShowing(bool showing)
"BasicWindow", "geometry",
saveGeometry().toBase64().constData());
/* hide all visible child dialogs */
visDlgPositions.clear();
if (!visDialogs.isEmpty()) {
for (QDialog *dlg : visDialogs) {
visDlgPositions.append(dlg->pos());
dlg->hide();
}
}
if (showHide)
showHide->setText(QTStr("Basic.SystemTray.Show"));
QTimer::singleShot(250, this, SLOT(hide()));
@ -4912,6 +4942,15 @@ void OBSBasic::SetShowing(bool showing)
setVisible(true);
/* show all child dialogs that was visible earlier */
if (!visDialogs.isEmpty()) {
for (int i = 0; i < visDialogs.size(); ++i) {
QDialog *dlg = visDialogs[i];
dlg->move(visDlgPositions[i]);
dlg->show();
}
}
/* Unminimize window if it was hidden to tray instead of task
* bar. */
if (sysTrayMinimizeToTray()) {
@ -4923,6 +4962,18 @@ void OBSBasic::SetShowing(bool showing)
}
}
void OBSBasic::ToggleShowHide()
{
bool showing = isVisible();
if (showing) {
/* check for modal dialogs */
EnumDialogs();
if (!modalDialogs.isEmpty() || !visMsgBoxes.isEmpty())
return;
}
SetShowing(!showing);
}
void OBSBasic::SystemTrayInit()
{
trayIcon = new QSystemTrayIcon(QIcon(":/res/images/obs.png"),

20
UI/window-basic-main.hpp
View file

@ -38,6 +38,7 @@
#include <QPointer>
class QMessageBox;
class QListWidgetItem;
class VolControl;
class QNetworkReply;
@ -162,7 +163,6 @@ private:
QPointer<QAction> showHide;
QPointer<QAction> exit;
QPointer<QMenu> trayMenu;
bool disableHiding = false;
void DrawBackdrop(float cx, float cy);
@ -323,6 +323,14 @@ private:
bool sysTrayMinimizeToTray();
void EnumDialogs();
QList<QDialog*> visDialogs;
QList<QDialog*> modalDialogs;
QList<QMessageBox*> visMsgBoxes;
QList<QPoint> visDlgPositions;
public slots:
void StartStreaming();
void StopStreaming();
@ -393,15 +401,7 @@ private slots:
void IconActivated(QSystemTrayIcon::ActivationReason reason);
void SetShowing(bool showing);
inline void ToggleShowHide()
{
bool showing = isVisible();
if (disableHiding && showing)
return;
if (showing)
CloseDialogs();
SetShowing(!showing);
}
void ToggleShowHide();
private:
/* OBS Callbacks */