Resizable modal dialogs on Mac

GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp

@@ -15,6 +15,7 @@
 #include "DistributionDialog.h"
 #include "DistributionEditor.h"
 #include "SessionItem.h"
+#include "StyleUtils.h"
 #include <QHBoxLayout>
 #include <QPushButton>
 
@@ -45,6 +46,7 @@ DistributionDialog::DistributionDialog(QWidget *parent)
     setLayout(layout);
 
     setAttribute(Qt::WA_DeleteOnClose, true);
+    StyleUtils::setResizable(this);
 }
 
 void DistributionDialog::setItem(SessionItem *item)

GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp

@@ -19,6 +19,7 @@
 #include "mainwindow_constants.h"
 #include "ExternalProperty.h"
 #include "MaterialItemUtils.h"
+#include "StyleUtils.h"
 #include <QAction>
 #include <QPushButton>
 #include <QSettings>
@@ -46,6 +47,8 @@ MaterialEditorDialog::MaterialEditorDialog(MaterialModel* materialModel, QWidget
     layout->addLayout(createButtonLayout());
 
     setLayout(layout);
+
+    StyleUtils::setResizable(this);
 }
 
 //! replaces original material model with the model modified by MaterialEditor

GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp

@@ -156,7 +156,7 @@ QWidget* createCustomDoubleEditor(const SessionItem& item)
     result->setKeyboardTracking(true);
 
     result->setFocusPolicy(Qt::StrongFocus);
-    result->installEventFilter(new WheelEventEater(result));
+//    result->installEventFilter(new WheelEventEater(result));
 
     result->setMaximum(std::numeric_limits<double>::max());
     result->setMinimum(std::numeric_limits<double>::lowest());
@@ -178,7 +178,7 @@ QWidget* createCustomIntEditor(const SessionItem& item)
 {
     auto result = new QSpinBox;
     result->setFocusPolicy(Qt::StrongFocus);
-    result->installEventFilter(new WheelEventEater(result));
+//    result->installEventFilter(new WheelEventEater(result));
 
     result->setMaximum(std::numeric_limits<int>::max());
     result->setKeyboardTracking(true);

GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp

@@ -20,6 +20,7 @@
 #include "PythonSyntaxHighlighter.h"
 #include "WarningSign.h"
 #include "InstrumentItems.h"
+#include "StyleUtils.h"
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QPushButton>
@@ -74,6 +75,7 @@ PythonScriptWidget::PythonScriptWidget(QWidget *parent)
     setLayout(mainLayout);
 
     setAttribute(Qt::WA_DeleteOnClose, true);
+    StyleUtils::setResizable(this);
 }
 
 void PythonScriptWidget::generatePythonScript(const MultiLayerItem *sampleItem,

GUI/coregui/utils/StyleUtils.cpp

@@ -14,6 +14,8 @@
 
 #include "StyleUtils.h"
 #include "DesignerHelper.h"
+#include "hostosinfo.h"
+#include <QDialog>
 #include <QTreeView>
 
 void StyleUtils::setPropertyStyle(QTreeView* tree)
@@ -41,7 +43,7 @@ QString StyleUtils::propertyTreeStyle()
               "QTreeView::branch:open:has-children:!has-siblings,"
               "QTreeView::branch:open:has-children:has-siblings  {"
               "padding:2px 2px 2px 2px;border-image: none; image: url(:/images/caret-down.svg);"
-            "}";
+              "}";
 
     // background of selected rows restored
     result += "QTreeView::item:selected{background:#3daee9;}";
@@ -51,19 +53,19 @@ QString StyleUtils::propertyTreeStyle()
 
 QString StyleUtils::realtimeTreeStyle()
 {
-    QString result =
-    "QTreeView::branch {background: "
-    "palette(base);}QTreeView::branch:has-siblings:!adjoins-item "
-    "{border-image: url(:/images/treeview-vline.png) 0;}QTreeView::branch:has-siblings:"
-    "adjoins-item {border-image: url(:/images/treeview-branch-more.png) 0;}QTreeView::branch:"
-    "!has-children:!has-siblings:adjoins-item {border-image: "
-    "url(:/images/treeview-branch-end.png) "
-    "0;}QTreeView::branch:has-children:!has-siblings:closed"
-    ",QTreeView::branch:closed:has-children:has-siblings {border-image: none;image: "
-    "url(:/images/"
-    "treeview-branch-closed.png);}QTreeView::branch:open:has-children:!has-siblings,"
-    "QTreeView::branch:open:has-children:has-siblings  {border-image: none;image: "
-    "url(:/images/treeview-branch-open.png);}";
+    QString result
+        = "QTreeView::branch {background: "
+          "palette(base);}QTreeView::branch:has-siblings:!adjoins-item "
+          "{border-image: url(:/images/treeview-vline.png) 0;}QTreeView::branch:has-siblings:"
+          "adjoins-item {border-image: url(:/images/treeview-branch-more.png) 0;}QTreeView::branch:"
+          "!has-children:!has-siblings:adjoins-item {border-image: "
+          "url(:/images/treeview-branch-end.png) "
+          "0;}QTreeView::branch:has-children:!has-siblings:closed"
+          ",QTreeView::branch:closed:has-children:has-siblings {border-image: none;image: "
+          "url(:/images/"
+          "treeview-branch-closed.png);}QTreeView::branch:open:has-children:!has-siblings,"
+          "QTreeView::branch:open:has-children:has-siblings  {border-image: none;image: "
+          "url(:/images/treeview-branch-open.png);}";
 
     return result;
 }
@@ -85,3 +87,12 @@ QFont StyleUtils::labelFont(bool bold)
 
     return result;
 }
+
+void StyleUtils::setResizable(QDialog* dialog)
+{
+    if (GUI_OS_Utils::HostOsInfo::isMacHost()) {
+        dialog->setWindowFlags(Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint
+                               | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint
+                               | Qt::Window);
+    }
+}

GUI/coregui/utils/StyleUtils.h

@@ -20,6 +20,7 @@
 #include <QFont>
 
 class QTreeView;
+class QWidget;
 
 namespace StyleUtils
 {
@@ -39,6 +40,9 @@ BA_CORE_API_ QFont sectionFont(bool bold = false);
 //! Returns font for labels.
 BA_CORE_API_ QFont labelFont(bool bold = false);
 
+//! Make modal dialog resizable.
+BA_CORE_API_ void setResizable(QDialog* dialog);
+
 }
 
 #endif