Merge 13a4317 into ee68433

opencor · Aug 14, 2018 · 34ecc90 · 34ecc90
2 parents ee68433 + 13a4317
commit 34ecc90
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -37,7 +37,7 @@ var jsonData = { "versions": [
                        }
                      ],
                      "changes": [
-                       { "change": "<strong>General:</strong> Clang code model related cleaning up (see issue <a href=\"https://github.com/opencor/opencor/issues/1747\">#1747</a>). Allow the use of another Qt style (see issue <a href=\"https://github.com/opencor/opencor/issues/1761\">#1761</a>)." },
+                       { "change": "<strong>General:</strong> Clang code model related cleaning up (see issue <a href=\"https://github.com/opencor/opencor/issues/1747\">#1747</a>). Allow the use of another Qt style (see issue <a href=\"https://github.com/opencor/opencor/issues/1761\">#1761</a>). Improved HiDPI support (see issue <a href=\"https://github.com/opencor/opencor/issues/1763\">#1763</a>)." },
                        { "change": "<strong>Core plugin:</strong> fixed a problem with the menu items for recently opened files potentially appearing as disabled on macOS (see issue <a href=\"https://github.com/opencor/opencor/issues/1633\">#1633</a>)." },
                        { "change": "<strong>Third-party libraries:</strong> upgraded the <a href=\"http://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 3.1.2 (see issue <a href=\"https://github.com/opencor/opencor/issues/1743\">#1743</a>). Upgraded <a href=\"https://www.openssl.org/\">OpenSSL</a> to version 1.1.0h (see issue <a href=\"https://github.com/opencor/opencor/issues/1751\">#1751</a>). Renamed our BioSignalML plugin to libBioSignalML (see issue <a href=\"https://github.com/opencor/opencor/issues/1754\">#1754</a>)." }
                      ]

diff --git a/src/main.cpp b/src/main.cpp
@@ -142,12 +142,14 @@ int main(int pArgC, char *pArgV[])
 
     OpenCOR::initPluginsPath(pArgC, pArgV);
 
-    // Create the GUI version of OpenCOR and make sure that it supports high DPI
+    // Create the GUI version of OpenCOR after making sure that we use 96 DPI no
+    // matter what
+    // Note: the use 96 DPI must be enforced before creating our GUI
+    //       application...
 
-    OpenCOR::GuiApplication *guiApp = new OpenCOR::GuiApplication(pArgC, pArgV);
+    QApplication::setAttribute(Qt::AA_Use96Dpi);
 
-    guiApp->setAttribute(Qt::AA_EnableHighDpiScaling);
-    guiApp->setAttribute(Qt::AA_UseHighDpiPixmaps);
+    OpenCOR::GuiApplication *guiApp = new OpenCOR::GuiApplication(pArgC, pArgV);
 
     // Send a message (containing the arguments that were passed to this
     // instance of OpenCOR minus the first one since it corresponds to the full

diff --git a/src/misc/guiapplication.cpp b/src/misc/guiapplication.cpp
@@ -48,6 +48,10 @@ GuiApplication::GuiApplication(int &pArgC, char **pArgV) :
                                                             SettingsPreferencesStyle,
                                                             SettingsPreferencesStyleDefault).toString());
 
+    // Add support for HiDPI screens
+
+    setAttribute(Qt::AA_EnableHighDpiScaling);
+
     // Filter out OpenSSL warning messages
 
     QLoggingCategory::setFilterRules("qt.network.ssl.warning=false");

diff --git a/src/plugins/miscellaneous/Core/src/tabbarwidget.cpp b/src/plugins/miscellaneous/Core/src/tabbarwidget.cpp
@@ -261,6 +261,11 @@ TabBarWidget::TabBarWidget(QWidget *pParent) :
 #ifdef Q_OS_MAC
     setStyle(new TabBarStyle());
 #endif
+
+    // Force the size of the icons to be 16 by 16 pixels
+    // Note: this ensures that our icons have a decent size on HiDPI screens...
+
+    setIconSize(QSize(16, 16));
 }
 
 //==============================================================================

diff --git a/src/plugins/miscellaneous/Core/src/toolbarwidget.cpp b/src/plugins/miscellaneous/Core/src/toolbarwidget.cpp
@@ -51,6 +51,7 @@ ToolBarWidget::ToolBarWidget() :
                   "}");
 
     // Force the size of the icons to be 20 by 20 pixels
+    // Note: this ensures that our icons have a decent size on HiDPI screens...
 
     setIconSize(QSize(20, 20));
 }

diff --git a/src/plugins/miscellaneous/Core/src/treeviewwidget.cpp b/src/plugins/miscellaneous/Core/src/treeviewwidget.cpp
@@ -52,6 +52,11 @@ TreeViewWidget::TreeViewWidget(QWidget *pParent) :
 #endif
     setFrameShape(QFrame::NoFrame);
     setItemDelegate(new StyledItemDelegate(this));
+
+    // Force the size of the icons to be 16 by 16 pixels
+    // Note: this ensures that our icons have a decent size on HiDPI screens...
+
+    setIconSize(QSize(16, 16));
 }
 
 //==============================================================================