Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 08:17:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent users window from being dragged offscreen

Browse source
This commit is contained in:
David Rowe 2016-07-04 14:34:38 +12:00
parent 34042d51ad
commit 0ad7aa72fb
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/system/users.js
View file

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