mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-02 13:27:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1454 from Andersama/dockable-stats

Browse Source 
UI: Make stats dockable
This commit is contained in:
Jim
2018-09-05 21:04:19 -07:00
committed by GitHub
parent 22c8dba718 4df790a471
commit e299946b41
4 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -306,6 +306,7 @@ OBSBasic::OBSBasic(QWidget *parent)
assignDockToggle(ui->mixerDock, ui->toggleMixer);
assignDockToggle(ui->transitionsDock, ui->toggleTransitions);
assignDockToggle(ui->controlsDock, ui->toggleControls);
assignDockToggle(ui->statsDock, ui->toggleStats);
//hide all docking panes
ui->toggleScenes->setChecked(false);
@@ -313,6 +314,7 @@ OBSBasic::OBSBasic(QWidget *parent)
ui->toggleMixer->setChecked(false);
ui->toggleTransitions->setChecked(false);
ui->toggleControls->setChecked(false);
ui->toggleStats->setChecked(false);
//restore parent window geometry
const char *geometry = config_get_string(App()->GlobalConfig(),
@@ -1590,6 +1592,10 @@ void OBSBasic::OBSInit()
show();
#endif
/* setup stats dock */
OBSBasicStats *statsDlg = new OBSBasicStats(ui->statsDock, false);
ui->statsDock->setWidget(statsDlg);
const char *dockStateStr = config_get_string(App()->GlobalConfig(),
"BasicWindow", "DockState");
if (!dockStateStr) {
@@ -6110,7 +6116,8 @@ void OBSBasic::on_resetUI_triggered()
ui->sourcesDock,
ui->mixerDock,
ui->transitionsDock,
ui->controlsDock
ui->controlsDock,
ui->statsDock
};
QList<int> sizes {
@@ -6126,6 +6133,7 @@ void OBSBasic::on_resetUI_triggered()
ui->mixerDock->setVisible(true);
ui->transitionsDock->setVisible(true);
ui->controlsDock->setVisible(true);
ui->statsDock->setVisible(true);
resizeDocks(docks, {cy, cy, cy, cy, cy}, Qt::Vertical);
resizeDocks(docks, sizes, Qt::Horizontal);
@@ -6143,6 +6151,7 @@ void OBSBasic::on_lockUI_toggled(bool lock)
ui->mixerDock->setFeatures(features);
ui->transitionsDock->setFeatures(features);
ui->controlsDock->setFeatures(features);
ui->statsDock->setFeatures(features);
}
void OBSBasic::on_toggleListboxToolbars_toggled(bool visible)