viewer: fix mouse and compositing issues from using windows

app/widget/manageddisplay/manageddisplay.cpp

@@ -23,18 +23,19 @@
 #include <QHBoxLayout>
 #include <QMessageBox>
 
+#include "panel/panelmanager.h"
 #include "render/opengl/openglrenderer.h"
 #include "render/rendermanager.h"
 
 namespace olive {
 
+#define super QWidget
+
 ManagedDisplayWidget::ManagedDisplayWidget(QWidget *parent) :
   QWidget(parent),
   color_manager_(nullptr),
   color_service_(nullptr)
 {
-  setContextMenuPolicy(Qt::CustomContextMenu);
-
   QHBoxLayout* layout = new QHBoxLayout(this);
   layout->setSpacing(0);
   layout->setMargin(0);
@@ -55,9 +56,7 @@ ManagedDisplayWidget::ManagedDisplayWidget(QWidget *parent) :
             &ManagedDisplayWidgetOpenGL::frameSwapped,
             this, &ManagedDisplayWidget::frameSwapped, Qt::DirectConnection);
 
-    connect(static_cast<ManagedDisplayWidgetOpenGL*>(inner_widget_),
-            &ManagedDisplayWidgetOpenGL::OnMouseMove,
-            this, &ManagedDisplayWidget::InnerWidgetMouseMove);
+    inner_widget_->installEventFilter(this);
 
     // Create OpenGL renderer
     attached_renderer_ = new OpenGLRenderer(this);
@@ -279,6 +278,42 @@ void ManagedDisplayWidget::update()
   }
 }
 
+bool ManagedDisplayWidget::eventFilter(QObject *o, QEvent *e)
+{
+  if (o != inner_widget_) {
+    return super::eventFilter(o, e);
+  }
+
+  switch (e->type()) {
+  case QEvent::FocusIn:
+    // HACK: QWindow focus isn't accounted for in QApplication::focusChanged, so we handle it
+    //       manually here.
+    PanelManager::instance()->FocusChanged(nullptr, this);
+    break;
+  case QEvent::ContextMenu:
+  {
+    QContextMenuEvent *ctx = static_cast<QContextMenuEvent*>(e);
+    emit customContextMenuRequested(ctx->pos());
+    return true;
+  }
+  case QEvent::MouseButtonPress:
+  {
+    // HACK: QWindows don't seem to receive ContextMenu events on right click (only when pressing
+    //       the menu button on the keyboard) so we handle it manually here
+    QMouseEvent *ev = static_cast<QMouseEvent*>(e);
+    if (ev->button() == Qt::RightButton) {
+      emit customContextMenuRequested(ev->pos());
+      return true;
+    }
+    break;
+  }
+  default:
+    break;
+  }
+
+  return super::eventFilter(o, e);
+}
+
 Menu* ManagedDisplayWidget::GetDisplayMenu(QMenu* parent, bool auto_connect)
 {
   QStringList displays = color_manager()->ListAvailableDisplays();