Merge 6cf0a44 into 075087d

opencor · Sep 20, 2018 · 4b41037 · 4b41037
2 parents 075087d + 6cf0a44
commit 4b41037
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -37,10 +37,7 @@ var jsonData = { "versions": [
                        }
                      ],
                      "changes": [
-                       { "change": "<strong>General:</strong> only handle a URL when OpenCOR is visible and no modal dialog is active (see issue <a href=\"https://github.com/opencor/opencor/issues/1802\">#1802</a>). Don't force the use of 96 DPI anymore (see issue <a href=\"https://github.com/opencor/opencor/issues/1810\">#1810</a>)." },
-                       { "change": "<strong>Graph Panel widget:</strong> improved the plotting speed of simulation data (see issue <a href=\"https://github.com/opencor/opencor/issues/1806\">#1806</a>)." },
-                       { "change": "<strong>Simulation Experiment view:</strong> provide more user-friendly simulation time information (see issue <a href=\"https://github.com/opencor/opencor/issues/1804\">#1804</a>)." },
-                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://libgit2.github.com/\">libgit2</a> to version 0.27.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/1799\">#1799</a>)." }
+                       { "change": "<strong>General:</strong> improved HiDPI support on Windows (see issue <a href=\"https://github.com/opencor/opencor/issues/1776\">#1776</a>)." }
                      ]
                    },
                    { "major": 0, "minor": 4, "patch": 1, "day": 20, "month": 5, "year": 2015, "type": 0,

diff --git a/doc/downloads/previousSnapshots.js b/doc/downloads/previousSnapshots.js
@@ -1,4 +1,29 @@
 var jsonData = { "versions": [
+                   { "major": 0, "minor": 0, "patch": 0, "day": 18, "month": 9, "year": 2018, "type": 2,
+                     "platforms": [
+                       { "name": "Windows", "supported": "Windows 7 and later",
+                         "files": [
+                           { "extension": ".exe" }, { "extension": ".zip" }
+                         ]
+                       },
+                       { "name": "Linux", "supported": "Ubuntu 16.04 LTS (Xenial Xerus) and later",
+                         "files": [
+                           { "extension": ".tar.gz" }
+                         ]
+                       },
+                       { "name": "macOS", "supported": "OS X 10.10 (Yosemite) and later",
+                         "files": [
+                           { "extension": ".dmg" }, { "extension": ".zip" }
+                         ]
+                       }
+                     ],
+                     "changes": [
+                       { "change": "<strong>General:</strong> only handle a URL when OpenCOR is visible and no modal dialog is active (see issue <a href=\"https://github.com/opencor/opencor/issues/1802\">#1802</a>). Don't force the use of 96 DPI anymore (see issue <a href=\"https://github.com/opencor/opencor/issues/1810\">#1810</a>)." },
+                       { "change": "<strong>Graph Panel widget:</strong> improved the plotting speed of simulation data (see issue <a href=\"https://github.com/opencor/opencor/issues/1806\">#1806</a>)." },
+                       { "change": "<strong>Simulation Experiment view:</strong> provide more user-friendly simulation time information (see issue <a href=\"https://github.com/opencor/opencor/issues/1804\">#1804</a>)." },
+                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://libgit2.github.com/\">libgit2</a> to version 0.27.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/1799\">#1799</a>)." }
+                     ]
+                   },
                    { "major": 0, "minor": 0, "patch": 0, "day": 1, "month": 9, "year": 2018, "type": 2,
                      "platforms": [
                        { "name": "Windows", "supported": "Windows 7 and later",

diff --git a/src/main.cpp b/src/main.cpp
@@ -50,6 +50,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
+#ifdef Q_OS_WIN
+    #include <Windows.h>
+#endif
+
+//==============================================================================
+
 int main(int pArgC, char *pArgV[])
 {
     // Initialise Qt's message pattern
@@ -145,7 +151,12 @@ int main(int pArgC, char *pArgV[])
 
     OpenCOR::initPluginsPath(pArgC, pArgV);
 
-    // Create the GUI version of OpenCOR
+    // Create the GUI version of OpenCOR, after making that on Windows OpenCOR
+    // can handle scaled HiDPI screens
+
+#ifdef Q_OS_WIN
+    SetProcessDPIAware();
+#endif
 
     OpenCOR::GuiApplication *guiApp = new OpenCOR::GuiApplication(pArgC, pArgV);