mirror of
https://thingvellir.net/git/overte
synced 2025-03-27 23:52:03 +01:00
inhibit user interactions when window is disabled
This commit is contained in:
parent
666d2dd2fc
commit
35f857ef9d
1 changed files with 16 additions and 3 deletions
|
@ -371,7 +371,8 @@ var usersWindow = (function () {
|
|||
|
||||
MENU_NAME = "View",
|
||||
MENU_ITEM = "Users Online",
|
||||
MENU_ITEM_AFTER = "Overlays",
|
||||
MENU_ITEM_OVERLAYS = "Overlays",
|
||||
MENU_ITEM_AFTER = MENU_ITEM_OVERLAYS,
|
||||
|
||||
SETTING_USERS_SHOW_ME = "UsersWindow.ShowMe",
|
||||
SETTING_USERS_VISIBLE_TO = "UsersWindow.VisibleTo",
|
||||
|
@ -399,6 +400,10 @@ var usersWindow = (function () {
|
|||
scrollbarBarClickedAt, // 0.0 .. 1.0
|
||||
scrollbarValue = 0.0; // 0.0 .. 1.0
|
||||
|
||||
function isWindowDisabled() {
|
||||
return !Menu.isOptionChecked(MENU_ITEM) || !Menu.isOptionChecked(MENU_ITEM_OVERLAYS);
|
||||
}
|
||||
|
||||
function isValueTrue(value) {
|
||||
// Work around Boolean Settings values being read as string when Interface starts up but as Booleans when re-read after
|
||||
// Being written if refresh script.
|
||||
|
@ -744,7 +749,7 @@ var usersWindow = (function () {
|
|||
userClicked,
|
||||
delta;
|
||||
|
||||
if (!isVisible) {
|
||||
if (!isVisible || isWindowDisabled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -856,7 +861,7 @@ var usersWindow = (function () {
|
|||
function onMouseMoveEvent(event) {
|
||||
var isVisible;
|
||||
|
||||
if (!isLoggedIn) {
|
||||
if (!isLoggedIn || isWindowDisabled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -914,6 +919,10 @@ var usersWindow = (function () {
|
|||
function onMouseReleaseEvent() {
|
||||
var offset = {};
|
||||
|
||||
if (isWindowDisabled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (isMovingScrollbar) {
|
||||
Overlays.editOverlay(scrollbarBar, {
|
||||
backgroundAlpha: SCROLLBAR_BAR_ALPHA
|
||||
|
@ -939,6 +948,10 @@ var usersWindow = (function () {
|
|||
MIRROR_MENU_ITEM = "Mirror",
|
||||
FULLSCREEN_MIRROR_MENU_ITEM = "Fullscreen Mirror";
|
||||
|
||||
if (isWindowDisabled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
viewport = Controller.getViewportDimensions();
|
||||
isMirrorDisplay = Menu.isOptionChecked(MIRROR_MENU_ITEM);
|
||||
isFullscreenMirror = Menu.isOptionChecked(FULLSCREEN_MIRROR_MENU_ITEM);
|
||||
|
|
Loading…
Reference in a new issue