Change menu style

Author: zmoth

src/DataFlowGraphicsScene.cpp

@@ -15,6 +15,7 @@
 #include <QtWidgets/QTreeView>
 #include <QStandardItem>
 #include <QPushButton>
+#include <QGridLayout>
 
 #include <QtCore/QBuffer>
 #include <QtCore/QByteArray>
@@ -81,38 +82,33 @@ createSceneMenu(QPointF const scenePos)
 {
   QMenu* modelMenu = new QMenu();
 
+  QWidget *menuWidget = new QWidget();
+  QGridLayout *layout = new QGridLayout(menuWidget);
+  layout->setContentsMargins(0, 0, 0, 0);
+  layout->setSpacing(3);
+
   // Add filterbox to the context menu
-  auto* txtBox = new QLineEdit(modelMenu);
+  QLineEdit* txtBox = new QLineEdit();
   txtBox->setPlaceholderText(QStringLiteral("Filter"));
   txtBox->setClearButtonEnabled(true);
+  txtBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+  layout->addWidget(txtBox, 0, 0);
 
-  auto* txtBoxAction = new QWidgetAction(modelMenu);
-  txtBoxAction->setDefaultWidget(txtBox);
-
-  // 1.
-  modelMenu->addAction(txtBoxAction);
+  // Add sort button
+  QPushButton* sortButton = new QPushButton("Sort");
+  sortButton->setCheckable(true);
+  layout->addWidget(sortButton, 0, 1);
 
   // Add result treeview to the context menu
-  QTreeView* treeView = new QTreeView(modelMenu);
+  QTreeView* treeView = new QTreeView();
   treeView->header()->close();
-
+  layout->addWidget(treeView, 1, 0, 1, 2);
   QStandardItemModel* treeModel = new QStandardItemModel(treeView);
 
-  auto* treeViewAction = new QWidgetAction(modelMenu);
-  treeViewAction->setDefaultWidget(treeView);
-
-  // 2.
-  modelMenu->addAction(treeViewAction);
+  auto* menuWidgetAction = new QWidgetAction(menuWidget);
+  menuWidgetAction->setDefaultWidget(menuWidget);
 
-  // Add sort Button
-  auto* sortButton = new QPushButton("Sort");
-  sortButton->setCheckable(true);
-
-  auto* sortButtonAction = new QWidgetAction(modelMenu);
-  sortButtonAction->setDefaultWidget(sortButton);
-
-  // 3.
-  modelMenu->addAction(sortButtonAction);
+  modelMenu->addAction(menuWidgetAction);
 
   auto registry = _graphModel.dataModelRegistry();
 
@@ -144,6 +140,12 @@ createSceneMenu(QPointF const scenePos)
   treeView->setModel(treeModel);
   treeView->expandAll();
 
+  if (_sortMenu)
+  {
+    sortButton->setChecked(_sortMenu);
+    treeView->sortByColumn(0, Qt::AscendingOrder);
+  }
+
   connect(sortButton, &QPushButton::clicked, this, 
           [treeModel, treeView](bool checked)
           {
@@ -154,12 +156,6 @@ createSceneMenu(QPointF const scenePos)
             treeView->sortByColumn(0, Qt::AscendingOrder);
           });
 
-  if (_sortMenu)
-  {
-    sortButton->setChecked(_sortMenu);
-    treeView->sortByColumn(0, Qt::AscendingOrder);
-  }
-
   connect(treeView, &QTreeView::clicked,
           [this,
            modelMenu,