From 7bc7b6098ba94f1758392ccbac2d84e52280449c Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 8 Apr 2020 00:46:30 +1000
Subject: [PATCH] ui: moved remaining QMenus to our Menu class

Mainly to take advantage of Menu's specific styling on certain platforms to
keep a consistency.
---
 app/widget/footagecombobox/footagecombobox.cpp |  7 +++++--
 app/widget/viewer/viewer.cpp                   | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/widget/footagecombobox/footagecombobox.cpp b/app/widget/footagecombobox/footagecombobox.cpp
index 4ba184e96..b31edf67b 100644
--- a/app/widget/footagecombobox/footagecombobox.cpp
+++ b/app/widget/footagecombobox/footagecombobox.cpp
@@ -99,14 +99,17 @@ void FootageComboBox::TraverseFolder(const Folder *f, QMenu *m)
 
     if (child->CanHaveChildren()) {
 
-      TraverseFolder(static_cast<Folder*>(child), m->addMenu(child->name()));
+      Menu* sub = new Menu(child->name());
+      m->addMenu(sub);
+      TraverseFolder(static_cast<Folder*>(child), sub);
 
     } else if (child->type() == Item::kFootage) {
 
       Footage* footage = static_cast<Footage*>(child);
 
       if (!only_show_ready_footage_ || footage->status() == Footage::kReady) {
-        QMenu* stream_menu = m->addMenu(footage->name());
+        Menu* stream_menu = new Menu(footage->name());
+        m->addMenu(stream_menu);
 
         foreach (StreamPtr stream, footage->streams()) {
           QAction* stream_action = stream_menu->addAction(stream->description());
diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index 21645206d..d8bde137b 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -464,7 +464,8 @@ void ViewerWidget::ShowContextMenu(const QPoint &pos)
   // Color options
   if (context_menu_widget_->color_manager() && color_menu_enabled_) {
     QStringList displays = context_menu_widget_->color_manager()->ListAvailableDisplays();
-    QMenu* ocio_display_menu = menu.addMenu(tr("Display"));
+    Menu* ocio_display_menu = new Menu(tr("Display"));
+    menu.addMenu(ocio_display_menu);
     connect(ocio_display_menu, &QMenu::triggered, this, &ViewerWidget::ContextMenuOCIODisplay);
     foreach (const QString& d, displays) {
       QAction* action = ocio_display_menu->addAction(d);
@@ -474,7 +475,8 @@ void ViewerWidget::ShowContextMenu(const QPoint &pos)
     }
 
     QStringList views = context_menu_widget_->color_manager()->ListAvailableViews(context_menu_widget_->ocio_display());
-    QMenu* ocio_view_menu = menu.addMenu(tr("View"));
+    Menu* ocio_view_menu = new Menu(tr("View"));
+    menu.addMenu(ocio_view_menu);
     connect(ocio_view_menu, &QMenu::triggered, this, &ViewerWidget::ContextMenuOCIOView);
     foreach (const QString& v, views) {
       QAction* action = ocio_view_menu->addAction(v);
@@ -484,7 +486,8 @@ void ViewerWidget::ShowContextMenu(const QPoint &pos)
     }
 
     QStringList looks = context_menu_widget_->color_manager()->ListAvailableLooks();
-    QMenu* ocio_look_menu = menu.addMenu(tr("Look"));
+    Menu* ocio_look_menu = new Menu(tr("Look"));
+    menu.addMenu(ocio_look_menu);
     connect(ocio_look_menu, &QMenu::triggered, this, &ViewerWidget::ContextMenuOCIOLook);
     QAction* no_look_action = ocio_look_menu->addAction(tr("(None)"));
     no_look_action->setCheckable(true);
@@ -500,7 +503,8 @@ void ViewerWidget::ShowContextMenu(const QPoint &pos)
   }
 
   // Playback resolution
-  QMenu* playback_resolution_menu = menu.addMenu(tr("Resolution"));
+  Menu* playback_resolution_menu = new Menu(tr("Resolution"));
+  menu.addMenu(playback_resolution_menu);
   playback_resolution_menu->addAction(tr("Full"))->setData(1);
   int dividers[] = {2, 4, 8, 16};
   for (int i=0;i<4;i++) {
@@ -516,7 +520,8 @@ void ViewerWidget::ShowContextMenu(const QPoint &pos)
   }
 
   // Viewer Zoom Level
-  QMenu* zoom_menu = menu.addMenu(tr("Zoom"));
+  Menu* zoom_menu = new Menu(tr("Zoom"));
+  menu.addMenu(zoom_menu);
   int zoom_levels[] = {10, 25, 50, 75, 100, 150, 200, 400};
   zoom_menu->addAction(tr("Fit"))->setData(0);
   for (int i=0;i<8;i++) {
@@ -525,7 +530,8 @@ void ViewerWidget::ShowContextMenu(const QPoint &pos)
   connect(zoom_menu, &QMenu::triggered, this, &ViewerWidget::SetZoomFromMenu);
 
   // Full Screen Menu
-  QMenu* full_screen_menu = menu.addMenu(tr("Full Screen"));
+  Menu* full_screen_menu = new Menu(tr("Full Screen"));
+  menu.addMenu(full_screen_menu);
   for (int i=0;i<QGuiApplication::screens().size();i++) {
     QScreen* s = QGuiApplication::screens().at(i);