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

UI: Resize main preview on the widget's resize signal 

Fixes a bug where the preview's size calculations wouldn't update if the
widget itself was resizes but the window wasn't resized.
master
jp9000 2016-01-09 14:47:58 -08:00
parent d7d5e55d2c
commit 6262abc2c8
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
obs/window-basic-main.cpp
View File

@ -162,12 +162,15 @@ OBSBasic::OBSBasic(QWidget *parent)
ui->scenes->setAttribute(Qt::WA_MacShowFocusRect, false); ui->scenes->setAttribute(Qt::WA_MacShowFocusRect, false);
ui->sources->setAttribute(Qt::WA_MacShowFocusRect, false); ui->sources->setAttribute(Qt::WA_MacShowFocusRect, false);
connect(windowHandle(), &QWindow::screenChanged, [this]() { auto displayResize = [this]() {
struct obs_video_info ovi; struct obs_video_info ovi;
if (obs_get_video_info(&ovi)) if (obs_get_video_info(&ovi))
ResizePreview(ovi.base_width, ovi.base_height); ResizePreview(ovi.base_width, ovi.base_height);
}); };
connect(windowHandle(), &QWindow::screenChanged, displayResize);
connect(ui->preview, &OBSQTDisplay::DisplayResized, displayResize);
installEventFilter(CreateShortcutFilter()); installEventFilter(CreateShortcutFilter());
@ -2312,16 +2315,6 @@ void OBSBasic::changeEvent(QEvent *event)
UNUSED_PARAMETER(event); UNUSED_PARAMETER(event);
} }
void OBSBasic::resizeEvent(QResizeEvent *event)
{
struct obs_video_info ovi;
if (obs_get_video_info(&ovi))
ResizePreview(ovi.base_width, ovi.base_height);
OBSMainWindow::resizeEvent(event);
}
void OBSBasic::on_actionShow_Recordings_triggered() void OBSBasic::on_actionShow_Recordings_triggered()
{ {
const char *mode = config_get_string(basicConfig, "Output", "Mode"); const char *mode = config_get_string(basicConfig, "Output", "Mode");

1
obs/window-basic-main.hpp
View File

@ -301,7 +301,6 @@ public:
protected: protected:
virtual void closeEvent(QCloseEvent *event) override; virtual void closeEvent(QCloseEvent *event) override;
virtual void changeEvent(QEvent *event) override; virtual void changeEvent(QEvent *event) override;
virtual void resizeEvent(QResizeEvent *event) override;
private slots: private slots:
void on_actionShow_Recordings_triggered(); void on_actionShow_Recordings_triggered();