cleaner retina detection

Author: d3cod3

src/config.h

@@ -44,10 +44,6 @@
     #define MOD_KEY OF_KEY_CONTROL
 #endif
 
-
-#define RETINA_MIN_WIDTH                    2560
-#define RETINA_MIN_HEIGHT                   1600
-
 #define OUTPUT_TEX_MAX_WIDTH                4800
 #define OUTPUT_TEX_MAX_HEIGHT               4800
 

src/objects/gui/moTimeline.cpp

@@ -119,7 +119,7 @@ void moTimeline::setupObjectContent(shared_ptr<ofAppGLFWWindow> &mainWindow){
     settings.resizable = true;
     settings.stencilBits = 0;
     // RETINA FIX
-    if(ofGetScreenWidth() >= RETINA_MIN_WIDTH && ofGetScreenHeight() >= RETINA_MIN_HEIGHT){
+    if(mainWindow->getPixelScreenCoordScale() > 1){
         settings.setPosition(ofDefaultVec2(mainWindow->getScreenSize().x-(1600+100),400));
         settings.setSize(1600, 1200);
     }else{
@@ -816,7 +816,7 @@ void moTimeline::toggleWindowFullscreen(){
     window->toggleFullscreen();
 
     if(!isFullscreen){
-        if(ofGetScreenWidth() >= RETINA_MIN_WIDTH && ofGetScreenHeight() >= RETINA_MIN_HEIGHT){
+        if(window->getPixelScreenCoordScale() > 1){
             window->setWindowShape(1600,1200);
         }else{
             window->setWindowShape(800,600);

src/objects/windowing/OutputWindow.cpp

@@ -120,7 +120,7 @@ void OutputWindow::setupObjectContent(shared_ptr<ofAppGLFWWindow> &mainWindow){
     settings.resizable = true;
     settings.stencilBits = 0;
     // RETINA FIX
-    if(ofGetScreenWidth() >= RETINA_MIN_WIDTH && ofGetScreenHeight() >= RETINA_MIN_HEIGHT){
+    if(mainWindow->getPixelScreenCoordScale() > 1){
         if(ofGetScreenWidth() > 3360 && ofGetScreenHeight() > 2100){
             window_actual_width     = STANDARD_PROJECTOR_WINDOW_WIDTH*2;
             window_actual_height    = STANDARD_PROJECTOR_WINDOW_HEIGHT*2;

src/objects/windowing/ProjectionMapping.cpp

@@ -97,7 +97,7 @@ void ProjectionMapping::setupObjectContent(shared_ptr<ofAppGLFWWindow> &mainWind
     settings.resizable = true;
     settings.stencilBits = 0;
     // RETINA FIX
-    if(ofGetScreenWidth() >= RETINA_MIN_WIDTH && ofGetScreenHeight() >= RETINA_MIN_HEIGHT){
+    if(mainWindow->getPixelScreenCoordScale() > 1){
         if(ofGetScreenWidth() > 3360 && ofGetScreenHeight() > 2100){
             window_actual_width     = STANDARD_PROJECTOR_WINDOW_WIDTH*2;
             window_actual_height    = STANDARD_PROJECTOR_WINDOW_HEIGHT*2;