From 82b666e2ee0e5c9ae4bd8aca37f2ae5fda35a236 Mon Sep 17 00:00:00 2001
From: Matthew Shun-Shin <m@shun-shin.com>
Date: Fri, 28 Jul 2017 11:30:19 +0100
Subject: [PATCH 1/2] Fix GL Views being half size on hidpi monitors

---
 pyqtgraph/opengl/GLViewWidget.py    | 4 ++--
 pyqtgraph/widgets/RawImageWidget.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyqtgraph/opengl/GLViewWidget.py b/pyqtgraph/opengl/GLViewWidget.py
index e0fee046..40a7d858 100644
--- a/pyqtgraph/opengl/GLViewWidget.py
+++ b/pyqtgraph/opengl/GLViewWidget.py
@@ -80,7 +80,7 @@ class GLViewWidget(QtOpenGL.QGLWidget):
     def getViewport(self):
         vp = self.opts['viewport']
         if vp is None:
-            return (0, 0, self.width(), self.height())
+            return (0, 0, self.width() * self.devicePixelRatio(), self.height() * self.devicePixelRatio())
         else:
             return vp
         
@@ -99,7 +99,7 @@ class GLViewWidget(QtOpenGL.QGLWidget):
     def projectionMatrix(self, region=None):
         # Xw = (Xnd + 1) * width/2 + X
         if region is None:
-            region = (0, 0, self.width(), self.height())
+            region = (0, 0, self.width() * self.devicePixelRatio(), self.height() * self.devicePixelRatio())
         
         x0, y0, w, h = self.getViewport()
         dist = self.opts['distance']
diff --git a/pyqtgraph/widgets/RawImageWidget.py b/pyqtgraph/widgets/RawImageWidget.py
index 657701f9..ef1d7a38 100644
--- a/pyqtgraph/widgets/RawImageWidget.py
+++ b/pyqtgraph/widgets/RawImageWidget.py
@@ -122,7 +122,7 @@ if HAVE_OPENGL:
             if not self.uploaded:
                 self.uploadTexture()
             
-            glViewport(0, 0, self.width(), self.height())
+            glViewport(0, 0, self.width() * self.devicePixelRatio(), self.height() * self.devicePixelRatio())
             glEnable(GL_TEXTURE_2D)
             glBindTexture(GL_TEXTURE_2D, self.texture)
             glColor4f(1,1,1,1)

From 063e9c91a999853a47675a2befcdfef4c0e30d53 Mon Sep 17 00:00:00 2001
From: Luke Campagnola <luke.campagnola@gmail.com>
Date: Tue, 24 Apr 2018 08:59:33 -0700
Subject: [PATCH 2/2] Make high-dpi handling conditional on Qt version

---
 pyqtgraph/opengl/GLViewWidget.py | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/pyqtgraph/opengl/GLViewWidget.py b/pyqtgraph/opengl/GLViewWidget.py
index c6d0c1fa..540fce7d 100644
--- a/pyqtgraph/opengl/GLViewWidget.py
+++ b/pyqtgraph/opengl/GLViewWidget.py
@@ -16,9 +16,13 @@ class GLViewWidget(QtOpenGL.QGLWidget):
         - Axis/grid display
         - Export options
 
+
+    High-DPI displays: Qt5 should automatically detect the correct resolution.
+    For Qt4, specify the ``devicePixelRatio`` argument when initializing the
+    widget (usually this value is 1-2).
     """
     
-    def __init__(self, parent=None):
+    def __init__(self, parent=None, devicePixelRatio=None):
         global ShareWidget
 
         if ShareWidget is None:
@@ -37,6 +41,7 @@ class GLViewWidget(QtOpenGL.QGLWidget):
             'azimuth': 45,            ## camera's azimuthal angle in degrees 
                                       ## (rotation around z-axis 0 points along x-axis)
             'viewport': None,         ## glViewport params; None == whole widget
+            'devicePixelRatio': devicePixelRatio,
         }
         self.setBackgroundColor('k')
         self.items = []
@@ -79,10 +84,21 @@ class GLViewWidget(QtOpenGL.QGLWidget):
         
     def getViewport(self):
         vp = self.opts['viewport']
+        dpr = self.devicePixelRatio()
         if vp is None:
-            return (0, 0, self.width() * self.devicePixelRatio(), self.height() * self.devicePixelRatio())
+            return (0, 0, int(self.width() * dpr), int(self.height() * dpr))
         else:
-            return vp
+            return tuple([int(x * dpr) for x in vp])
+        
+    def devicePixelRatio(self):
+        dpr = self.opts['devicePixelRatio']
+        if dpr is not None:
+            return dpr
+        
+        if hasattr(QtOpenGL.QGLWidget, 'devicePixelRatio'):
+            return QtOpenGL.QGLWidget.devicePixelRatio(self)
+        else:
+            return 1.0
         
     def resizeGL(self, w, h):
         pass
@@ -99,7 +115,8 @@ class GLViewWidget(QtOpenGL.QGLWidget):
     def projectionMatrix(self, region=None):
         # Xw = (Xnd + 1) * width/2 + X
         if region is None:
-            region = (0, 0, self.width() * self.devicePixelRatio(), self.height() * self.devicePixelRatio())
+            dpr = self.devicePixelRatio()
+            region = (0, 0, self.width() * dpr, self.height() * dpr)
         
         x0, y0, w, h = self.getViewport()
         dist = self.opts['distance']