From 0ad7aa72fb09f7b67da3399a2ff0cb83d33e05d2 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Mon, 4 Jul 2016 14:34:38 +1200
Subject: [PATCH] Prevent users window from being dragged offscreen

---
 scripts/system/users.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/system/users.js b/scripts/system/users.js
index 2ff2689bad..853067b90b 100644
--- a/scripts/system/users.js
+++ b/scripts/system/users.js
@@ -344,6 +344,7 @@ var usersWindow = (function () {
         windowTextHeight,
         windowLineSpacing,
         windowLineHeight, // = windowTextHeight + windowLineSpacing
+        windowMinimumHeight,
 
         usersOnline, // Raw users data
         linesOfUsers = [], // Array of indexes pointing into usersOnline
@@ -435,6 +436,11 @@ var usersWindow = (function () {
         }
     }
 
+    function saturateWindowPosition() {
+        windowPosition.x = Math.max(0, Math.min(viewport.x - WINDOW_WIDTH, windowPosition.x));
+        windowPosition.y = Math.max(windowMinimumHeight, Math.min(viewport.y, windowPosition.y));
+    }
+
     function updateOverlayPositions() {
         // Overlay positions are all relative to windowPosition; windowPosition is the position of the windowPane overlay.
         var windowLeft = windowPosition.x,
@@ -854,6 +860,8 @@ var usersWindow = (function () {
                 x: event.x - movingClickOffset.x,
                 y: event.y - movingClickOffset.y
             };
+
+            saturateWindowPosition();
             calculateWindowHeight();
             updateOverlayPositions();
             updateUsersDisplay();
@@ -947,6 +955,7 @@ var usersWindow = (function () {
         windowTextHeight = Math.floor(Overlays.textSize(textSizeOverlay, "1").height);
         windowLineSpacing = Math.floor(Overlays.textSize(textSizeOverlay, "1\n2").height - 2 * windowTextHeight);
         windowLineHeight = windowTextHeight + windowLineSpacing;
+        windowMinimumHeight = windowTextHeight + WINDOW_MARGIN + WINDOW_BASE_MARGIN;
         Overlays.deleteOverlay(textSizeOverlay);
 
         viewport = Controller.getViewportDimensions();
@@ -958,7 +967,6 @@ var usersWindow = (function () {
         if (offset.hasOwnProperty("x") && offset.hasOwnProperty("y")) {
             windowPosition.x = offset.x < 0 ? viewport.x + offset.x : offset.x;
             windowPosition.y = offset.y <= 0 ? viewport.y + offset.y : offset.y;
-
         } else {
             hmdViewport = Controller.getRecommendedOverlayRect();
             windowPosition = {
@@ -967,6 +975,7 @@ var usersWindow = (function () {
             };
         }
 
+        saturateWindowPosition();
         calculateWindowHeight();
 
         windowBorder = Overlays.addOverlay("rectangle", {