Skip to content

Commit af97a44

Browse files
committed
Make dock scrollable to eliminate minimum height
1 parent 3a955f5 commit af97a44

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/ProgressDockWidget.cpp

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include <QStatusBar>
2+
#include <QScrollArea>
23
#include "ProgressDockWidget.h"
34

45
ProgressDockWidget::ProgressDockWidget(QWidget* parent)
@@ -8,12 +9,16 @@ ProgressDockWidget::ProgressDockWidget(QWidget* parent)
89
setWindowTitle("Media Progress");
910
setFloating(false);
1011

11-
// I guess you can't "new" using the constructor syntax??
12+
QScrollArea* scrollArea = new QScrollArea(this);
13+
1214
container = new QWidget();
15+
scrollArea->setWidget(container);
16+
scrollArea->setWidgetResizable(true);
17+
1318
layout = new ProgressContainerLayout();
1419

1520
container->setLayout(layout);
16-
setWidget(container);
21+
setWidget(scrollArea);
1722
}
1823

1924
ProgressSlider* ProgressDockWidget::addProgress(obs_source_t* source) const

src/obs-progress.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,9 @@ bool obs_module_load(void)
6363
updateSceneInfo();
6464
}
6565
else if (event == OBS_FRONTEND_EVENT_SCENE_COLLECTION_CLEANUP) {
66-
//blog(LOG_INFO, "obs-progress: Got scene collection cleanup event. Had %d source(s). Clearing.", _sources.count());
67-
//_sources.clear();
66+
blog(LOG_INFO, "obs-progress: Got scene collection cleanup event. Had %d video source(s), %d slideshow source(s). Clearing.", _videoSources.count(), _slideshowSources.count());
67+
_videoSources.clear();
68+
_slideshowSources.clear();
6869
}
6970
};
7071
obs_frontend_add_event_callback(eventCallback, static_cast<void*>(static_cast<obs_frontend_event_cb>(eventCallback)));

0 commit comments

Comments
 (0)