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

Update users.js to be minimizable when logged out, and by default

Browse source
This commit is contained in:
Ryan Huffman 2016-10-19 13:19:29 -07:00
parent e247f0aa34
commit f42683cf8b
1 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
scripts/system/users.js
View file

@ -381,7 +381,7 @@ var usersWindow = (function () {
isLoggedIn = false, isLoggedIn = false,
isVisible = true, isVisible = true,
isMinimized = true, isMinimized = false,
isBorderVisible = false, isBorderVisible = false,
viewport, viewport,
@ -418,7 +418,9 @@ var usersWindow = (function () {
} }
// Reserve space for title, friends button, and option controls // Reserve space for title, friends button, and option controls
nonUsersHeight = WINDOW_MARGIN + windowLineHeight + FRIENDS_BUTTON_SPACER + FRIENDS_BUTTON_HEIGHT + DISPLAY_SPACER nonUsersHeight = WINDOW_MARGIN + windowLineHeight
+ (shouldShowFriendsButton() ? FRIENDS_BUTTON_SPACER + FRIENDS_BUTTON_HEIGHT : 0)
+ DISPLAY_SPACER
+ windowLineHeight + VISIBILITY_SPACER + windowLineHeight + VISIBILITY_SPACER
+ windowLineHeight + WINDOW_BASE_MARGIN; + windowLineHeight + WINDOW_BASE_MARGIN;
@ -485,16 +487,22 @@ var usersWindow = (function () {
y: scrollbarBarPosition.y y: scrollbarBarPosition.y
}); });
x = windowLeft + WINDOW_MARGIN; x = windowLeft + WINDOW_MARGIN;
y = windowPosition.y - FRIENDS_BUTTON_HEIGHT - DISPLAY_SPACER y = windowPosition.y
- DISPLAY_SPACER
- windowLineHeight - VISIBILITY_SPACER - windowLineHeight - VISIBILITY_SPACER
- windowLineHeight - WINDOW_BASE_MARGIN; - windowLineHeight - WINDOW_BASE_MARGIN;
if (shouldShowFriendsButton()) {
y -= FRIENDS_BUTTON_HEIGHT;
Overlays.editOverlay(friendsButton, { Overlays.editOverlay(friendsButton, {
x: x, x: x,
y: y y: y
}); });
y += FRIENDS_BUTTON_HEIGHT;
}
y += FRIENDS_BUTTON_HEIGHT + DISPLAY_SPACER; y += DISPLAY_SPACER;
displayControl.updatePosition(x, y); displayControl.updatePosition(x, y);
y += windowLineHeight + VISIBILITY_SPACER; y += windowLineHeight + VISIBILITY_SPACER;
@ -563,6 +571,10 @@ var usersWindow = (function () {
}); });
} }
function shouldShowFriendsButton() {
return isVisible && isLoggedIn && !isMinimized;
}
function updateOverlayVisibility() { function updateOverlayVisibility() {
Overlays.editOverlay(windowBorder, { Overlays.editOverlay(windowBorder, {
visible: isVisible && isBorderVisible visible: isVisible && isBorderVisible
@ -574,7 +586,7 @@ var usersWindow = (function () {
visible: isVisible visible: isVisible
}); });
Overlays.editOverlay(minimizeButton, { Overlays.editOverlay(minimizeButton, {
visible: isLoggedIn && isVisible visible: isVisible
}); });
Overlays.editOverlay(scrollbarBackground, { Overlays.editOverlay(scrollbarBackground, {
visible: isVisible && isUsingScrollbars && !isMinimized visible: isVisible && isUsingScrollbars && !isMinimized
@ -583,7 +595,7 @@ var usersWindow = (function () {
visible: isVisible && isUsingScrollbars && !isMinimized visible: isVisible && isUsingScrollbars && !isMinimized
}); });
Overlays.editOverlay(friendsButton, { Overlays.editOverlay(friendsButton, {
visible: isVisible && !isMinimized visible: shouldShowFriendsButton()
}); });
displayControl.setVisible(isVisible && !isMinimized); displayControl.setVisible(isVisible && !isMinimized);
visibilityControl.setVisible(isVisible && !isMinimized); visibilityControl.setVisible(isVisible && !isMinimized);
@ -659,12 +671,11 @@ var usersWindow = (function () {
} }
} }
checkLoggedIn();
calculateWindowHeight(); calculateWindowHeight();
updateUsersDisplay(); updateUsersDisplay();
updateOverlayPositions(); updateOverlayPositions();
checkLoggedIn();
} else { } else {
print("Error: Request for users status returned " + usersRequest.status + " " + usersRequest.statusText); print("Error: Request for users status returned " + usersRequest.status + " " + usersRequest.statusText);
usersTimer = Script.setTimeout(pollUsers, HTTP_GET_TIMEOUT); // Try again after a longer delay. usersTimer = Script.setTimeout(pollUsers, HTTP_GET_TIMEOUT); // Try again after a longer delay.
@ -1182,7 +1193,7 @@ var usersWindow = (function () {
pollUsers(); pollUsers();
// Set minimized at end - setup code does not handle `minimized == false` correctly // Set minimized at end - setup code does not handle `minimized == false` correctly
setMinimized(isValueTrue(Settings.getValue(SETTING_USERS_WINDOW_MINIMIZED, false))); setMinimized(isValueTrue(Settings.getValue(SETTING_USERS_WINDOW_MINIMIZED, true)));
} }
function tearDown() { function tearDown() {