Rollback retina fix, earlier fix is not longer required see tpaviot#426

tpaviot · tpaviot · commit bad3df522939 · 2017-05-25T10:09:59.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -71,10 +71,6 @@ before_install:
   - conda info -a
   # download/install OCE from DLR-SC channel
   - conda config --add channels https://conda.anaconda.org/dlr-sc
-  # on osx, need for pyobjc-core, available at erik's repository
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-    conda config --add channels https://conda.anaconda.org/erik;
-    fi;
   - conda config --add channels https://conda.anaconda.org/conda-forge
   - conda config --add channels https://conda.anaconda.org/tpaviot
   - conda config --add channels https://conda.anaconda.org/oce
diff --git a/ci/conda/meta.yaml b/ci/conda/meta.yaml
@@ -33,7 +33,6 @@ requirements:
     - oce ==0.18.1
     - python
     - freetype ==2.7
-    - pyobjc-core       [osx and py27]
 
 test:
   requires:
diff --git a/src/Display/qtDisplay.py b/src/Display/qtDisplay.py
@@ -99,29 +99,6 @@ def resizeEvent(self, event):
             self._display.OnResize()
 
 
-def handle_retina(_nsview_pointer):
-    """ OSX only. hack to detect and handle Retina display
-    """
-    screen = QtGui.QGuiApplication.instance().primaryScreen()
-    pixelDensity = screen.physicalDotsPerInch()
-
-    if pixelDensity >= 147:
-        log.info("Retina display detected")
-        try:
-            import objc
-        except ImportError:
-            log.critical("pyobjc is not installed... try pip installing it \npip install pyobjc")
-        else:
-            nsview = objc.objc_object(c_void_p=_nsview_pointer)
-            nsview.setWantsBestResolutionOpenGLSurface_(True)
-            scaleFactor = nsview.backingScaleFactor()
-            rec1 = screen.geometry()
-            nsview.setBounds_(((rec1.x(),
-                                rec1.y()),
-                               (rec1.width() * scaleFactor,
-                                rec1.height() * scaleFactor)))
-
-
 class qtViewer3d(qtBaseViewer):
 
     # emit signal when selection is changed
@@ -158,9 +135,6 @@ def qApp(self, value):
         self._qApp = value
 
     def InitDriver(self):
-        if sys.platform == "darwin":
-            handle_retina(self.GetHandle())
-
         self._display = OCCViewer.Viewer3d(self.GetHandle())
         self._display.Create()
         # background gradient
