From fb2fb0637185f78e8fdf51df9fafb72fbc3f0826 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 23 Jun 2015 15:42:32 -0700
Subject: [PATCH] Fixing misplaced UI on scale resolution, PC edition

---
 interface/src/Application.cpp              | 2 +-
 interface/src/ui/ApplicationCompositor.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index b0d91f8619..4fd702102f 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -984,7 +984,7 @@ void Application::paintGL() {
         glBindFramebuffer(GL_READ_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(finalFbo));
         glBlitFramebuffer(0, 0, _renderResolution.x, _renderResolution.y,
                           0, 0, _glWidget->getDeviceSize().width(), _glWidget->getDeviceSize().height(),
-                            GL_COLOR_BUFFER_BIT, GL_NEAREST);
+                            GL_COLOR_BUFFER_BIT, GL_LINEAR);
         glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
 
         _compositor.displayOverlayTexture(&renderArgs);
diff --git a/interface/src/ui/ApplicationCompositor.cpp b/interface/src/ui/ApplicationCompositor.cpp
index 26ea9cefa0..7b55de6dd8 100644
--- a/interface/src/ui/ApplicationCompositor.cpp
+++ b/interface/src/ui/ApplicationCompositor.cpp
@@ -182,7 +182,8 @@ void ApplicationCompositor::displayOverlayTexture(RenderArgs* renderArgs) {
 
     updateTooltips();
 
-    vec2 canvasSize = qApp->getCanvasSize();
+    auto deviceSize = qApp->getDeviceSize();
+    glViewport(0, 0, deviceSize.width(), deviceSize.height());
 
     //Handle fading and deactivation/activation of UI
     gpu::Batch batch;
@@ -204,6 +205,7 @@ void ApplicationCompositor::displayOverlayTexture(RenderArgs* renderArgs) {
 
     //draw the mouse pointer
     // Get the mouse coordinates and convert to NDC [-1, 1]
+    vec2 canvasSize = qApp->getCanvasSize();
     vec2 mousePosition = toNormalizedDeviceScale(vec2(qApp->getMouse()), canvasSize);
     // Invert the Y axis
     mousePosition.y *= -1.0f;