From 4429e144f4342b0427976c27511f505899c6bd0f Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 13 Jan 2015 11:10:13 -0800 Subject: [PATCH] Fix merge accidental code delete --- interface/src/ui/ApplicationOverlay.cpp | 14 ++++++++++++++ interface/src/ui/ApplicationOverlay.h | 3 +++ 2 files changed, 17 insertions(+) diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp index 9381ad48f8..2c5cc5b267 100644 --- a/interface/src/ui/ApplicationOverlay.cpp +++ b/interface/src/ui/ApplicationOverlay.cpp @@ -950,6 +950,20 @@ void ApplicationOverlay::renderDomainConnectionStatusBorder() { if (nodeList && !nodeList->getDomainHandler().isConnected()) { auto glCanvas = DependencyManager::get(); auto geometryCache = DependencyManager::get(); + int width = glCanvas->width(); + int height = glCanvas->height(); + + if (width != _previousBorderWidth || height != _previousBorderHeight) { + QVector border; + border << glm::vec2(0, 0); + border << glm::vec2(0, height); + border << glm::vec2(width, height); + border << glm::vec2(width, 0); + border << glm::vec2(0, 0); + geometryCache->updateVertices(_domainStatusBorder, border); + _previousBorderWidth = width; + _previousBorderHeight = height; + } glColor3f(CONNECTION_STATUS_BORDER_COLOR[0], CONNECTION_STATUS_BORDER_COLOR[1], diff --git a/interface/src/ui/ApplicationOverlay.h b/interface/src/ui/ApplicationOverlay.h index b20172f3f9..e2094f2a8e 100644 --- a/interface/src/ui/ApplicationOverlay.h +++ b/interface/src/ui/ApplicationOverlay.h @@ -116,6 +116,9 @@ private: int _domainStatusBorder; int _magnifierBorder; + int _previousBorderWidth; + int _previousBorderHeight; + glm::vec3 _previousMagnifierBottomLeft; glm::vec3 _previousMagnifierBottomRight; glm::vec3 _previousMagnifierTopLeft;