audiomonitor: revert to qopenglwidget
This commit is contained in:
@@ -31,24 +31,11 @@ AudioMonitorPanel::AudioMonitorPanel(QWidget *parent) :
|
||||
{
|
||||
audio_monitor_ = new AudioMonitor();
|
||||
|
||||
audio_monitor_->installEventFilter(this);
|
||||
|
||||
setWidget(QWidget::createWindowContainer(audio_monitor_));
|
||||
setWidget(audio_monitor_);
|
||||
|
||||
Retranslate();
|
||||
}
|
||||
|
||||
bool AudioMonitorPanel::eventFilter(QObject *o, QEvent *e)
|
||||
{
|
||||
if (o == audio_monitor_ && e->type() == QEvent::FocusIn) {
|
||||
// HACK: QWindow focus isn't accounted for in QApplication::focusChanged, so we handle it
|
||||
// manually here.
|
||||
PanelManager::instance()->FocusChanged(nullptr, this);
|
||||
}
|
||||
|
||||
return super::eventFilter(o, e);
|
||||
}
|
||||
|
||||
void AudioMonitorPanel::Retranslate()
|
||||
{
|
||||
SetTitle(tr("Audio Monitor"));
|
||||
|
||||
@@ -45,8 +45,6 @@ public:
|
||||
audio_monitor_->SetParams(params);
|
||||
}
|
||||
|
||||
virtual bool eventFilter(QObject *o, QEvent *e) override;
|
||||
|
||||
private:
|
||||
virtual void Retranslate() override;
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#define AUDIOMONITORWIDGET_H
|
||||
|
||||
#include <QFile>
|
||||
#include <QOpenGLWindow>
|
||||
#include <QOpenGLWidget>
|
||||
#include <QTimer>
|
||||
|
||||
#include "audio/audiovisualwaveform.h"
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
namespace olive {
|
||||
|
||||
class AudioMonitor : public QOpenGLWindow
|
||||
class AudioMonitor : public QOpenGLWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
||||
Reference in New Issue
Block a user